Commit graph

30205 commits

Author SHA1 Message Date
Monster Iestyn
71a40a8125 Merge branch 'md2-fopen-error' into 'master'
More helpful error messages

See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Monster Iestyn
5758beb6b2 Merge branch 'md2-smoother-interpolation' into 'master'
Smoother MD2 interpolation

See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
TehRealSalt
1cc60a95f4 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-06 14:24:08 -04:00
TehRealSalt
225addd192 Misc tweaks (mostly color related)
- Smoothed out Ruby & Sepia
- Made Sapphire more distinct from Blue
- Made Navy more distinct from Jet
- MD2 colors weight a few colors even more heavily
- Revised ColorOpposite table
- Fix Wanted not updating on hit
- Very minor item odds adjustment for Battle
2018-07-06 14:22:48 -04:00
MonsterIestyn
a1ebb61b0a Merge pull request #252 from GoldenTails/patch-1
Fixed MD2 models not loading correctly on Linux
2018-07-06 19:12:21 +01:00
toaster
d506f0d5db Fix a bunch of issues with record attack!
* Fixed the issue where your runs would be saved as belonging to the wrong character.
	* Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character.
	* Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...)
Other stuff!
	* Hide map hell maps in the statistics.
	* Clean up some nonet stuff in the menu.
	* Put player setup last again, and tweaked its wording.
	* Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 18:08:35 +01:00
GoldenTails
cdaadc0037 Merge remote-tracking branch 'STJrSRB2/master' into patch-1 2018-07-05 16:44:34 -05:00
Monster Iestyn
15812dfb30 Merge branch 'master' into next 2018-07-05 21:09:39 +01:00
Monster Iestyn
2004a852a6 Merge branch 'lua-exploit-fix' into 'master'
Lua exploit fix

See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00
MonsterIestyn
e536a5fb28 Merge pull request #264 from LJSonik/password-security-fix
Disable admin password by default
2018-07-05 20:16:19 +01:00
LJSonik
333a98fb59 Merge branch 'master' into password-security-fix 2018-07-05 20:58:00 +02:00
MonsterIestyn
b6881d75db Merge pull request #232 from LJSonik/minor-net-command-fixes
Minor net command fixes
2018-07-05 19:56:17 +01:00
LJSonik
5c246dfcac Merge branch 'master' into minor-net-command-fixes 2018-07-05 20:00:38 +02:00
LJSonik
48a1e4b63c Merge branch 'master' into password-security-fix 2018-07-05 19:46:36 +02:00
Steel Titanium
2075925ac8 Merge remote-tracking branch 'upstream/master' into responsefile-fix 2018-07-05 01:24:51 -04:00
Steel Titanium
6d1a8703c7 Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation 2018-07-05 01:23:56 -04:00
Steel Titanium
deb0d72094 Merge remote-tracking branch 'upstream/master' into defaultsoundvol 2018-07-05 01:22:39 -04:00
Steel Titanium
d47e7014bc Merge remote-tracking branch 'upstream/master' into md2-fopen-error 2018-07-05 01:21:09 -04:00
Steel Titanium
b7776da524 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium
e104e01057 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
TehRealSalt
690b960977 Weight certain shades of MD2 blends 2018-07-05 01:13:21 -04:00
TehRealSalt
8925c96c53 Item odds, SPB fix 2018-07-05 00:38:23 -04:00
TehRealSalt
9edd1491b0 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-04 19:07:46 -04:00
TehRealSalt
606c194c02 Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors 2018-07-04 19:06:45 -04:00
toaster
9a2c0e3767 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-04 22:58:18 +01:00
toaster
5f2aed2fd3 * Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck!
* Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack.
* Reduce the amount of flashing on the voting screen.
2018-07-04 22:57:50 +01:00
Sryder
25d98828f1 Why I should start using defines instead of magic numbers 2018-07-04 22:37:11 +01:00
Sryder
566b66af42 Hopefully some medicine for the characters' sore throats from all that taunting
Also my editor ate some trailing whitespace.
2018-07-04 22:25:38 +01:00
SeventhSentinel
58f534522e Killed another file I accidentally made 2018-07-04 16:12:05 -04:00
Monster Iestyn
56ccf5ab7c Fixed the Lua crash exploit. 2018-07-04 20:15:36 +01:00
TehRealSalt
27263275e6 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-04 13:51:59 -04:00
TehRealSalt
cbcd2cbb07 WANTED recalculates on hit, tons of spectator changes 2018-07-03 21:12:25 -04:00
toaster
c5ef984f64 * ACTUALLY fix waiting for players chat.
* Correct minor bug with blink cursor on IP in multiplayer menu.
2018-07-04 00:58:32 +01:00
toaster
0e8d4b892f Chat messages in the waiting for players screen! 2018-07-03 22:30:22 +01:00
TehRealSalt
4af36ec766 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 16:18:39 -04:00
TehRealSalt
10c0f93b49 Fix joystick menu drawing
(also it was impossible to pick the 8th joystick, what's up with that?!)
2018-07-03 16:18:17 -04:00
toaster
5992928544 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-03 21:16:57 +01:00
Sryder
fd67f3e211 We use the PRNG far too much to not do consistancy checking on it in race 2018-07-03 21:01:46 +01:00
Sryder
1041315b94 Only do Mobj and RNG consistancy checking when actually in a level.
Mobjs are completely irrelevant outside of levels and the PRNG is not used in a synchronised way in anywhere except when in levels either
2018-07-03 20:53:37 +01:00
TehRealSalt
68e66e67ab Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:38:15 -04:00
SeventhSentinel
60b89a7ac7 (also killed some extra files I accidentally added, oops) 2018-07-03 15:36:37 -04:00
TehRealSalt
a3a25847f1 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:35:39 -04:00
SeventhSentinel
644fcf4925 I forgot about dood balloons, oops 2018-07-03 15:34:14 -04:00
TehRealSalt
129e5dae20 Fix splitscreen joystick 2018-07-03 15:32:26 -04:00
SeventhSentinel
5158508a00 Changed all instances of "balloon" to "bumper"
Also changed "It's you!" to "Select character & color..."
2018-07-03 15:14:47 -04:00
toaster
9dc099609f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:29:21 +01:00
TehRealSalt
0fe2652c63 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 18:25:39 -04:00
TehRealSalt
1b3e6ea79f SPB chances no longer lower if you mash 2018-07-02 18:25:15 -04:00
toaster
d00b45fcae Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:51 +01:00
toaster
2b51fe1866 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:23 +01:00