Commit graph

2758 commits

Author SHA1 Message Date
Steel Titanium
e03b277fcb Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat 2018-12-21 20:29:33 -05:00
Latapostrophe
08c2975cf6 Merge branch 'SRB2-CHAT-FLOAT-FIX' into 'SRB2-CHAT'
Adjust vid.width floating point comparson for CHAT

See merge request SinnamonLat/SRB2!3
2018-12-21 11:51:24 -05:00
mazmazz
c4939212dc Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
Latapostrophe
d51b5fa676 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe
d83c3ccfff Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
Latapostrophe
cd1b929524 Merge branch 'srb2chat' into 'SRB2-CHAT'
fix my fucking code

See merge request SinnamonLat/SRB2!1
2018-12-18 11:51:18 -05:00
Latapostrophe
5395378d73 Merge branch 'SRB2-CHAT-COMPILE' into 'SRB2-CHAT'
Compile fixes for buidbots

See merge request SinnamonLat/SRB2!2
2018-12-18 11:45:01 -05:00
mazmazz
d07f44457f Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz
54abae1dde Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz
a607372283 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz
6a87980afd Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz
7c7d85bf74 Fix compile errors 2018-12-17 18:55:21 -05:00
MPC
79653dd094 fix the fucking warning 2018-12-17 18:09:29 -03:00
MPC
a28aeaf23b fix my fucking code 2018-12-17 17:57:53 -03:00
Latapostrophe
71074ccce1 make sure to change p_dispy and not y for /pm list. Also make MPC happy. 2018-12-17 21:39:49 +01:00
Latapostrophe
be35a106c5 Don't overlap ringslinger HUD 2018-12-17 21:31:31 +01:00
Latapostrophe
4c88271cfb 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
Latapostrophe
34f13e9f20 merge conflict 2018-12-16 16:48:15 +01:00
Digiku
c25451e167 Merge branch 'linux-symlink' into 'master'
Add symlink to debian package for /usr/games/srb2

See merge request STJr/SRB2!385
2018-12-15 22:17:04 -05:00
mazmazz
a0aa9bb466 Add symlink to debian package for /usr/games/srb2 2018-12-14 16:19:38 -05:00
Monster Iestyn
dcf65e0f72 Merge branch 'master' into next 2018-12-13 22:21:31 +00:00
Monster Iestyn
2ca1cd415e Merge branch 'cfg-srb2home-fix' into 'master'
Apply srb2home path to EXEC, SAVECONFIG, and debugfile

See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
Digiku
db7d712ebe Merge branch 'awayviewmobj-sanity-checks' into 'next'
Awayviewmobj sanity checks

See merge request STJr/SRB2!377
2018-12-13 16:11:27 -05:00
Digiku
dbaa3aaf3b Merge branch 'savegamename-fix' into 'master'
Fix savegamename being improperly built

See merge request STJr/SRB2!378
2018-12-13 16:11:13 -05:00
mazmazz
a396ad5240 Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-13 13:32:38 -05:00
mazmazz
17766f3130 Apply srb2home to debugfile 2018-12-13 13:23:09 -05:00
mazmazz
2406de3167 Apply srb2home to SAVECONFIG 2018-12-13 13:17:56 -05:00
mazmazz
56e54a38cc EXEC: Search for CFG by file path 2018-12-13 13:11:25 -05:00
mazmazz
847350d664 Fix savegamename being improperly built due to missing null char after copying timeattackfolder 2018-12-13 12:01:07 -05:00
Monster Iestyn
ee474bab23 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
Digiku
09c57a719b 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
4a712f936d Remove windows installer 2018-12-07 16:56:48 -05:00
Digiku
3880da272b 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
72e55b4623 Windows string adjustment 2018-12-06 15:42:58 -05:00
mazmazz
dac15d2283 Adjust version strings 2018-12-06 15:39:19 -05:00
Digiku
31b88c5195 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
439fff4402 Register execversion and remove CV_SAVE because we write manually 2018-12-06 12:28:30 -05:00
mazmazz
49d899ffea a stray if block 2018-12-06 12:03:53 -05:00
mazmazz
86b3221986 alwaysfreelook -> alwaysmlook string 2018-12-06 12:02:45 -05:00
mazmazz
fd6f5a9fbd 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
d0011199a9 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
5e6e0d539b Use proper DD define for use_joystick 2018-12-06 06:50:18 -05:00
mazmazz
e8584f2535 Implement EXECVERSION consvar to invalidate previous versions' default config values 2018-12-06 06:28:34 -05:00
mazmazz
d488dd0763 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
Digiku
4b16dec91e 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
0e0ccf2ae6 Change 2p controller defaults 2018-12-06 05:26:28 -05:00
Digiku
ba0088ef92 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
41ca8bb24a Hex instead of octal colors 2018-12-05 13:08:25 -05:00
mazmazz
e30832216f More concise bitness check 2018-12-05 13:06:56 -05:00
mazmazz
a0938bdd24 Make the ifdefs cleaner 2018-12-05 13:00:42 -05:00