Commit graph

5014 commits

Author SHA1 Message Date
mazmazz 93f7f0a8df Apply srb2home to debugfile 2018-12-13 13:23:09 -05:00
mazmazz b1641aa8e9 Apply srb2home to SAVECONFIG 2018-12-13 13:17:56 -05:00
mazmazz 93eda4e7c9 EXEC: Search for CFG by file path 2018-12-13 13:11:25 -05:00
mazmazz b84470ec51 Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-13 12:01:07 -05:00
SeventhSentinel 2cb2b02b73 Fix Ballhog under the last commit...
It actually uses trailing item's throw speeds instead of its own, oddly enough; I don't want to mess with the gameplay there, so I just gave it its own exception.
2018-12-13 09:47:14 -05:00
SeventhSentinel 6d19be6412 Make SPB follow the same rules too 2018-12-13 09:34:27 -05:00
SeventhSentinel bbf8222767 Stupid Orbinaut bullshit
- Fix Orbinaut/Jawz not accepting top speed changes (This means back-spam being slower now for real works, and the speed buff on boosters for real works.)
- Make the top-speed buffs for boosters not work for back-spam
2018-12-12 21:25:18 -05:00
Jimita e628d98f20
Update am_map.c 2018-12-12 19:59:21 -02:00
Jimita a5874019cb
Update am_map.c 2018-12-12 19:57:52 -02:00
MPC 649b6c9ca1 Remove MINIAUTOMAP code 2018-12-12 18:53:13 -03:00
MPC 6b22dc183b Fix the automap 2018-12-12 18:01:52 -03:00
Jimita 966afb6017
Update p_user.c 2018-12-12 13:09:47 -02:00
Jimita 172fd3bf52
Merge branch 'master' into the_second_remote_view_camera_fix 2018-12-11 21:52:28 -02:00
MPC c68875ad93 Fix remote viewpoint cameras for real
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn 582c5332f4 Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens 2018-12-11 18:39:58 +00:00
MPC 348ed1e43f Large room fix 2018-12-09 19:34:17 -03:00
mazmazz 47ee3525af Indentation 2018-12-08 14:10:56 -05:00
mazmazz 01f1933f69 Force directsound to fix wrong-pitch sound effects 2018-12-08 14:05:58 -05:00
Digiku feb7b05e6e Merge branch 'no-more-installer' into 'master'
Remove windows installer

See merge request STJr/SRB2!372
2018-12-07 16:58:37 -05:00
mazmazz 6b5fc921f2 Remove windows installer 2018-12-07 16:56:48 -05:00
Digiku 1029463741 Merge branch '21-version' into 'next'
Update code versions to 2.1.21

See merge request STJr/SRB2!338
2018-12-06 17:20:45 -05:00
mazmazz df89781623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz ba60989c00 Adjust version strings 2018-12-06 15:39:19 -05:00
Digiku 17e9188c89 Merge branch 'execversion' into '21-version'
Block previous versions' config defaults with EXECVERSION consvar

See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz 3ceeb6a205 Register execversion and remove CV_SAVE because we write manually 2018-12-06 12:28:30 -05:00
mazmazz 0be61e8830 a stray if block 2018-12-06 12:03:53 -05:00
mazmazz a5eb62b73e alwaysfreelook -> alwaysmlook string 2018-12-06 12:02:45 -05:00
mazmazz 70aa4ce18e Add alwaysfreelook2 and mousemove2 to config versioning
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
Digiku 88b2e5ce84 Merge branch 'fire-trigger' into '21-version'
Controller defaults: Set Ring Toss to right trigger instead of left trigger

See merge request STJr/SRB2!370
2018-12-06 08:15:38 -05:00
mazmazz f0c7848e50 Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz 5b3a1e0c55 Implement EXECVERSION consvar to invalidate previous versions' default config values 2018-12-06 06:28:34 -05:00
mazmazz a802069313 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
Digiku 7852e418d5 Merge branch '21-tweaks' into '21-version'
Change 2p controller defaults

See merge request STJr/SRB2!369
2018-12-06 05:48:06 -05:00
mazmazz aaf5d2e1dc Change 2p controller defaults 2018-12-06 05:26:28 -05:00
TehRealSalt c599d84d6e Actually, best of both:
Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
2018-12-05 23:28:44 -05:00
TehRealSalt 9bafdaf492 > 2
Same here
2018-12-05 22:54:06 -05:00
TehRealSalt 0bd0240464 < -2
I doubt this hurts anything, but might as well I guess
2018-12-05 22:53:34 -05:00
TehRealSalt c2dfc1155f Set Shrink timer, don't add to it 2018-12-05 22:51:08 -05:00
TehRealSalt 101feb9498 Add Miku's author to credits. 2018-12-05 21:58:26 -05:00
Sal 261319b754 Merge branch 'force-spb' into 'master'
Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.

See merge request KartKrew/Kart!119
2018-12-05 21:43:59 -05:00
TehRealSalt 97f2f858ad Give lap animation V_SNAPTOTOP as intended 2018-12-05 21:39:34 -05:00
TehRealSalt 116b10c29d Comment out M_DrawSaveLoadBorder 2018-12-05 21:27:51 -05:00
TehRealSalt d0180ecb15 Cut this down slightly 2018-12-05 20:54:58 -05:00
TehRealSalt d53e4af93a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-05 20:46:48 -05:00
TehRealSalt 7ab098636b Edited even more things to say "SRB2Kart" 2018-12-05 20:40:58 -05:00
TehRealSalt d16c47ccb6 Edited the installer to support SRB2Kart
There is a LOT that can go wrong here, so I'm not gonna make this a priority for v1.0.2. If someone else wants to take a crack at maintaining this though, and fixing any and all inconsistencies, then feel free.
2018-12-05 20:39:42 -05:00
TehRealSalt df191639bd Merge remote-tracking branch 'srb2public/master' into merge-next 2018-12-05 19:21:13 -05:00
TehRealSalt b3b5b3f81d Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out. 2018-12-05 19:09:05 -05:00
Digiku 68ed55fa71 Merge branch 'versionflags' into '21-version'
Add OS and 32/64-bitness to VERSION console command

See merge request STJr/SRB2!368
2018-12-05 13:15:21 -05:00
mazmazz 9055c9aeab Hex instead of octal colors 2018-12-05 13:08:25 -05:00