MascaraSnake
0d66099290
Merge branch 'walltransfermovev2' into 'master'
...
Let players roll AND move after spinning off a wall transfer
Closes #274
See merge request STJr/SRB2Internal!456
2019-11-11 11:17:32 -05:00
Digiku
c8b47193d8
Merge branch 'new-title-multi-res' into 'master'
...
2.2 Title Screen
See merge request STJr/SRB2Internal!439
2019-11-11 08:46:36 -05:00
toaster
ad366c55ba
Lach wanted to do this, but we might have a release candidate before he gets back, so did it myself.
...
Make the wall transfer while spinning PF_SPINNING|PF_THOKKED. This:
* Prevents PF_MULTIABILITY players from using their ability after a wall transfer.
* Has a more specialised case which allows players to roll after having wall-transferred while spinning.
* (side effect) allows modders to apply PF_THOKKED any time for more controllable spinning.
2019-11-09 17:49:26 +00:00
toaster
3b699f92a3
Merge branch 'fix-players-typos' into 'master'
...
Fix silly typo :P
See merge request STJr/SRB2Internal!454
2019-11-09 11:29:18 -05:00
Louis-Antoine
99b89b1ae3
Shut up
2019-11-09 17:24:10 +01:00
Louis-Antoine
7a9bb54a5d
Fix silly typo :P
2019-11-09 15:46:34 +01:00
James R
7c0d5b3bcf
There's some whitespace...
2019-11-07 14:56:42 -08:00
James R
1f166741e2
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
James R
91c759ad9f
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
James R
7b3b89240a
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
James R
b9a3f79f25
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
James R
a905025354
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
James R
fa1f335e1f
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
James R
6ae6089343
That's a lot of whitespace
2019-11-07 13:42:54 -08:00
Jaime Passos
135c841056
I guess I'll have to do at least SOMETHING about OpenGL
2019-11-05 17:35:16 -03:00
Jaime Passos
db9a8b4b94
Restore the last gameplay frame while on the intermission screen
2019-11-05 17:04:57 -03:00
mazmazz
40149e00bc
Alacroix: Fix our heroes' arms disappearing due to dropped frames
2019-11-04 02:43:48 -05:00
Steel Titanium
0a33e47619
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
9364427819
Frame 4 typos
2019-11-03 19:53:05 -05:00
mazmazz
925268f60c
Alacroix title: Give Tails his back tails
2019-11-03 18:38:09 -05:00
mazmazz
a7e38c5cc5
Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions
2019-11-03 16:21:21 -05:00
mazmazz
ad0b9e40ae
Alacroix title screen character frames
2019-11-03 10:34:12 -05:00
mazmazz
288d9f9e39
Load Alacroix character frames
2019-11-03 06:30:27 -05:00
mazmazz
ed87a603df
TTMODE_USER logic
2019-11-02 21:51:45 -04:00
mazmazz
35e102492b
Alacroix title animation adjustments
2019-11-02 21:05:01 -04:00
mazmazz
7b9974ddd1
SNTX -> SONT
2019-11-02 13:30:03 -04:00
mazmazz
0b6651eb00
Remove TTCOUNTERSET to simplify custom title SOC
2019-11-02 12:40:12 -04:00
mazmazz
45b7f2e6cc
Multi-res title screen gfx
2019-11-02 12:12:36 -04:00
mazmazz
49917d6f3f
Merge remote-tracking branch 'origin/master' into new-title
2019-11-01 21:06:46 -04:00
Steel Titanium
ea085a4c5b
Merge branch 'revert-34a41977' into 'master'
...
Revert "Revert "Merge branch 'revert-55b91940' into 'master'""
See merge request STJr/SRB2Internal!435
2019-10-30 06:11:33 -04:00
Steel Titanium
bdf425adab
Revert "Revert "Merge branch 'revert-55b91940' into 'master'""
...
This reverts commit 34a4197716
2019-10-30 10:09:54 +00:00
Steel Titanium
34a4197716
Revert "Merge branch 'revert-55b91940' into 'master'"
...
This reverts merge request !434
2019-10-30 09:59:02 +00:00
Steel Titanium
f029cd4bb6
Merge branch 'revert-55b91940' 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
2cfa7b307d
Revert "Merge branch 'update-libs' into 'master'"
...
This reverts merge request !433
2019-10-30 09:07:56 +00:00
Steel Titanium
55b91940d8
Merge branch 'update-libs' into 'master'
...
Update various of libraries
See merge request STJr/SRB2Internal!433
2019-10-30 05:01:18 -04:00
Jaime Passos
2e1ecda3fa
Use doomtype.h types instead of libpng types
2019-10-29 00:15:33 -03:00
Steel Titanium
938ed06173
Update SDL2 to 2.0.10
2019-10-28 22:48:19 -04:00
Jaime Passos
34f1dc20b1
Fix warnings when NOPNG=1
2019-10-28 23:46:33 -03:00
Louis-Antoine
027c60d47d
Fix some intro fades displaying text in all-caps
2019-10-28 16:10:22 +01:00
toaster
50e89d3863
Merge branch 'noautobrakefix' into 'master'
...
Forgot to make pw_noautobrake count down........
See merge request STJr/SRB2Internal!427
2019-10-28 10:08:53 -04:00
toaster
d28788786e
Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake...
2019-10-28 13:01:15 +00:00
toaster
250e6d71ae
Forgot to make pw_noautobrake count down........
2019-10-28 12:54:55 +00:00
toaster
95e8ea0f8a
Fix map_cons_t[] not having a null terminator, which should hopefully allow Lach to actually start their builds up on Mac again.
2019-10-28 11:34:20 +00:00
Steel Titanium
dddf161dc9
Merge branch 'master' into update-libs
2019-10-27 16:04:56 -04:00
toaster
972b8ca733
* Add alternate numerical drawer for continues on Intermission screen if there's > 5.
...
* Tweak offsets on Continue screen numerical continue drawer to match.
2019-10-27 17:20:43 +00:00
mazmazz
26100abdc4
Fix char select music not playing in secrets menu
2019-10-27 13:12:36 -04:00
toaster
1f92a73135
Fix unsigned/signed comparisons.
2019-10-27 11:18:37 +00:00
Nev3r
2b33529b7c
Missing ;
2019-10-27 12:03:52 +01:00
MascaraSnake
1e822edb70
Fixed a typo in the ZB config
2019-10-26 22:56:01 +02:00
MascaraSnake
04841768e4
Merge branch 'use-zones-pk3' into 'master'
...
Use zones.pk3 instead of zones.dta.
See merge request STJr/SRB2Internal!352
2019-10-26 15:33:13 -04:00
