b157c21a35
There's some whitespace...
2019-11-07 14:56:42 -08:00
d9a54a6b61
Merge branch 'intermission-buffer' into 'master'
...
Restore the last gameplay frame while on the intermission screen
See merge request STJr/SRB2Internal!444
2019-11-07 17:53:36 -05:00
e5f3863708
Merge branch 'recordattack-menu-draw-fix' into 'master'
...
Record attack fixes
See merge request STJr/SRB2Internal!441
2019-11-07 17:53:03 -05:00
184a754c2e
Merge branch 'fix-nopng-warnings' into 'master'
...
Fix warnings when NOPNG=1
See merge request STJr/SRB2Internal!432
2019-11-07 17:52:31 -05:00
ad4c55c10b
Merge branch 'fix-uppercase-in-intro-fades' into 'master'
...
Fix some intro fades displaying text in all-caps
See merge request STJr/SRB2Internal!429
2019-11-07 17:52:17 -05:00
dcfd088aef
Merge branch 'lotsacontinues' into 'master'
...
Lotsa Continues (resolves #264 )
Closes #264
See merge request STJr/SRB2Internal!422
2019-11-07 17:52:01 -05:00
546f313616
Merge branch 'secrets-charsel-music-fix' into 'master'
...
Fix char select music not playing in secrets menu
Closes #272
See merge request STJr/SRB2Internal!421
2019-11-07 17:51:38 -05:00
9f24ef25bf
Better account for the uninitialised signcolor
2019-11-07 14:44:42 -08:00
ed94549a37
Whitespace
2019-11-07 14:15:57 -08:00
872e662618
That's a lot of whitespace
2019-11-07 13:42:54 -08:00
fff38da832
var2 unused, so remove it; signcolor can be unset
2019-11-07 13:05:50 -08:00
be7dcccb71
Declarations after Lua calls
2019-11-07 13:02:33 -08:00
f11fc92fd7
Fix pmomz being set to 0 in the wrong place. (P_PlayerAfterThink is after every moving sector has changed its height, while P_MovePlayer is before it...)
2019-11-07 17:10:59 +00:00
d2c6d6ad73
Prevent infinite lives rollover to extremely negative numbers. (Discovered while messing around with pandora's box recently.)
2019-11-07 14:06:27 +00:00
c43551384d
Reduce RVZ particle spawns when no players are in proximity
2019-11-07 16:00:44 +08:00
6d024b7124
I guess I'll have to do at least SOMETHING about OpenGL
2019-11-05 17:35:16 -03:00
ed967f077c
Restore the last gameplay frame while on the intermission screen
2019-11-05 17:04:57 -03:00
4ff769704a
function renaming
2019-11-05 10:28:19 -03:00
55c6c4f5fe
Attempt to fix sky dome
2019-11-04 14:36:12 -03:00
cf39e181bb
Display Eggman more frequently during skin roulette
2019-11-05 01:33:09 +08:00
d45ed97e50
Update m_menu.c
2019-11-04 12:30:28 -03:00
8ac49d8855
add gr_modelinterpolation
2019-11-04 12:21:53 -03:00
eb6d3b3dbe
Improve A_SignSpin
2019-11-04 23:10:13 +08:00
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
5e03d40b33
New end-of-level signpost logic
2019-11-04 16:28:44 +08:00
43fff92c82
Alacroix: Fix our heroes' arms disappearing due to dropped frames
2019-11-04 02:43:48 -05:00
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
d268582315
Frame 4 typos
2019-11-03 19:53:05 -05:00
cb6bc67944
Alacroix title: Give Tails his back tails
2019-11-03 18:38:09 -05:00
05ac1a1a21
Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions
2019-11-03 16:21:21 -05:00
82b65c87b8
Alacroix title screen character frames
2019-11-03 10:34:12 -05:00
42835905ef
Load Alacroix character frames
2019-11-03 06:30:27 -05:00
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
96a80c51d3
TTMODE_USER logic
2019-11-02 21:51:45 -04:00
6db58bc2bf
Alacroix title animation adjustments
2019-11-02 21:05:01 -04:00
751d398321
Fix sky dome
2019-11-02 17:33:36 -03:00
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
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
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
067ef42e37
SNTX -> SONT
2019-11-02 13:30:03 -04:00
fc02b73534
Remove TTCOUNTERSET to simplify custom title SOC
2019-11-02 12:40:12 -04:00
1ebcdb5344
Multi-res title screen gfx
2019-11-02 12:12:36 -04:00
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
0c1b5f07f0
Merge remote-tracking branch 'origin/master' into new-title
2019-11-01 21:06:46 -04:00
38318ad789
Merge branch 'master' into atz-hazards
2019-10-31 20:59:06 +08:00
f3e9dd0cad
Add static ATZ Gargoyles
2019-10-31 19:38:28 +08:00
95a3546988
Finish Glaregoyle states
2019-10-31 19:18:44 +08:00
126fc44d6e
Change sounds, after discussing with Lach.
2019-10-30 17:37:42 +00:00
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
7c08cd69fa
WIP new states for Glaregoyle
2019-10-31 00:32:19 +08:00
James R