Commit graph

3129 commits

Author SHA1 Message Date
TehRealSalt
997c1bebe1 Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
Sryder
4f78ae9539 Merge branch 'skystuff' into 'master'
Internal sky improvement ports

See merge request KartKrew/Kart!2
2018-07-08 17:21:52 -04:00
Sryder
7b7d584823 Don't set joining clients to immediately be connected
They need to download the gamestate first
2018-07-08 21:46:23 +01:00
TehRealSalt
1399c64143 Internal sky improvement ports
Horizon lines, barrel sky distortion
2018-07-08 15:44:01 -04:00
Sryder
0cdce89eaa Merge branch 'debug-fix' into 'master'
Fix ALL of the warnings

See merge request KartKrew/Kart!1
2018-07-08 05:43:55 -04:00
colette
639f0d335b Update f_finale.c 2018-07-07 20:20:46 -04:00
Sryder
c9c6fb3918 Silly fixes to absurd compiler warnings
Thanks toaster
2018-07-07 23:49:34 +01:00
TehRealSalt
eb680a5c16 Merge branch 'debug-fix' of https://git.magicalgirl.moe/KartKrew/Kart into debug-fix 2018-07-07 17:43:30 -04:00
TehRealSalt
aa651cb379 Fix Sryder's bool error
I don't seem to get this error for some reason, even after upgrading to w64 & GCC 7.2.0, but hopefully this fixes it
2018-07-07 17:33:26 -04:00
Sryder
faf76d5e49 22 needs to be added to these char arrays to account for zone title being a settable string 2018-07-07 22:10:26 +01:00
TehRealSalt
b7e8f89df7 better parentheses 2018-07-07 16:46:32 -04:00
Alam Ed Arias
e219f92c6b Merge branch 'master' into next 2018-07-07 16:42:50 -04:00
Alam Arias
57f74bcc82 Update m_misc.c 2018-07-07 20:41:11 +00:00
TehRealSalt
9f08890866 The remaining errors on a GCC 6.3 setup 2018-07-07 16:38:54 -04:00
TehRealSalt
7d49129f25 Fix incorrect PRIdS
Thanks, Alam!
2018-07-07 16:38:14 -04:00
Alam Arias
b4d84a171e Update m_misc.c 2018-07-07 20:33:19 +00:00
toaster
740a209631 Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
* Remove FUNCMATH from all void-returning functions, given GCC80 specifically complains about this case.
	* Extend the length of all extant buffers to the safety threshold recommended by the compiler.
	* Add void casts to WS_getaddrinfo's setting to prevent complaints about incompatible typecasts.
	* Extend the charsel, face, and superface buffer sizes and writes to include the null terminator. (I didn't really want to do this because it's not even particularily NEEDED, but there was literally zero way to get around the request that I could find with multiple online searches. I tried.)
2018-07-07 16:52:01 +01:00
TehRealSalt
1439676c61 Squash a few more errors
Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-06 21:53:37 -04:00
TehRealSalt
17514a8870 F_WaitingPlayersTicker() -> F_WaitingPlayersTicker(void) 2018-07-06 19:44:21 -04:00
Sryder
23d9d1c26c Fix warning relating to max 0 with an unsigned variable
I've looked at the code above and can't see anything that would try to lower the value below 0 as it's mostly just addition and dividing
2018-07-07 00:34:03 +01:00
toaster
a205276a01 Free unwittingly malloc'd memory. 2018-07-06 23:59:05 +01:00
Sryder
a7ea4db50d Merge branch 'master' into sonicitems 2018-07-06 23:33:54 +01:00
toaster
8750feb196 Remove the need for sending the savegame if you're the host. You don't need to send it to yourself. What are you doing? 2018-07-06 23:18:22 +01:00
toaster
3d5ee263e0 Fix a crashy oversight in the archiving! 2018-07-06 23:18:18 +01:00
toaster
94446a38eb Improve the defaulting thing to not play the sound if the cvar isn't to be touched. 2018-07-06 20:55:22 +01:00
toaster
da7407b6ad Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-06 20:40:47 +01:00
toaster
04287136f6 * Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu.
* Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 20:40:42 +01:00
Sryder
47230e69c5 Always send gamestate to joiners.
It's cut down already outside of levels, needed to stop Lua sending mobj references during intermission though.
This is needed because in the past there was a separate way to send player information to joiners that has since been removed. Meaning player information is always desynched for joiners during anything but levels.
2018-07-06 20:25:13 +01:00
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
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