Commit graph

457 commits

Author SHA1 Message Date
TehRealSalt
e1d5233dba Update spawn positions in Race to use power levels 2019-04-19 20:50:50 -04:00
TehRealSalt
ea2bcb3b99 Update from master 2019-04-19 20:14:06 -04:00
fickleheart
bd5c8f0ce5 Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep 2019-03-17 16:37:01 -05:00
James R
52deb3ea74 Move change viewpoint control checking so it doesn't take precedence
Notably over chat.
2019-03-16 15:42:18 -07:00
fickleheart
e536252a8a Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c
2019-03-11 21:59:45 -05:00
fickleheart
5c4c0a5ff6 Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
fickleheart
e316963e1a Merge remote-tracking branch 'remotes/upstream/master' into HEAD 2019-03-11 21:53:47 -05:00
wolfs
f4947820e4 Merge branch 'maxskins-bump' into 'next'
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
wolfy852
d0fe0abc9c Remove disableSpeedAdjust 2019-03-11 17:23:41 -05:00
James R
b91701c948 Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
wolfy852
ddc296575f Fix my fuckups
Not fond of what I did in P_CanRunOnWater but it at least carries the desired effect...
2019-03-06 22:28:06 -06:00
wolfy852
33c85f4813 Clean up the skin_t struct 2019-03-06 21:18:01 -06:00
Sally Cochenour
22cfbd8fd1 Merge branch 'next' into minor-item-tweaks 2019-02-27 01:15:24 -05:00
Alam Arias
c170be0051 signed and unsigned compare 2019-02-22 21:13:00 -05:00
Alam Arias
e741c3a0d6 if you going to use abs(), you need to work in signed types 2019-02-22 21:04:53 -05:00
Sally Cochenour
12dd8e49c0 Merge branch 'next' into minor-item-tweaks 2019-02-22 19:30:52 -05:00
Sally Cochenour
c257c83ff1 Add parentheses 2: Move parentheses 2019-02-22 19:11:50 -05:00
Sally Cochenour
a13d177a44 Add parentheses 2019-02-22 19:07:54 -05:00
Sal
5f4e52b4d8 Merge branch 'expose-splitscreen' into 'next'
Expose splitscreenplayer in player_t

See merge request KartKrew/Kart-Public!74
2019-02-22 19:04:48 -05:00
James R
f8928300ec Rename splitscreen member to something more meaningful 2019-02-22 15:57:44 -08:00
Sal
3980968707 Merge branch 'cherrypicks-from-netreplays' into 'next'
Misc fixes

See merge request KartKrew/Kart-Public!76
2019-02-22 18:45:44 -05:00
James
4f9109501e Hyu b gone 2019-02-19 23:15:31 -05:00
fickleheart
9fac26c200 Fix cmd latency occasionally jumping to max 2019-02-19 08:05:35 -06:00
fickleheart
6821297bce Improve replay resyncing code
Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
2019-02-18 21:10:23 -06:00
Latapostrophe
2b47818d66 Fix respawning in reverse gravity 2019-02-18 14:00:36 +01:00
james
76f2df2c40 Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t 2019-02-16 23:25:50 -08:00
toaster
d3f739f64a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
wolfy852
7d05d41cf3 Comment out type 2019-02-01 15:45:53 -06:00
wolfy852
6cdc1f4f24 Skip over type
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
wolfy852
e5885aad6f Fix replay weirdness
Sryder's Pleasure Castle ghost tries to return to England with this line.
2019-01-31 23:21:00 -06:00
wolfy852
d2a286efd7 Potentially fix 64-bit builds crashing on certain replays 2019-01-31 19:15:28 -06:00
Sal
73ce8f4e74 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
toaster
2e232b67ba * 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
Sal
809138e285 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
toaster
004cde8a57 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
Latapostrophe
60bbea9de1 No more ghetto check, and some more descriptive comments on the Hook 2019-01-26 16:55:26 +01:00
toaster
e3836bf772 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods 2019-01-21 21:56:49 +00:00
toaster
963c4451b4 Fix incorrect condition for setting savemoddata to false. 2019-01-21 21:48:52 +00:00
toaster
5dac9c4731 whoopsie doodle, forgot gh wasn't allocated until after this section 2019-01-18 14:53:43 +00:00
toaster
0eca0e6613 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
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
toaster
4a87838f06 * 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
TehRealSalt
88af2ff3bc Use val instead of pos?
Let's see if this fixes it...
2019-01-17 01:28:11 -05:00
TehRealSalt
63861540cb Fix incorrect scoring, default to 1000 2019-01-17 00:55:25 -05: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
3246ca6b33 More finished power level
broken, can't finish
2019-01-16 14:49:42 -05:00
toaster
6238a144b8 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
TehRealSalt
a14c5c3381 Merge branch 'master' into versus-record 2019-01-16 02:26:30 -05: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
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