Sryder
16ed8b4d78
Merge branch 'upstream-merge' into 'master'
...
Merge upstream SRB2 changes
See merge request KartKrew/Kart-Public!33
2019-01-20 17:15:02 -05:00
Alam Arias
d7a14d7fa9
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-01-20 17:03:17 -05:00
Alam Ed Arias
94748c3921
Merge branch 'apng-conditional-disable' into 'master'
...
Disable the APNG code if the version of libpng is greater than 1.4.
See merge request STJr/SRB2!457
2019-01-20 17:00:50 -05:00
Sryder
517a32e96d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
fickleheart
6cb8818a46
Fix clobbering error in MD2 texture code
2019-01-18 20:28:31 -06:00
wolfy852
71d5b148c9
Use SHORT on just the vars
2019-01-18 16:17:54 -06:00
wolfy852
245f0afd12
Fix SHORT being used as a cast instead of a macro
2019-01-18 15:38:06 -06:00
TehRealSalt
815d287cbe
Final v1.0.2 commit (probably)
...
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
2019-01-18 04:30:38 -05:00
wolfy852
79557b2b76
Update chars.kart hash
2019-01-16 20:02:40 -06:00
wolfy852
409f698331
Fix position numbers being off in 1P
2019-01-16 19:53:09 -06:00
TehRealSalt
c5a2a95ef1
Bump up the frequency of voting rule changes
...
This is in our changelog, but I didn't actually get around to doing it. Would've been foolish to ship with that :V
2019-01-16 16:19:16 -05:00
TehRealSalt
bee3dfdc8d
Fix XD_REMOVEPLAYER not having a proper corresponding netxcmdname
...
Caught while working on power levels -- turns out it wasn't a total waste of time when I should've been working on the rest of v1.0.2!
2019-01-16 16:16:11 -05:00
TehRealSalt
9546c1b139
Don't show COOL for spectators
2019-01-16 01:55:07 -05:00
TehRealSalt
1f7b41de9c
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2019-01-16 01:15:21 -05:00
TehRealSalt
b02324988a
SHOULD be == 1, not < 2!!!!
2019-01-16 01:13:01 -05:00
Sal
9a21f1159f
Merge branch 'movementchecks' into 'master'
...
Movement input checks
See merge request KartKrew/Kart!122
2019-01-16 01:08:32 -05:00
TehRealSalt
cd312e73f5
Turn speed hack check into a function
2019-01-15 22:34:41 -05:00
fickleheart
26a014dc11
Add driftturn checks to other players' movement
...
(Can we make this into a function or something?)
2019-01-15 21:09:53 -06:00
fickleheart
03f9459257
Merge remote-tracking branch 'remotes/internal/master' into movementchecks
...
# Conflicts:
# src/g_game.c
# src/p_user.c
2019-01-15 21:01:30 -06:00
Sal
87f00ee254
Merge branch 'new-turnhax-and-latency-stuff' into 'master'
...
Vanquish turnhax and also add some other niceties
See merge request KartKrew/Kart!124
2019-01-15 21:57:04 -05:00
TehRealSalt
654580d48b
Minor whitespace
2019-01-15 21:56:46 -05:00
fickleheart
b3c890df63
Kick players who send cmds with invalid driftturn
2019-01-15 20:20:13 -06:00
fickleheart
31d9a86b6f
Don't multiply driftturn by realtics
...
(I also moved multiplying angleturn to a single spot)
2019-01-15 20:19:25 -06:00
fickleheart
606659dcff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
TehRealSalt
4b8a51d028
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into next
2019-01-15 20:35:39 -05:00
TehRealSalt
0957d70451
Update file hashes
2019-01-15 20:35:20 -05:00
Sal
d755a479d5
Merge branch 'bump-maxskins' into 'next'
...
Bump MAXSKINS up to 64 + fix skin overflow error
See merge request KartKrew/Kart-Public!29
2019-01-15 20:30:33 -05:00
TehRealSalt
55e6797225
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-15 20:09:55 -05:00
wolfy852
8f05182530
Only allow ESC and non-keyboard keys to abort connection
2019-01-15 18:47:13 -06:00
wolfy852
3c35f40572
Stop the keyboard from treating accelerate and break as menu keys
2019-01-15 03:02:52 -06:00
Sal
49a333e72a
Merge branch 'unfuck-splitscreen-hud' into 'next'
...
Cleaner splitscreen hud
See merge request KartKrew/Kart-Public!6
2019-01-15 03:47:29 -05:00
Sal
a17824ac76
Merge branch 'default-md2' into 'next'
...
Default model for players
See merge request KartKrew/Kart-Public!27
2019-01-15 03:42:19 -05:00
TehRealSalt
7c42a72fdd
Don't draw multiple WANTED posters in splitscreen
2019-01-15 03:41:33 -05:00
Sal
1af7314a83
Merge branch 'tiny-spb-fixes' into 'next'
...
Misc SPB fixes
See merge request KartKrew/Kart-Public!30
2019-01-15 03:37:00 -05:00
TehRealSalt
553f3a9295
Fix really dumb flags on MT_SPBEXPLOSION
2019-01-14 21:55:10 -05:00
TehRealSalt
1a10499779
Attempt to fix the stupid bug where SPB decides to not hurt
2019-01-14 21:38:38 -05:00
TehRealSalt
32030fae57
Reduce easing time, revert changing air speed
2019-01-14 21:37:53 -05:00
TehRealSalt
15174b0f02
Missed this
2019-01-14 18:24:25 -05:00
TehRealSalt
19329f9a4a
bump maxskins to 64, fix overflow error
2019-01-14 18:16:07 -05:00
TehRealSalt
ff1d433d1e
Tiny SPB fixes
...
- Fix typo that could potentially invalidate the wait phase
- Prevent dying during target phase causing it to redirect to someone else
- Ease speed back up to default whenever slowed down
- SPB intensity now biases against high drift sparks + acceleration, instead of only acceleration.
- Slow speed is scaled w/ SPB intensity too
2019-01-14 02:01:00 -05:00
TehRealSalt
e2b3cd181e
Gag spacing was not updated
2019-01-13 20:47:57 -05:00
Sal
327a11721c
Merge branch 'gamepad-tweaks' into 'next'
...
Gamepad Improvements: Round 2
See merge request KartKrew/Kart-Public!24
2019-01-13 20:32:17 -05:00
wolfy852
4d8cf39320
Allow any key to abort network connection, ignore non-keyboard keys in chat
2019-01-13 19:22:54 -06:00
Sal
e30d65213c
Merge branch 'polyobj_fix_public' into 'next'
...
Fix rendering gaps on polys with upper/lower textures
See merge request KartKrew/Kart-Public!26
2019-01-13 18:00:58 -05:00
wolfy852
077c151a0b
Revert "Enable d-pad on the vote screen"
...
Partial revert of commit d9b30a10e3 .
2019-01-12 05:37:07 -06:00
Latapostrophe
7e13cbd8ec
Forgot to trim whitespace
2019-01-12 12:28:15 +01:00
Latapostrophe
59c85425e2
Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff
2019-01-12 12:27:30 +01:00
TehRealSalt
0351f6285e
Turn the "Music" section of the credits into only the people on Krew who contributes music
...
Meant to do this in song-credits, since individual songs are now properly credited there.
2019-01-12 04:13:49 -05:00
TehRealSalt
dff273d990
Minor misc fixes
2019-01-12 02:53:14 -05:00
fickleheart
3249851c3e
Fix rendering gaps on polys with upper/lower textures
2019-01-11 21:21:56 -06:00