Commit Graph

2762 Commits

Author SHA1 Message Date
Latapostrophe c7060aa5ad Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message. 2018-12-22 16:44:58 +01:00
Latapostrophe 619dd9d08a Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00
Latapostrophe b1ccfa1f46 Merge branch 'latsrb2chat' into 'SRB2-CHAT'
Fix various bugs.

See merge request SinnamonLat/SRB2!4
2018-12-22 04:37:24 -05:00
Steel Titanium 10521d161c Fix various bugs with the chat. 2018-12-21 22:28:28 -05:00
Steel Titanium e42bcd5b68 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat 2018-12-21 20:29:33 -05:00
Latapostrophe d6c99a0133 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 06ff171e19 Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
Latapostrophe 387173ea89 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe a31b85e124 Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
Latapostrophe 9f17039e2e 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 9c9fd2e2f7 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 1fcf607b41 Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz 876ddd48f1 Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz bf21b7c483 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz 7a92c9d3d0 Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz 245a125551 Fix compile errors 2018-12-17 18:55:21 -05:00
MPC ca4329bcb6 fix the fucking warning 2018-12-17 18:09:29 -03:00
MPC 82601e881b fix my fucking code 2018-12-17 17:57:53 -03:00
Latapostrophe 2fdf27c507 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 ff957baae3 Don't overlap ringslinger HUD 2018-12-17 21:31:31 +01:00
Latapostrophe 45aba493c7 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
Latapostrophe 25e6d5388c merge conflict 2018-12-16 16:48:15 +01:00
Digiku f855263f78 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 fa3cc13024 Add symlink to debian package for /usr/games/srb2 2018-12-14 16:19:38 -05:00
Monster Iestyn ef6533fb83 Merge branch 'master' into next 2018-12-13 22:21:31 +00:00
Monster Iestyn 880c017f8f 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 ab7f0ca4fb 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 c57f548c7b 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 d18b2cda59 Apply srb2home to saveconfig ONLY if srb2home isn't already there 2018-12-13 13:32:38 -05:00
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
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
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