Jaime Passos
00d76bd9ef
fix fades for real
2019-11-05 12:10:42 -03:00
Jaime Passos
f057c6eef8
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-05 11:22:19 -03:00
Jaime Passos
4ff769704a
function renaming
2019-11-05 10:28:19 -03:00
Jaime Passos
55c6c4f5fe
Attempt to fix sky dome
2019-11-04 14:36:12 -03:00
lachwright
cf39e181bb
Display Eggman more frequently during skin roulette
2019-11-05 01:33:09 +08:00
Jaime Passos
d45ed97e50
Update m_menu.c
2019-11-04 12:30:28 -03:00
Jaime Passos
8ac49d8855
add gr_modelinterpolation
2019-11-04 12:21:53 -03:00
lachwright
eb6d3b3dbe
Improve A_SignSpin
2019-11-04 23:10:13 +08:00
toaster
ef886e4b80
Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!)
2019-11-04 13:11:04 +00:00
lachwright
5e03d40b33
New end-of-level signpost logic
2019-11-04 16:28:44 +08:00
mazmazz
43fff92c82
Alacroix: Fix our heroes' arms disappearing due to dropped frames
2019-11-04 02:43:48 -05:00
Steel Titanium
16c107e2ac
Fix garbage string being drawn on record attack menu
...
Pretty silly of me to assume it would be NUL-terminated by default.
2019-11-03 21:43:09 -05:00
mazmazz
d268582315
Frame 4 typos
2019-11-03 19:53:05 -05:00
mazmazz
cb6bc67944
Alacroix title: Give Tails his back tails
2019-11-03 18:38:09 -05:00
mazmazz
05ac1a1a21
Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions
2019-11-03 16:21:21 -05:00
mazmazz
82b65c87b8
Alacroix title screen character frames
2019-11-03 10:34:12 -05:00
mazmazz
42835905ef
Load Alacroix character frames
2019-11-03 06:30:27 -05:00
toaster
e7e3c6ccbb
Slightly unrelated to the express purpose of the branch, but since I was here, and I noticed it was a problem when ~~playing~~ testing with md3s in ACZ: Don't draw the midtextures for horizon lines.
2019-11-03 10:23:21 +00:00
mazmazz
96a80c51d3
TTMODE_USER logic
2019-11-02 21:51:45 -04:00
mazmazz
6db58bc2bf
Alacroix title animation adjustments
2019-11-02 21:05:01 -04:00
Jaime Passos
751d398321
Fix sky dome
2019-11-02 17:33:36 -03:00
toaster
915e50a1e4
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
8909598baf
Instead of checking for mod being nonzero, pretend it's 1 - after all, there's no good behaviour in that circumstance otherwise.
2019-11-02 18:25:56 +00:00
toaster
417f17ebdd
Do a bunch of stuff to the MD2/3 sprite2 support to get it back to feature parity with before, without going back to being hacky as fuck.
...
* Store the number of frames per sprite2 run in the spr2frames struct.
* Reintroduce P_GetModelSprite2, to allow for the sprite2 defaulting system to be used to full advantage even in GL.
* Instead of splitting the SUPER and normal SPR2 stuff within the same cell of the struct, have them exist in different cells just like in the "normal" sprite2 structs.
* Allow for just providing spr2 frames in order without specifying which "normal" sprite2 frame it's supposed to replace.
Also:
* Fix FF_VERTICALFLIP-ignoring regression.
* Fix whitespace adjustment in win_dll.c
* Remove bracket in P_GetSkinSprite2 because I realised it was extraneous while making sure P_GetModelSprite2 worked with it.
2019-11-02 17:52:54 +00:00
mazmazz
067ef42e37
SNTX -> SONT
2019-11-02 13:30:03 -04:00
mazmazz
fc02b73534
Remove TTCOUNTERSET to simplify custom title SOC
2019-11-02 12:40:12 -04:00
mazmazz
1ebcdb5344
Multi-res title screen gfx
2019-11-02 12:12:36 -04:00
toaster
fc22d1adc3
* Restart Metal recording from beginning if retry is used.
...
* Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot).
* Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
mazmazz
0c1b5f07f0
Merge remote-tracking branch 'origin/master' into new-title
2019-11-01 21:06:46 -04:00
toaster
7cd7f9fdb7
Forgot to stage this.
2019-11-01 16:33:46 +00:00
toaster
e3fe542f31
Prevent desync with modeattacking.
2019-11-01 16:25:28 +00:00
toaster
67f5b2245f
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
2019-11-01 15:48:50 +00:00
Steel Titanium
e325577f0d
Remove debug print
...
(Not going to make a new build for this)
2019-10-31 16:37:55 -04:00
Steel Titanium
88970f3dac
Update ARM/ARM64 arch of SDL to 2.0.10
2019-10-31 16:27:28 -04:00
lachwright
38318ad789
Merge branch 'master' into atz-hazards
2019-10-31 20:59:06 +08:00
lachwright
f3e9dd0cad
Add static ATZ Gargoyles
2019-10-31 19:38:28 +08:00
lachwright
95a3546988
Finish Glaregoyle states
2019-10-31 19:18:44 +08:00
Steel Titanium
3dbdbcbe41
Rebuild libpng and zlib using GCC 4.8.1
...
Which should resolve those undefined references errors with libpng.
Rebuilt zlib just to be safe.
2019-10-30 16:10:43 -04:00
toaster
126fc44d6e
Change sounds, after discussing with Lach.
2019-10-30 17:37:42 +00:00
toaster
67a99f6334
ACTUALLY applied colorized flashing for dashmode to non-SF_MACHINE players, which wasn't happening for non-transparent players because :VVV
2019-10-30 17:16:44 +00:00
lachwright
7c08cd69fa
WIP new states for Glaregoyle
2019-10-31 00:32:19 +08:00
Steel Titanium
312b9f76b6
Revert "Merge branch 'revert-eda30fc9' into 'master'"
...
This reverts merge request !435
2019-10-30 10:37:22 +00:00
Steel Titanium
96aa11c825
Merge branch 'revert-eda30fc9' into 'master'
...
Revert "Revert "Merge branch 'revert-973ad693' into 'master'""
See merge request STJr/SRB2Internal!435
2019-10-30 06:11:33 -04:00
Steel Titanium
0df7691d30
Revert "Revert "Merge branch 'revert-973ad693' into 'master'""
...
This reverts commit eda30fc995
2019-10-30 10:09:54 +00:00
Steel Titanium
eda30fc995
Revert "Merge branch 'revert-973ad693' into 'master'"
...
This reverts merge request !434
2019-10-30 09:59:02 +00:00
Steel Titanium
9bd9df6726
Merge branch 'revert-973ad693' into 'master'
...
Revert "Merge branch 'update-libs' into 'master'"
See merge request STJr/SRB2Internal!434
2019-10-30 05:09:22 -04:00
Steel Titanium
76457663f0
Revert "Merge branch 'update-libs' into 'master'"
...
This reverts merge request !433
2019-10-30 09:07:56 +00:00
Steel Titanium
973ad6930d
Merge branch 'update-libs' into 'master'
...
Update various of libraries
See merge request STJr/SRB2Internal!433
2019-10-30 05:01:18 -04:00
toaster
04f400e048
Give the clone fighter's vectorisation colour, rather than forcing greyscale.
2019-10-29 23:24:00 +00:00
toaster
4d55a9f4a9
Metal Sonic battle improvements.
...
* Tweaked to use new sprites.
* Jet fume behaves much closer to Lach's wonderful work.
* Instead of clobbering tracer to spawn powerup overlay, use hprev.
* Change timings. One second less to charge up, but two seconds less to spin them out.
* Remove terrible pinch overlay in favour of new dashmode-mimic flashing.
2019-10-29 23:11:12 +00:00
