82dbf45fa4
Fix compiler warnings
2019-02-16 08:32:14 -06:00
32d1f75199
Merge branch 'fix-battle-boost' into 'next'
...
Set flashing tics to 0 after boosting
See merge request KartKrew/Kart-Public!67
2019-02-16 08:31:08 -05:00
76893f4644
Don't kill flashing tics for floor boosts
2019-02-16 07:03:56 -06:00
24516cbf84
Move ping display in i_video for consistency with showfps display
2019-02-16 13:38:50 +01:00
c370a86f48
Set flashing tics to 0 after boosting
2019-02-16 06:37:09 -06:00
97aeb13db3
Merge branch 'fix-offroad' into 'next'
...
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts
See merge request KartKrew/Kart-Public!62
2019-02-16 07:02:13 -05:00
fc6086cfd8
Merge branch 'master' into next
2019-02-16 06:00:31 -06:00
c170d01edf
Merge branch 'disable-soundsystem' into 'master'
...
Do not start sound system when disabled
See merge request KartKrew/Kart-Public!58
2019-02-16 06:24:12 -05:00
a119d1cddd
Lower default ping timeout + Fix chat arrows being missing while we're at it
2019-02-16 12:19:03 +01:00
da3772134a
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-16 06:18:22 -05:00
5ff03d38f5
Merge branch 'fix_nonet' into 'master'
...
Fix NONET
See merge request KartKrew/Kart-Public!60
2019-02-16 06:11:43 -05:00
abb3e8e4e3
Merge branch 'fix-no_lua' into 'master'
...
Fix NO_LUA
See merge request KartKrew/Kart-Public!66
2019-02-16 06:10:03 -05:00
95bbb0d833
Remove debug stuff
2019-02-15 21:10:18 -06:00
7abf8e0f11
Forgot to change this back from testing
2019-02-15 21:08:56 -06:00
07e56e550e
New visuals for ping and fps display alike [REDO]
2019-02-15 21:08:08 -06:00
3349b9b196
forgot to remove this print
2019-02-15 20:53:18 -06:00
6054901c62
Ping kick changes + other quality of life improvements [REDO]
2019-02-15 20:51:44 -06:00
bcd5176ad1
Update project files
2019-02-14 21:32:57 -05:00
de9e25d5b3
Add missing ifdefs
2019-02-14 20:59:07 -05:00
3a3dd42b89
Add pogospring to itemenabled
2019-02-13 05:37:13 -06:00
9eec83da95
Support CMake for apng
2019-02-12 17:01:27 -08:00
329c2ebdc8
Update copyright year
2019-02-11 16:01:02 -08:00
b43e6a7199
Support libpng versions prior to 1.6 and 1.5
...
Tested confirmed for...
1.5.30
1.4.22
1.2.59
2019-02-11 15:47:48 -08:00
79736e40aa
Support aPNG in new versions of libpng
...
A known issue: iTXt cannot be written (yet). I may do something about that.
For now, this is likely good enough. Who cares about the extra text anyway?
2019-02-10 23:52:02 -08:00
1ba39672d4
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts
2019-02-10 22:55:27 -06:00
b331b51178
Use less confusing player sorting key names
2019-02-09 18:10:54 -08:00
f0d536b7ee
Fix NONET. I thought I did this already during development, but I guess it got broken near the end.
2019-02-09 09:58:48 +00:00
dd45cfc757
Do not start sound system when disabled
2019-02-06 17:24:13 -08:00
970a8ee89d
Fix off-by-one errors in item odds, and add a little assert to make an assumption in this function that was being violated more explicit.
2019-02-06 13:28:21 +00:00
1c3fe3ce83
Kill me
2019-02-06 01:31:42 -05:00
094ca5241a
Merge branch 'next'
2019-02-05 22:02:08 -05:00
276e2d3335
Merge branch 'next'
2019-02-05 21:10:55 -05:00
8a5d740c85
Merge branch 'whitespace' into 'next'
...
Clean up Whitespace
See merge request KartKrew/Kart-Public!56
2019-02-05 19:03:02 -05:00
dc5024f94c
remove whitespaces
2019-02-05 15:42:37 -05:00
cc363086f9
fixup EOL in kart files
2019-02-05 15:36:30 -05:00
9a2e65c61c
Merge branch 'next' into version-prep
2019-02-04 22:22:24 -05:00
8e41f09c59
why does this trigger ERRORMODE now?!
2019-02-04 22:22:12 -05:00
75b0dd3c1b
Update patch.kart hash
2019-02-04 22:02:34 -05:00
f46eab6b8a
Update version
2019-02-04 22:00:36 -05:00
3b61cba1a7
The string that got away from my memory
2019-02-04 22:02:40 +00:00
76ea671763
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout
2019-02-04 21:55:19 +00:00
caba5cb02e
P_NetKeepAlive should also be here because it potentially pauses mid-game!
2019-02-04 21:54:10 +00:00
b36f73ee46
Merge branch 'ingame-player-cap' into 'next'
...
"In-game player" cap
See merge request KartKrew/Kart-Public!48
2019-02-04 15:44:50 -05:00
fd529f9363
fickle suggestions
2019-02-03 23:23:41 -05:00
26accf087e
Instant lookback
...
Still weird snap but this is as good as it'll get short of throwing away all of the camera code
2019-02-03 23:13:42 -05:00
55bb82eae8
Change order of operations so that fullscreen stuff is done in front of minimap, to match other two/three players in 3/4p.
2019-02-03 23:50:02 +00:00
503e4f977f
Show WANTED and minimap in battle splits even when p1 is nuked.
2019-02-03 23:37:19 +00:00
068ee93422
gotta break a few eggboxes to fix a crash
2019-02-03 23:09:09 +00:00
98af218d2c
Merge branch 'next' into ingame-player-cap
2019-02-03 17:23:50 -05:00
a6ac6ecdc5
Missed this
2019-02-03 17:15:33 -05:00
59730c5db6
In-game player cap & spectator queue
...
Force everyone beyond a certain point to spectate -- spectators get to queue up. In response to me doing a 1v1 match, tons of people wanting to join to watch, and just relying on honor system to prevent mid-joiners. Spectators are prioritized by how long they've been waiting. I'm thinking of hijacking base SRB2's team scramble for a scramble option later.
2019-02-03 16:43:11 -05:00
dff5cb049f
rename PT_WIPETIME to PT_BASICKEEPALIVE to be more obvious what it does
2019-02-02 21:53:27 +00:00
1bf584c079
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout
2019-02-02 21:51:49 +00:00
06b3e265f5
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next
2019-02-02 21:12:49 +00:00
3f283fd2a9
Merge branch 'flying-sharks-suck' into 'next'
...
Flying sharks suck
See merge request KartKrew/Kart-Public!46
2019-02-02 01:45:42 -05:00
d9f16d2aaf
Offroad code cleanup
2019-02-02 01:43:32 -05:00
6a14d79cf0
Offroad spark fix & sink
2019-02-02 00:58:51 -05:00
b332a3e163
Tweak incorrect capitalisation.
2019-02-01 18:51:15 -05:00
85f3be5889
Comment out type
2019-02-01 15:45:53 -06:00
b5b4e1fcc8
Skip over type
...
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
7c18d130f2
Fix replay weirdness
...
Sryder's Pleasure Castle ghost tries to return to England with this line.
2019-01-31 23:21:00 -06:00
9ddea94590
Potentially fix 64-bit builds crashing on certain replays
2019-01-31 19:15:28 -06:00
34b027e8ba
Shift around flashing bump stuff
2019-01-30 15:57:46 -05:00
9984f0e217
Reorganize these checks
2019-01-30 15:43:45 -05:00
f3644505be
Increase target cone for Race
2019-01-30 15:41:15 -05:00
3cb468aec8
Add delay to Jawz target switching, set Jawz target when fired
2019-01-30 15:39:29 -05:00
a3cd131017
Don't bump while flashing
2019-01-30 15:02:24 -05:00
9d51ef8e82
Play hit confirm sound for shields
2019-01-30 14:42:24 -05:00
a81546177d
Speed updates based on number of orbiting items
2019-01-30 14:24:04 -05:00
e63b6aee00
Fix Connection Timeouts during Wipes
...
Keep the connection alive with a specific packet to say we haven't timed out
2019-01-30 19:18:51 +00:00
bc4832aa40
Slower orbit, always have 1 orbit item deploy behind you, and higher gravity for Orbinaut/Jawz
2019-01-30 14:14:24 -05:00
c1fde7bfb7
Thin the rest of this screen's stuff too
2019-01-30 01:21:20 -05:00
51fa9b7359
Merge branch 'item-experiment' into 'next'
...
Item experiment
See merge request KartKrew/Kart-Public!39
2019-01-30 01:19:16 -05:00
cf06f108ed
Merge branch 'majormods' into 'next'
...
Allow playing in Record Attack with minor add-ons
See merge request KartKrew/Kart-Public!31
2019-01-29 23:19:57 -05:00
036c1ee929
Merge branch 'expose-serversort' into 'master'
...
Expose serversort to console
See merge request KartKrew/Kart-Public!43
2019-01-29 23:16:43 -05:00
70a70b8a97
Merge branch 'master' into offroad-stuff
2019-01-29 20:22:15 -05:00
eda13915a8
Merge branch 'next' into offroad-stuff
2019-01-29 20:22:11 -05:00
9e8b038719
Merge branch 'master' into item-experiment
2019-01-29 15:07:04 -05:00
fc512318bd
Merge branch 'next' into item-experiment
2019-01-29 15:06:58 -05:00
e118ec9399
Remove CV_HIDEN flag for serversort
2019-01-29 13:27:43 -05:00
1e61cc6152
Better cpusleep
...
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -05:00
80d1c303e3
Reduce frequency of Eggman items, give some of those points to Orbinaut or Banana
2019-01-28 12:47:23 -05:00
d3bf1d55ef
You will never have Lua consoleplayer.
...
(This is a quick, cheap hack to make splitscreen not almost impossible to support in major mods like Wipezones.)
2019-01-28 17:28:15 +00:00
ada4ce622f
* Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution?
...
* Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...)
* Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error.
* Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00:00
38ca2ab98a
Sparks can't be started in offroad
2019-01-27 23:25:03 -05:00
0ef442c004
Change offroad leniency from 1 second to 0.5 seconds, don't make friction more forgiving in offroad
2019-01-27 23:18:40 -05:00
5518a19945
Wipeout slowdown in offroad is static
2019-01-27 22:28:44 -05:00
c53144ecd6
Wipeout slowdown is x2 strength
2019-01-27 21:58:44 -05:00
8a97b28936
Wipeout slowdown timer is set to 20 tics if below, instead of adding up per bump.
2019-01-27 21:58:17 -05:00
dd2b895e80
Remove offroad leniency bias
...
Everyone now has flat, equal 1-second leniency
2019-01-27 21:57:18 -05:00
e9887b2675
Apply to TAB rankings too
2019-01-27 21:11:49 -05:00
1f90a04623
Thin names for 9+ player intermission
2019-01-27 17:52:53 -05:00
55c6ab2581
Scale number of allowed invuln items w/ player count
...
0-5 players: 1 invincibility/grow allowed out at once
6-9 players: 2 invincibilities (how it was before)
10-13 players: 3 invincibilities
14+ players: 4 invincibilites
2019-01-27 17:51:46 -05:00
e0f7ab6ad4
Merge branch 'master' into item-experiment
2019-01-27 15:14:56 -05:00
2c6799c52a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next
2019-01-26 21:46:20 +00:00
eb29063ef1
Use actual characters instead of ASCII codes as per Sryder's suggestion
2019-01-26 14:15:37 -07:00
90bdf11346
Merge branch 'no-cheese' into 'next'
...
No respawn cheese
See merge request KartKrew/Kart-Public!32
2019-01-26 16:08:36 -05:00
ce09566e11
Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream.
...
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
2019-01-26 19:13:49 +00:00
f8fd2c5190
Changed condition to being mid-air, changed print and changed the kick to a return
2019-01-26 19:40:12 +01:00
910df92d5a
Merge branch 'expose-more-lua-stuff' into 'next'
...
More Lua stuff + PlayerCmd hook
See merge request KartKrew/Kart-Public!28
2019-01-26 13:19:41 -05:00
1a21c5efbe
Code cleanup as requested by Sal and Sryder.
...
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
9028783190
Only prevent respawn if spun out in midair and added a Got_Respawn check to kick cheaters
2019-01-26 17:40:05 +01:00
72133b7498
No more ghetto check, and some more descriptive comments on the Hook
2019-01-26 16:55:26 +01:00
fb6570cade
I accidentally the numpad
...
also reduced the range of usable characters
2019-01-26 02:41:05 -07:00
74bf3164f8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
bcddbdbfbf
Allow letters to be used in the "Specify IPv4 Address:" field
2019-01-25 21:50:58 -07:00
d959dd6934
Should hopefully fix the MD2 crash reported
...
I wasn't able to replicate it personally, but this should hopefully avoid it crashing where the RPT given pointed out.
2019-01-21 22:48:57 +00:00
d045af07b1
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods
2019-01-21 21:56:49 +00:00
e9d95f07c1
Fix everything Sal wanted changed.
2019-01-21 21:51:54 +00:00
fdbf750f48
Fix incorrect condition for setting savemoddata to false.
2019-01-21 21:48:52 +00:00
29f31cd9f8
Fix the netticbuffer command crashing 64-bit builds
2019-01-21 20:40:28 +00:00
7b182d37b9
Merge remote-tracking branch 'upstream/master' into upstream-merge
2019-01-20 17:03:17 -05:00
b18a8dbc8d
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
e7d730e3b2
prevent the use of respawn to cheese items like SPB
2019-01-20 18:51:45 +01:00
1850123f8b
Prevent the use of respawn to cheese SPB and other items
2019-01-20 18:50:07 +01:00
c0c2ba4ca6
Fix clobbering error in MD2 texture code
2019-01-18 20:28:31 -06:00
4f38982968
Use SHORT on just the vars
2019-01-18 16:17:54 -06:00
de316f1ee1
Fix SHORT being used as a cast instead of a macro
2019-01-18 15:38:06 -06:00
f8229b9dad
whoopsie doodle, forgot gh wasn't allocated until after this section
2019-01-18 14:53:43 +00:00
d119c711e5
Improve readability of server browser add-ons message.
2019-01-18 14:11:59 +00:00
4b493b81a6
Add warning message when attempting to use the master server browser while `modifiedgame` is true.
...
(We assume that if you're using an IP address connection, you're more of a power user.)
2019-01-18 13:04:12 +00:00
15aafb00a9
Turns out modifiedgame was getting set during startup because of making it use G_SetGameModified. Uh, woops?
2019-01-18 13:01:40 +00:00
4c8737da08
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
dda94e4498
Remove irrelevant attempts at majormod setting for SOC events which explicitly can only happen if a gamedata is created.
2019-01-17 22:12:59 +00:00
66273898b7
* Refactor all instances of `majormods = true;` to route through G_SetGameModified, and catch a few spots I missed in the process.
...
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
2f2d3768d5
* Increased leniency for SOC wrt "major mods".
...
* If your file defines state and object freeslots in SOC, you are allowed to modify those freeslots IN ANY SOC SCRIPT IN THE SAME FILE without being marked as a "major mod".
* If your file contains broken unlockables/emblems that don't actually have effect for any reason, it's not counted as a "major mod".
* Added add-ons menu message for adding a "major mod".
2019-01-17 20:51:41 +00:00
d389cececa
Update chars.kart hash
2019-01-16 20:02:40 -06:00
31c911e88f
Fix position numbers being off in 1P
2019-01-16 19:53:09 -06:00
ad7b3dece0
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
885d2e2965
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
a7445a7b71
Woops, didn't commit the most up-to-date g_game.c originally (old one didn't compile)
2019-01-16 15:27:23 +00:00
146f2a1c0a
Don't show COOL for spectators
2019-01-16 01:55:07 -05:00
d4cf3f5dbc
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2019-01-16 01:15:21 -05:00
5e1aa0302f
SHOULD be == 1, not < 2!!!!
2019-01-16 01:13:01 -05:00
86433d53cf
Turn speed hack check into a function
2019-01-15 22:34:41 -05:00
f2c98b3639
Add driftturn checks to other players' movement
...
(Can we make this into a function or something?)
2019-01-15 21:09:53 -06:00
f5d491eda2
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
0251814095
Minor whitespace
2019-01-15 21:56:46 -05:00
b28b7bf1bf
Kick players who send cmds with invalid driftturn
2019-01-15 20:20:13 -06:00
e30222ebac
Don't multiply driftturn by realtics
...
(I also moved multiplying angleturn to a single spot)
2019-01-15 20:19:25 -06:00
0121d47049
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
46e5f308e7
Merge branch 'next' of https://git.magicalgirl.moe/KartKrew/Kart-Public into next
2019-01-15 20:35:39 -05:00
ea6ff29c43
Update file hashes
2019-01-15 20:35:20 -05:00
3597a94e3e
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
105958d29f
Update the (unused) SP menu stuff to use MAXSKINS
2019-01-15 20:09:55 -05:00
3dbf6f7ad0
Only allow ESC and non-keyboard keys to abort connection
2019-01-15 18:47:13 -06:00
081872aa85
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit `next` or `master`.
2019-01-15 19:01:55 +00:00
f53594cf81
Stop the keyboard from treating accelerate and break as menu keys
2019-01-15 03:02:52 -06:00
f2b7d9f373
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
5982e26bb5
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
wolfy852