Commit graph

2753 commits

Author SHA1 Message Date
TehRealSalt
79b6f3f482 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-06 01:00:12 -05:00
TehRealSalt
53ef60584b Adjusted Sonic's stats
(also made new characters default to 5-5 instead of using Sonic's stats)
2018-03-05 20:14:50 -05:00
TehRealSalt
6650e6c49c Maybe fixed dedicated? 2018-03-05 19:55:39 -05:00
Monster Iestyn
e3151f26dc rewrite download file screen code:
* fix screen to properly truncate the filename to just the real name only
* if the real name itself is too long, use ellipsis and paste in parts of the start and end of the actual name

note: I haven't actually tested if this works or compiles yet, I haven't the time right now
2018-03-05 22:24:03 +00:00
Monster Iestyn
1fe79a0d71 Fix movies not recording the "extension" to special stage intro fades 2018-03-05 19:08:53 +00:00
TehRealSalt
ccc6a03d17 Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-03-04 18:58:34 -05:00
TehRealSalt
23d19e39da whoop, minor thing 2018-03-04 18:57:34 -05:00
TehRealSalt
4d62fbf509 Unlock all cheat no longer sets game modified if it can't find anything to unlock
Sound test is also in the Options menu now.
2018-03-04 18:42:06 -05:00
TehRealSalt
b29ad1e804 mobjscale: MT_FIREDITEM fix 2018-03-04 15:59:51 -05:00
TehRealSalt
f97ec30493 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
1e1867fe42 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
ad1801e7f1 Merge branch 'master' into next 2018-03-04 19:10:01 +00:00
Monster Iestyn
16e60aada9 Merge branch 'linux-limbo' into 'master'
Linux limbo

See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
Monster Iestyn
4fdb82c942 Merge branch 'soc-sanitizing' into 'next'
SOC sanitizing

See merge request STJr/SRB2!227
2018-03-04 14:07:30 -05:00
Monster Iestyn
9843d60e13 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
f985401ca4 Revamped race position
Should support ties for real now :V
2018-03-02 00:02:26 -05:00
TehRealSalt
94b1ce7ce3 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
1a6730fb72 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
b0be1c7bbf Hopefully this fixes item throwing & distribution in mobjscale maps 2018-03-01 17:20:13 -05:00
TehRealSalt
d44ba3715d Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-01 17:13:57 -05:00
TehRealSalt
ce74a4c964 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
a51663da6f Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc 2018-03-01 17:02:09 -05:00
TehRealSalt
f0067d4719 Restore battle wait fade 2018-02-27 22:07:20 -05:00
TehRealSalt
68ce3334ca Merge remote-tracking branch 'refs/remotes/origin/sal-misc' 2018-02-27 21:50:43 -05:00
TehRealSalt
a144a04abb Taunt sound simplification 2018-02-27 21:18:42 -05:00
TehRealSalt
0ed75724e6 Some offset adjustin' 2018-02-27 21:17:34 -05:00
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