toaster
8e2cb88576
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
2f22547889
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
068c712824
Shut up
2019-11-09 17:24:10 +01:00
Louis-Antoine
aa20e304cf
Fix silly typo :P
2019-11-09 15:46:34 +01:00
James R
b157c21a35
There's some whitespace...
2019-11-07 14:56:42 -08:00
James R
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
James R
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
James R
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
James R
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
James R
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
James R
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
Jaime Passos
6d024b7124
I guess I'll have to do at least SOMETHING about OpenGL
2019-11-05 17:35:16 -03:00
Jaime Passos
ed967f077c
Restore the last gameplay frame while on the intermission screen
2019-11-05 17:04:57 -03: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
Jaime Passos
5464b6ab28
Use doomtype.h types instead of libpng types
2019-10-29 00:15:33 -03:00
Jaime Passos
0a49340ae1
Fix warnings when NOPNG=1
2019-10-28 23:46:33 -03:00
Louis-Antoine
e91bf1a32e
Fix some intro fades displaying text in all-caps
2019-10-28 16:10:22 +01:00
toaster
d9196485f6
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
17dde0d91c
Forgot to make pw_noautobrake count down........
2019-10-28 12:54:55 +00:00
toaster
22649f698e
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
toaster
df785e1651
* 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
23c6011348
Fix char select music not playing in secrets menu
2019-10-27 13:12:36 -04:00
toaster
c221a89c67
Fix unsigned/signed comparisons.
2019-10-27 11:18:37 +00:00
Nev3r
a58c794691
Missing ;
2019-10-27 12:03:52 +01:00
MascaraSnake
801e83aef6
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
MascaraSnake
9e9e6a8f8f
Merge branch 'metalstuff' into 'master'
...
Metal Sonic's jet fume
See merge request STJr/SRB2Internal!413
2019-10-26 14:52:04 -04:00
mazmazz
26cb75e961
Fix MIDI not being disabled when non-native
2019-10-26 12:09:27 -04:00
lachwright
e89948ce71
Merge branch 'master' into metalstuff
2019-10-26 16:07:59 +08:00
MascaraSnake
92be187731
Merge branch 'master' into knuxstuff
2019-10-26 08:09:13 +02:00
James R
634292a5fc
Differing signedness comparison
2019-10-25 21:44:34 -07:00
James R
64e7708832
I say damn you massive initializer!
2019-10-25 21:36:10 -07:00
lachwright
6c9ad67c84
Fix pointer typo (whoops)
2019-10-26 08:34:38 +08:00
lachwright
aa34f74f75
Remove imtermediary state transitions
2019-10-26 08:32:36 +08:00
lachwright
ca768b044d
Merge branch 'master' into metalstuff
2019-10-26 08:30:37 +08:00
lachwright
63d24d529a
Merge branch 'master' into knuxstuff
2019-10-26 05:53:49 +08:00
MascaraSnake
03c5b70fc5
Merge branch 'newmenus' into 'master'
...
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252 )
Closes #245 , #244 , and #252
See merge request STJr/SRB2Internal!389
2019-10-25 17:46:16 -04:00
MascaraSnake
4d022046fa
Merge branch 'object_tweaks' into 'master'
...
Object tweaks (object_tweaks division 3)
See merge request STJr/SRB2Internal!394
2019-10-25 17:45:48 -04:00
MascaraSnake
1c1fefe25f
Merge branch 'linedef-153' into 'master'
...
Dynamic Sinking Platform (for Red Volcano Zone)
See merge request STJr/SRB2Internal!401
2019-10-25 16:56:19 -04:00
MascaraSnake
46d105dd53
Some basic code hygiene: Remove references to the air bob code being "old" or "outdated"
2019-10-25 22:55:10 +02:00
MascaraSnake
2118b0e613
Merge branch 'hammer-landing' into 'master'
...
Twinspin landing option
See merge request STJr/SRB2Internal!402
2019-10-25 16:39:02 -04:00
MascaraSnake
faf61912a6
Merge branch 'lua-allow-player' into 'master'
...
Allow access to players userdata outside levels.
See merge request STJr/SRB2Internal!386
2019-10-25 15:40:31 -04:00
MascaraSnake
7d69409cf7
Merge branch 'set-name-on-join' into 'master'
...
Set the player's name as soon as they enter the game
See merge request STJr/SRB2Internal!397
2019-10-25 15:38:21 -04:00
MascaraSnake
4a9eb387f7
Merge branch 'window-focus-music' into 'master'
...
Window focus options for playing sounds/music
See merge request STJr/SRB2Internal!407
2019-10-25 15:37:06 -04:00
MascaraSnake
2a8e5b7bff
Merge branch 'james-kart' into 'master'
...
My changes to Kart
See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
MascaraSnake
f1a7a3b4de
Merge branch 'kartport_misc-changes' into 'master'
...
Kart ports: misc changes
See merge request STJr/SRB2Internal!380
2019-10-25 15:33:30 -04:00
MascaraSnake
ff061fb813
Merge branch 'kartport_namedvalues' into 'master'
...
Kart-port - Named cvar values + Improved "HELP" command (round 3)
See merge request STJr/SRB2Internal!388
2019-10-25 15:32:56 -04:00
toaster
f2596ab0bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
...
# Conflicts:
# extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00
MascaraSnake
403d698724
Merge branch 'mi-tinkers-with-lua-again' into 'master'
...
MI tinkers with lua again
See merge request STJr/SRB2Internal!392
2019-10-25 15:27:55 -04:00
MascaraSnake
d7480f20fa
Merge branch 'intangible-flats-tangible-sides' into 'master'
...
Collide with walls of FOF if both planes are intangible
See merge request STJr/SRB2Internal!385
2019-10-25 15:26:54 -04:00
MascaraSnake
080ff854b8
Merge branch 'be-more-nice-with-levelselect-mp' into 'master'
...
Remove level select restrictions in DEVELOP Multiplayer
Closes #238
See merge request STJr/SRB2Internal!399
2019-10-25 15:26:09 -04:00