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 |
|
Steel Titanium
|
938ed06173
|
Update SDL2 to 2.0.10
|
2019-10-28 22:48:19 -04: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
|
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 |
|
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 |
|
MascaraSnake
|
2df34ef2cf
|
Merge branch 'midi-toggle-fix' into 'master'
Fix MIDI not being disabled when non-native
See merge request STJr/SRB2Internal!414
|
2019-10-26 14:46:25 -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
|
e60821962b
|
Merge branch 'knuxstuff' into 'master'
Knuckles gameplay changes and/or improvements
See merge request STJr/SRB2Internal!354
|
2019-10-26 02:41:40 -04: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 |
|
mazmazz
|
31d7254d14
|
Merge branch 'master' into new-title
|
2019-10-25 22:29:29 -04:00 |
|
mazmazz
|
f43329210f
|
Merge remote-tracking branch 'origin/new-title' into new-title
|
2019-10-25 22:28:31 -04: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 |
|