ebd688f32f
Cleanup :3c
2019-03-03 20:25:22 -06:00
d560fef930
Assign a server player in replays for Lua purposes
...
Unfortunately this doesn't seem to help sync much. It
at least prevents constant Lua errors I guess....
2019-03-03 20:24:35 -06:00
4ecd71d026
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:15:24 -05:00
d5a4759121
signed and unsigned compare
2019-02-22 21:13:00 -05:00
cec79dee87
if you going to use abs(), you need to work in signed types
2019-02-22 21:04:53 -05:00
014466cc67
Merge branch 'next' into minor-item-tweaks
2019-02-22 19:30:52 -05:00
b2d4ec501c
Add parentheses 2: Move parentheses
2019-02-22 19:11:50 -05:00
df503c7f19
Add parentheses
2019-02-22 19:07:54 -05:00
6152657885
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
0eb30bceb7
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
447100a9ab
Merge branch 'cherrypicks-from-netreplays' into 'next'
...
Misc fixes
See merge request KartKrew/Kart-Public!76
2019-02-22 18:45:44 -05:00
09c3fd4329
Hyu b gone
2019-02-19 23:15:31 -05:00
7a80195ed7
Fix count limiter not always working right for titledemo netreplays
2019-02-19 17:33:02 -06:00
9c5ae02755
Fix cmd latency occasionally jumping to max
2019-02-19 08:05:35 -06:00
188552e069
Allow viewing karma bombs during replays
2019-02-18 21:23:05 -06:00
a4ac2b000f
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
96972c9ae9
Remove debug print
2019-02-18 20:54:37 -06:00
3a3b623e34
Use generic resync message for RNG desyncs
2019-02-18 20:51:02 -06:00
91ce3617ef
Fix respawning in reverse gravity
2019-02-18 14:00:36 +01:00
c260e27cd9
Support netreplays in titledemos
...
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -06:00
a6dff0a324
Whoops, saving the wrong file list
2019-02-17 11:52:23 -06:00
d1d270c09d
Don't force loading files for replays
2019-02-17 10:04:48 -06:00
28b4d4a152
Merge remote-tracking branch 'remotes/james/netreplays-autoaddons' into new_netreplays
2019-02-17 08:52:21 -06:00
1785adffc2
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
a6bc581520
Fix duplicated player views from ResetViews
2019-02-16 22:24:37 -06:00
b6cc96ad68
Fix replays crashing upon completion
2019-02-16 22:19:05 -06:00
1c5e525db1
Fix views getting automatically changed in netreplays
2019-02-16 22:06:47 -06:00
3bd47b3beb
Fix multiplayer ghosts crashing the game sometimes
2019-02-16 21:55:08 -06:00
be353c9260
Reset views away from spectators
2019-02-16 21:07:11 -06:00
6e44952d50
Fuck you
2019-02-16 20:53:15 -06:00
7a7ea255bf
Merge remote-tracking branch 'remotes/james/netreplays-viewcommand' into new_netreplays
...
# Conflicts:
# src/g_game.c
2019-02-16 20:20:11 -06:00
276373123e
Add cvar for netreplay saving options
2019-02-16 18:29:51 -06:00
450efc3180
Merge remote-tracking branch 'remotes/james/netreplays-responder-fix' into new_netreplays
2019-02-16 15:50:46 -06:00
fcfce0bd49
Double default replay size
2019-02-16 15:49:54 -06:00
ca401aac8a
Try to keep the RNG seed in sync
2019-02-16 14:24:00 -06:00
b006ac447f
Remove debug-related code
2019-02-16 13:58:32 -06:00
e7488f8d76
Backwards compat for old replays
2019-02-16 13:49:31 -06:00
4bea570143
Resync items and bumpers in replays
2019-02-16 13:42:21 -06:00
78adae109a
[WIP, CRASHES] Save ghost data in netreplays
2019-02-16 12:42:24 -06:00
1fa32a4b9d
Improve replay resyncing code
...
Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
2019-02-16 11:52:35 -06:00
462e4fb863
Add support for an optional file list embeded in demos
...
Ghosts are also supported. The playback function can read demos without this
file list--it is a flag.
2019-02-14 14:02:47 -08:00
1b604273d4
Wait for HU_Responder and friends to finish eating before viewpoint control
2019-02-13 20:21:09 -08:00
fb4cd26aed
Support splitscreen views in netreplays with less than four players
...
The first view is also not changed if there are no players to view.
2019-02-13 16:22:32 -08:00
dd75c1621c
Fix compile warnings
2019-02-06 21:03:05 -06:00
6da810a994
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/g_game.c
# src/k_kart.c
2019-02-06 20:47:35 -06:00
e140127180
Format for better consistency with the codebase
2019-02-06 20:25:45 -06:00
61bb44463f
Fix views not setting properly when adding multiple at once
2019-02-06 20:25:27 -06:00
e52641d15a
Expose G_ResetView and amend G_ResetViews
...
(fickle's suggestion.)
2019-02-04 20:13:30 -08:00
ac9356a02b
Automatically load splits up to new viewpoint
...
Basically, you can start viewing your third split and the second one views
another!
2019-02-04 17:58:55 -08:00
ee8948d627
Add support for changing viewpoint via console
...
This isn't just a shameless console-empowerement. More precise "spying" can
benefit everybody. But especially in net-replays, this is almost necessary.
2019-02-04 03:09:40 -08:00
7aa83635ae
Record net replays to replay/online/
2019-02-03 14:29:54 -06:00
fe7c6c7f83
Add support for encore and battle replays
2019-02-03 13:55:29 -06:00
06b3e265f5
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next
2019-02-02 21:12:49 +00:00
ce59b705a4
Play generic intermission music after netreplays
...
Mostly because I kept cycling to other people after the
top half finished and always got the lose music as a
result lol
2019-02-02 10:54:24 -06:00
c407f811af
Fix map name not showing right on replay intermission
2019-02-02 00:24:15 -06:00
71d1d10ef6
Play intermission after net replays
2019-02-01 21:06:52 -06:00
ba07224a8f
Make replays single-view by default unless requested
2019-02-01 20:19:52 -06:00
3724d02e3b
Allow changing all players' viewpoints in replays
2019-02-01 19:53:52 -06:00
4de79f13af
Refactor view changes a bit
2019-02-01 19:46:58 -06: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
09eef5f6b1
Make the join sync hack a little more robust
2019-02-01 07:50:42 -06:00
7f7dd0097b
wip replay viewpoint stuff heck im tired zzz good night
2019-02-01 01:32:35 -06:00
e5be5e80ba
Make joins/quits/enters/spectates sync in replays
...
I'm not 100% sure on joins. That P_RandomByte() call
looks ugly. It'll probably be a source of trouble.
2019-02-01 00:44:35 -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
6a131f368f
Fix replay split breaking with less than four viewpoints
2019-01-31 23:03:44 -06:00
9ddea94590
Potentially fix 64-bit builds crashing on certain replays
2019-01-31 19:15:28 -06:00
0c11562209
4p split views test
2019-01-31 00:00:28 -06: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
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
e13e6c5c9b
Fix replay viewer discarding aim keys
2019-01-27 20:36:13 -06:00
d05a3a59c4
Write respawn command usage to replays
2019-01-27 19:30:20 -06:00
49caebd2db
Fix crashing at the end of netreplays
2019-01-27 19:09:29 -06:00
c6248faa30
Write skin/color/name changes to replay
2019-01-27 19:07:30 -06:00
cf6e3a45d7
Reset oldcmd when recording netreplays
2019-01-27 17:09:25 -06:00
3cec3d9658
broken spectator stuff?
2019-01-27 16:23:34 -06:00
26770c5103
[HACK] Save correct lap count on netreplays
2019-01-27 15:45:42 -06:00
894db0c6fd
Store cmd.latency in replays
2019-01-27 15:09:58 -06:00
83738a20b7
Fix players spawning in the wrong spots when watching replays
2019-01-27 14:34:22 -06:00
6dcc4de979
Separate oldtic for each player
2019-01-27 14:34:19 -06:00
712dfdc3d1
Fix compile errors
2019-01-27 14:33:57 -06:00
c9444116dd
I don't wanna deal with ghosts right now
2019-01-27 14:33:51 -06:00
dee45fdf62
Store initial player data in net replay
2019-01-27 14:33:45 -06:00
1f72df4edb
Start with some strange multiplayer replay init stuff
...
Mostly just disabling the parts of the replay that assume
a single player, right now.
# Conflicts:
# src/g_game.c
2019-01-27 14:33:38 -06: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
72133b7498
No more ghetto check, and some more descriptive comments on the Hook
2019-01-26 16:55:26 +01:00
d045af07b1
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods
2019-01-21 21:56:49 +00:00
fdbf750f48
Fix incorrect condition for setting savemoddata to false.
2019-01-21 21:48:52 +00:00
f8229b9dad
whoopsie doodle, forgot gh wasn't allocated until after this section
2019-01-18 14:53:43 +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
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
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
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
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
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
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
c2aa6d4de6
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 14:40:48 +01:00
37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
a444a214d0
Here too
2019-01-09 09:07:41 -06:00
d20122327f
Make sure cmd.latency is always 0 in mode attack?
2019-01-09 09:05:57 -06:00
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
01d7dc35ff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 20:56:14 -06:00
cd71e94785
Remove filthy filthy cheats
2019-01-08 20:36:06 -06:00
ad01dcc5ac
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
78ac038864
Merge branch 'mobjscale-global' into 'next'
...
Add a global for mobjscale
See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
bc429ad4f8
Determine latency with leveltime BS instead of nettics
2019-01-05 01:13:16 -06:00
656de08b96
test stuff
2019-01-04 23:09:29 -06:00
bd36a0f0a1
Don't turn players more than they're allowed to
...
This should account for latency properly.
2019-01-04 23:09:27 -06:00
12b0e7d5da
Send latency in players' ticcmds
2019-01-04 23:09:26 -06:00
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
a626660564
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-25 00:19:42 -05:00
82a40f0dba
Support Look Up/Down keys for NiGHTS movement
2018-12-24 23:48:03 -05:00
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
619dd9d08a
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
2018-12-22 12:34:17 +01:00
9525de2d83
Merge branch 'camera-backport' into 'next'
...
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
0aabcd2503
lj dm'd me so here's a second, more sensible crack at it
2018-12-18 19:40:38 +00:00
99e50250cf
Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation.
...
pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
2018-12-18 18:05:11 +00:00
03a4bd8f53
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
e763eab6cd
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
ca2475ac3e
Print GameController info when detected, use proper 360 controller defaults for triggers
2018-12-14 11:50:53 -06:00
2422501ab9
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
17e9188c89
Merge branch 'execversion' into '21-version'
...
Block previous versions' config defaults with EXECVERSION consvar
See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
70aa4ce18e
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
a802069313
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
c599d84d6e
Actually, best of both:
...
Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
2018-12-05 23:28:44 -05:00
d0180ecb15
Cut this down slightly
2018-12-05 20:54:58 -05:00
d53e4af93a
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-05 20:46:48 -05:00
42cb597731
Merge branch 'joystick-juggling-two' into 'next'
...
Joystick additions for menu, axis defaults, and vertical look toggle
See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
7e523a1e35
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
59cabea8bd
Add joyaiming qualifier for joystick look up/down
2018-12-03 13:10:19 -05:00
6dd44ca1de
Change PC axis defaults to 360-friendly values
2018-12-03 13:10:15 -05:00
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
919667ed39
Just do MapChange hook on G_InitNew
...
Everything that's supposed to call it also calls this...
2018-12-03 00:33:35 -05:00
aa16edec1d
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
3ec0afc09d
AXISBRAKE, take out GameController stuff for now
2018-12-02 19:33:09 -06:00
d1a0df09a5
Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads
2018-12-02 02:01:51 -06:00
aba7711c39
Potentially fix spectators floating when inputting right on the analog stick.
2018-12-02 02:01:06 -06:00
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
fickleheart