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 |
|
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 |
|
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 |
|
Jaime Passos
|
2e1ecda3fa
|
Use doomtype.h types instead of libpng types
|
2019-10-29 00:15:33 -03: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
|
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 |
|
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
|
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 |
|
MascaraSnake
|
1019116ede
|
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
|
08bc1ea590
|
Fix MIDI not being disabled when non-native
|
2019-10-26 12:09:27 -04:00 |
|
lachwright
|
9401241d6d
|
Merge branch 'master' into metalstuff
|
2019-10-26 16:07:59 +08:00 |
|
MascaraSnake
|
b2190da52b
|
Merge branch 'master' into knuxstuff
|
2019-10-26 08:09:13 +02:00 |
|
James R
|
8cb348424a
|
Differing signedness comparison
|
2019-10-25 21:44:34 -07:00 |
|
James R
|
ac3e90b9a0
|
I say damn you massive initializer!
|
2019-10-25 21:36:10 -07:00 |
|
lachwright
|
b3dab79f7c
|
Fix pointer typo (whoops)
|
2019-10-26 08:34:38 +08:00 |
|
lachwright
|
8958355e22
|
Remove imtermediary state transitions
|
2019-10-26 08:32:36 +08:00 |
|
lachwright
|
fa206f7411
|
Merge branch 'master' into metalstuff
|
2019-10-26 08:30:37 +08:00 |
|
lachwright
|
4835d26c8b
|
Merge branch 'master' into knuxstuff
|
2019-10-26 05:53:49 +08:00 |
|
MascaraSnake
|
0073310c39
|
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
|
9574f8ac78
|
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
|
b0136da8b6
|
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
|
3232c5dc25
|
Some basic code hygiene: Remove references to the air bob code being "old" or "outdated"
|
2019-10-25 22:55:10 +02:00 |
|
MascaraSnake
|
24ede2cfc9
|
Merge branch 'hammer-landing' into 'master'
Twinspin landing option
See merge request STJr/SRB2Internal!402
|
2019-10-25 16:39:02 -04:00 |
|
MascaraSnake
|
6c45b44070
|
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
|
a039814673
|
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
|
f5f21db2f4
|
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
|
2004577314
|
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
|
92faebafc9
|
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
|
7c9c2553b2
|
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
|
0842d1f328
|
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
|
c8cfe08144
|
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
|
a6b3491922
|
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
|
13edddc735
|
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 |
|
MascaraSnake
|
e8b788918f
|
Merge branch 'walltransfermove' into 'master'
Let players move after spinning off a wall transfer
See merge request STJr/SRB2Internal!412
|
2019-10-25 15:20:20 -04:00 |
|
MascaraSnake
|
604198280e
|
Merge branch 'superminecarts' into 'master'
Super and Minecarts fixes (resolves #259)
Closes #259
See merge request STJr/SRB2Internal!408
|
2019-10-25 15:19:47 -04:00 |
|
MascaraSnake
|
bd51ac8a70
|
Merge branch 'nonightsbot' into 'master'
Disable tailsbot in NiGHTS maps (resolves #261)
Closes #261
See merge request STJr/SRB2Internal!409
|
2019-10-25 15:19:05 -04:00 |
|
MascaraSnake
|
4469294972
|
Merge branch 'cezfangcheat' into 'master'
CEZ3 Fang cheat fix (resolves #262)
Closes #262
See merge request STJr/SRB2Internal!410
|
2019-10-25 15:18:16 -04:00 |
|