TehRealSalt
80690136d6
mobjscale: MT_FIREDITEM fix
2018-03-04 15:59:51 -05:00
TehRealSalt
18ece8db5e
Made a lot of gametype checks use either G_RaceGametype or G_BattleGametype
...
Should make it a lot easier to add more gametypes later.
Also some minor fixes:
- Changed up how shell speed scales in mobjscale juuuust slightly, so
it's less messy
- Fixed CHECK showing spectators
2018-03-04 15:27:52 -05:00
TehRealSalt
3385df84ce
General fixes
...
- Flame trails don't spawn if you're not on the ground
- Mobjscale: Shells are now the correct speed
- Mobjscale: Explosion's wipeout hit height scales
2018-03-04 14:28:29 -05:00
Monster Iestyn
ced141d596
Merge branch 'master' into next
2018-03-04 19:10:01 +00:00
Monster Iestyn
f25eb1705a
Merge branch 'linux-limbo' into 'master'
...
Linux limbo
See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
Monster Iestyn
8b586690a8
Merge branch 'soc-sanitizing' into 'next'
...
SOC sanitizing
See merge request STJr/SRB2!227
2018-03-04 14:07:30 -05:00
Monster Iestyn
084e718414
Merge branch 'console-key-breakfast' into 'master'
...
Console key breakfast
See merge request STJr/SRB2!226
2018-03-04 14:06:40 -05:00
TehRealSalt
28f5a874d4
Revamped race position
...
Should support ties for real now :V
2018-03-02 00:02:26 -05:00
TehRealSalt
283241ba41
And a few more fixes that went under my nose
...
For later: fix sound test in the options menu, make the cheat notif
sound only play if it can unlock something
2018-03-01 19:07:07 -05:00
TehRealSalt
ab35dc6dbb
Some unlockable stuff
...
- Secrets renamed to Extras
- Extras leads to the checklist instead of another menu
- Credits & Sound Test are on the Options menu now
- New title screen cheat for unlocking everything ("banana", or "← ↑ → →
↑ ← ↓ → Enter")
2018-03-01 19:00:16 -05:00
TehRealSalt
3d84c3fe2e
Hopefully this fixes item throwing & distribution in mobjscale maps
2018-03-01 17:20:13 -05:00
TehRealSalt
ba4e9a3a57
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-01 17:13:57 -05:00
TehRealSalt
81e2cb4aa5
Attempted to fix how voting handles no votes
...
I don't know exactly what it did previously since I never actually
observed what happens, but now in dedicated servers it will wait for
time to run out, then if there's no votes by that time it will just go
onto nextlevel
2018-03-01 17:05:36 -05:00
TehRealSalt
8fb066ff21
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-01 17:02:09 -05:00
TehRealSalt
1667c84378
Restore battle wait fade
2018-02-27 22:07:20 -05:00
TehRealSalt
615c5557b5
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-02-27 21:50:43 -05:00
TehRealSalt
4b0815f2dc
Taunt sound simplification
2018-02-27 21:18:42 -05:00
TehRealSalt
e591c8ebff
Some offset adjustin'
2018-02-27 21:17:34 -05:00
TehRealSalt
6988888d75
Another minor voting thing
2018-02-27 20:52:12 -05:00
TehRealSalt
f0990a1db9
Fixed an odd bug
2018-02-27 20:46:01 -05:00
TehRealSalt
8c3f78a925
Race position starts
2018-02-27 20:40:06 -05:00
TehRealSalt
e1a78568a3
Actual Race starts
2018-02-27 19:53:12 -05:00
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
