Commit Graph

2614 Commits

Author SHA1 Message Date
TehRealSalt acb98b50c7 Another minor voting thing 2018-02-27 20:52:12 -05:00
TehRealSalt 29e4c6764d Fixed an odd bug 2018-02-27 20:46:01 -05:00
TehRealSalt adfe3337cb Race position starts 2018-02-27 20:40:06 -05:00
TehRealSalt aa15b34a08 Actual Race starts 2018-02-27 19:53:12 -05:00
TehRealSalt a9a74bc2c8 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-02-27 19:13:32 -05:00
Sryder 631b96883a Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git 2018-02-24 22:38:28 +00:00
Monster Iestyn 4a0305eec8 more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL 2018-02-23 20:40:19 +00:00
Monster Iestyn 1216c9da18 Use __linux__ instead of LINUX/LINUX64
Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway
2018-02-23 20:21:16 +00:00
Monster Iestyn 6e21059713 Eat unprintable keys too, since there's no reason to feed them to G_Responder anyway when the console is open 2018-02-23 20:08:02 +00:00
Sryder 0454293bae Hopefully a few more fixes and sanity changes for map voting 2018-02-23 01:53:30 +00:00
Sryder 387f6b904c I don't see a reason for this to be in caps, but it stops me compiling DEVELOP on linux so fix 2018-02-23 01:11:31 +00:00
Sryder dbc27e9c9e It's SINT8 not INT8 2018-02-23 01:04:52 +00:00
TehRealSalt d508137bb9 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-02-22 00:07:51 -05:00
Monster Iestyn ad8c51ab8f removing stupid dumb useless code fish 2018-02-21 22:45:51 +00:00
TehRealSalt cb593aa2b1 Battle Mode wins award (player count * 2) points now 2018-02-20 20:08:53 -05:00
TehRealSalt 6d3d098c3f Fixed stereoreverse, and its effects are applied to mirror mode
How long has this cvar been broken?!
2018-02-20 20:04:33 -05:00
TehRealSalt da32f9a4ed Fixed fourth taunt sound not playing
% 4 would output 0 to 3, not 1 to 4 guys :V
2018-02-20 19:33:50 -05:00
TehRealSalt 2a23549d63 Winning positions scale with number of players
Anyone in the top 50% gets winning music & blue position, everyone below
gets the losing music & red position. For odd numbers, it rounds up.
2p: 1st wins, 2nd loses
3p: 1-2 win, 3rd loses
4p:  1-2 win, 3-4 lose
5p: 1-3 win, 4-5 lose
6p: 1-3 win, 4-6 lose
7p: 1-4 win, 5-7 lose
8p: 1-4 win, 5-8 lose (SMK)
12p: 1-6 win, 7-12 lose (modern MK)
16p: 1-8 win, 9-16 lose (max player count)
In big netgames you won't just hear the losing music all of the time now
:V
2018-02-20 19:11:09 -05:00
TehRealSalt ccae121c26 Quick fix 2018-02-20 18:18:10 -05:00
Monster Iestyn fb3e78c020 Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder 2018-02-20 17:06:03 +00:00
TehRealSalt 275132da5f Minor but important fixes 2018-02-17 01:53:44 -05:00
Steel Titanium 36d1259ceb Removed some redundant checks 2018-02-17 00:37:17 -05:00
Steel Titanium d921f26e54 Don't init the sound system on dedicated servers 2018-02-17 00:01:42 -05:00
Alam Ed Arias 99552c2ba2 Merge branch 'master' into next 2018-02-14 10:29:24 -05:00
Alam Arias 4cbe2e1622
Merge pull request #231 from LJSonik/net-command-leak-fix
Fix net commands not always being freed
2018-02-14 10:28:32 -05:00
Louis-Antoine c7320f9f82 Don't allocate memory for net commands already executed, as it would cause them to be never freed 2018-02-14 15:09:52 +01:00
TehRealSalt 581e231a3e sonicitems porting, Part 2
BUT with more tweaks on top of that:
- matchesplayed can go up & unlock stuff regardless of modifiedgame
- votetime added to menu
- flame jets are fullbright (been meaning to do this for a while)
- screenshots are prefixed with kart instead of srb2 (ditto)
2018-02-13 18:13:27 -05:00
TehRealSalt 3e7fbad490 Porting over some things from sonicitems 2018-02-13 16:48:09 -05:00
TehRealSalt 0db99ff2c4 Merge remote-tracking branch 'refs/remotes/origin/democracy' 2018-02-10 20:00:20 -05:00
TehRealSalt 51029b2880 Remove comment 2018-02-10 19:56:05 -05:00
TehRealSalt bfd7915a01 Random picking animation 2018-02-10 19:02:15 -05:00
TehRealSalt 2af4f0451a One last thing: don't add whatever the game rolls for the random option
Makes it even more of a wild-card option, also makes sure that you
actually *see* all of the maps before it empties
2018-02-10 16:50:44 -05:00
TehRealSalt bc99e0963e Maybe fixed 2018-02-10 16:28:45 -05:00
TehRealSalt 8f74b1afcd Faster 2018-02-09 21:14:14 -05:00
TehRealSalt 9088e3dbab Slight adjustment 2018-02-09 16:04:52 -05:00
TehRealSalt 70f959815a Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-08 21:24:56 -05:00
TehRealSalt 98fa8c1409 Added axis support 2018-02-08 21:24:44 -05:00
Sryder13 844b1dc2c0 Some warning fixes 2018-02-09 00:58:10 +00:00
TehRealSalt ec84b46bb4 P != M 2018-02-08 18:14:56 -05:00
TehRealSalt 85a81ed087 Minor adjustments in hopes that I fixed the resynch bomb on gametype switch? 2018-02-08 17:13:06 -05:00
Monster Iestyn fe2fd432e8 Merge branch 'stopleakingnames' into 'master'
Stop leaking names via metadata.

See merge request STJr/SRB2!223
2018-02-08 16:14:15 -05:00
Monster Iestyn c42c70cb34 Merge branch 'playdemo-custom-home-fix' into 'next'
Fix for "playdemo" not working with custom home paths

See merge request STJr/SRB2!221
2018-02-08 15:29:39 -05:00
Monster Iestyn b898dc397d Merge branch 'lua-archive-crash-hotfixes' into 'next'
Hotfix for "LUA PANIC" crash when joining a netgame

See merge request STJr/SRB2!222
2018-02-08 15:29:20 -05:00
Sryder13 858a7adcb3 The main explosion particles bounce off the floor too 2018-02-08 15:46:07 +00:00
TehRealSalt 56f1263f34 Guess what.
A typo. :V
2018-02-08 00:53:25 -05:00
TehRealSalt 32ee651f43 /me tears away a piece of drywall
What's revealed is that democracy is actually made *entirely* out of
extremely minor 1 character long typos eating away at the structural
integrity of the building, and then the crack starts oozing green slime,
and then a creepy hand comes out and grabs you
2018-02-08 00:45:59 -05:00
TehRealSalt 2c09dd1df1 Minor fixes 2018-02-07 22:45:40 -05:00
TehRealSalt e6c040b844 Merge remote-tracking branch 'refs/remotes/origin/master' into democracy 2018-02-07 22:34:33 -05:00
TehRealSalt 6b63e44ff9 Forgotten 2018-02-05 20:23:09 -05:00
TehRealSalt e516d09ae4 Colored boom
Not tested *yet*
2018-02-05 20:10:20 -05:00