mazmazz
|
fc02b73534
|
Remove TTCOUNTERSET to simplify custom title SOC
|
2019-11-02 12:40:12 -04:00 |
|
mazmazz
|
1ebcdb5344
|
Multi-res title screen gfx
|
2019-11-02 12:12:36 -04:00 |
|
mazmazz
|
0c1b5f07f0
|
Merge remote-tracking branch 'origin/master' into new-title
|
2019-11-01 21:06:46 -04:00 |
|
Steel Titanium
|
96aa11c825
|
Merge branch 'revert-eda30fc9' into 'master'
Revert "Revert "Merge branch 'revert-973ad693' into 'master'""
See merge request STJr/SRB2Internal!435
|
2019-10-30 06:11:33 -04:00 |
|
Steel Titanium
|
0df7691d30
|
Revert "Revert "Merge branch 'revert-973ad693' into 'master'""
This reverts commit eda30fc995
|
2019-10-30 10:09:54 +00:00 |
|
Steel Titanium
|
eda30fc995
|
Revert "Merge branch 'revert-973ad693' into 'master'"
This reverts merge request !434
|
2019-10-30 09:59:02 +00:00 |
|
Steel Titanium
|
9bd9df6726
|
Merge branch 'revert-973ad693' 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
|
76457663f0
|
Revert "Merge branch 'update-libs' into 'master'"
This reverts merge request !433
|
2019-10-30 09:07:56 +00:00 |
|
Steel Titanium
|
973ad6930d
|
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
|
64e07ac954
|
Update SDL2 to 2.0.10
|
2019-10-28 22:48:19 -04:00 |
|
toaster
|
97dd22e0e9
|
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
|
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 |
|
Steel Titanium
|
95a2ef4021
|
Merge branch 'master' into update-libs
|
2019-10-27 16:04:56 -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
|
336c5cc61d
|
Fixed a typo in the ZB config
|
2019-10-26 22:56:01 +02: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 |
|
MascaraSnake
|
b6905f2733
|
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
|
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
|
be5da92a8d
|
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
|
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 |
|
mazmazz
|
c7c72a4892
|
Merge branch 'master' into new-title
|
2019-10-25 22:29:29 -04:00 |
|
mazmazz
|
8a8e91914b
|
Merge remote-tracking branch 'origin/new-title' into new-title
|
2019-10-25 22:28:31 -04: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 |
|
MascaraSnake
|
829706a090
|
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
|
5a28c03a26
|
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 |
|