TehRealSalt
874fb70119
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-02-27 19:13:32 -05:00
Sryder
2b048bf77e
Merge branch 'flair' of git@git.magicalgirl.moe:KartKrew/Kart.git
2018-02-24 22:38:28 +00:00
Monster Iestyn
39949392ca
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
a4637a6dec
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
ce78df03d0
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
16fed26707
Hopefully a few more fixes and sanity changes for map voting
2018-02-23 01:53:30 +00:00
Sryder
192d28f7e0
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
6abc6aa4d2
It's SINT8 not INT8
2018-02-23 01:04:52 +00:00
TehRealSalt
585e7a2ca2
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-02-22 00:07:51 -05:00
Monster Iestyn
628f9921a8
removing stupid dumb useless code fish
2018-02-21 22:45:51 +00:00
TehRealSalt
c6ca5e6920
Battle Mode wins award (player count * 2) points now
2018-02-20 20:08:53 -05:00
TehRealSalt
7b05192695
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
c550bc3df1
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
11e2d9c6cf
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
d07160bcba
Quick fix
2018-02-20 18:18:10 -05:00
Monster Iestyn
bef710aa8f
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
af10a43fc7
Minor but important fixes
2018-02-17 01:53:44 -05:00
Steel Titanium
6d663fefa7
Removed some redundant checks
2018-02-17 00:37:17 -05:00
Steel Titanium
8ba644679b
Don't init the sound system on dedicated servers
2018-02-17 00:01:42 -05:00
Alam Ed Arias
8722b369a3
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Alam Arias
d23d0e0e5b
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
64a108e24a
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
9c5a09d770
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
1a424ba756
Porting over some things from sonicitems
2018-02-13 16:48:09 -05:00
TehRealSalt
3be938d04a
Updated player arrows
2018-02-11 21:47:19 -05:00
TehRealSalt
ff1462898a
Fuck this weird tabbing
2018-02-11 12:50:42 -05:00
TehRealSalt
62b45ff4b0
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
...
# Conflicts:
# src/k_kart.c
(Also I added some extra music for voting, because I forgot I didn't
commit the merge :V)
2018-02-11 12:18:25 -05:00
TehRealSalt
c94df11be1
Merge remote-tracking branch 'refs/remotes/origin/democracy'
2018-02-10 20:00:20 -05:00
TehRealSalt
df600ba780
Remove comment
2018-02-10 19:56:05 -05:00
TehRealSalt
ed55d21682
Random picking animation
2018-02-10 19:02:15 -05:00
TehRealSalt
3db2ff37a2
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
a1be15134e
Maybe fixed
2018-02-10 16:28:45 -05:00
TehRealSalt
e4b1bd3365
Minor fixes, mostly mobjscale and spectators
2018-02-10 16:19:22 -05:00
TehRealSalt
495ee25f18
Chaotix sound effects, new music names
2018-02-10 16:01:09 -05:00
TehRealSalt
eab1120950
New invincibility effect, grow/shrink stuff
...
Whenever grow/shrink effects get made, I'll remove the Mario-style
stuttered growth and whatever else needs doing beyond that
2018-02-10 01:19:33 -05:00
TehRealSalt
b83dd75a99
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-02-09 21:16:10 -05:00
TehRealSalt
2a563d6f25
Faster
2018-02-09 21:14:14 -05:00
TehRealSalt
c542e0453c
Slight adjustment
2018-02-09 16:04:52 -05:00
TehRealSalt
74ccda156b
Merge remote-tracking branch 'refs/remotes/origin/master' into democracy
2018-02-08 21:24:56 -05:00
TehRealSalt
184ec0340b
Added axis support
2018-02-08 21:24:44 -05:00
Sryder13
864f55b57b
Some warning fixes
2018-02-09 00:58:10 +00:00
TehRealSalt
80ba8792bd
P != M
2018-02-08 18:14:56 -05:00
TehRealSalt
496eac9705
Minor adjustments in hopes that I fixed the resynch bomb on gametype switch?
2018-02-08 17:13:06 -05:00
Monster Iestyn
fb6c96de00
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
6f491daa94
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
a550ff6692
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
2a8d91c79f
The main explosion particles bounce off the floor too
2018-02-08 15:46:07 +00:00
TehRealSalt
a299222db7
Guess what.
...
A typo. :V
2018-02-08 00:53:25 -05:00
TehRealSalt
ef0770edda
/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
c32591e767
Minor fixes
2018-02-07 22:45:40 -05:00
