Commit graph

4300 commits

Author SHA1 Message Date
fickleheart
00f8e8b0e6 Here too 2019-01-09 09:07:41 -06:00
fickleheart
00c658fccd Make sure cmd.latency is always 0 in mode attack? 2019-01-09 09:05:57 -06:00
fickleheart
1c79920280 oops 2019-01-09 00:49:32 -06:00
fickleheart
797c20d603 Don't use netticbuffer for servers 2019-01-08 23:27:51 -06:00
fickleheart
bc3a7ba5cb Save stored turn ranges in NetArchivePlayers 2019-01-08 23:27:39 -06:00
fickleheart
86bbbfc67b Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 21:11:02 -06:00
fickleheart
029a16125c Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 20:56:14 -06:00
fickleheart
40ff1e5067 Experimental nettic buffer to stop net-induced frame drops? 2019-01-08 20:55:33 -06:00
fickleheart
92c5a0836b Remove filthy filthy cheats 2019-01-08 20:36:06 -06:00
fickleheart
955e0ad8c9 Make starting boost timing compensate for latency 2019-01-08 20:27:54 -06:00
TehRealSalt
301477f212 Misc level init fixes 2019-01-08 20:14:58 -05:00
wolfy852
2794833f8d Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852
5c5e6a26dd 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
Sal
900c6df765 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
TehRealSalt
ab76725038 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
875f5eb28a Merge branch 'merge-srb2' into 'next'
Merge SRB2 master & next (round 1)

See merge request KartKrew/Kart-Public!16
2019-01-08 15:56:41 -05:00
wolfy852
934b199705 Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
wolfy852
8baa538d43 Cast animtimer to int before negating
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
Sal
02f49b2b8b Merge branch 'kill-facefreed' into 'next'
Remove facefreed/iconfreed

See merge request KartKrew/Kart-Public!15
2019-01-06 02:02:54 -05:00
SeventhSentinel
716ce5c343 Merge remote-tracking branch 'next' into merge-srb2 2019-01-06 02:02:33 -05:00
SeventhSentinel
3fe7856ba3 Keep execversion stuff on, just dummied out
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
SeventhSentinel
046d66d803 Fix errors from merge 2019-01-06 01:00:30 -05:00
wolfy852
600cf37c88 Remove facefreed/iconfreed
Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.
2019-01-05 20:40:47 -06:00
SeventhSentinel
e70d98d7a6 Merge remote-tracking branch 'srb2public/master' into merge-srb2 2019-01-05 18:42:58 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
fickleheart
f7aa9ebb25 Determine latency with leveltime BS instead of nettics 2019-01-05 01:13:16 -06:00
SeventhSentinel
b9ea18c030 turn these signed before abs-ing em 2019-01-05 00:42:36 -05:00
SeventhSentinel
a595d0ba00 Load sounds.kart after patch.kart 2019-01-05 00:33:24 -05:00
fickleheart
cc9bf72513 test stuff 2019-01-04 23:09:29 -06:00
fickleheart
b3432cef05 Don't turn players more than they're allowed to
This should account for latency properly.
2019-01-04 23:09:27 -06:00
fickleheart
7dcee6f0b4 Send latency in players' ticcmds 2019-01-04 23:09:26 -06:00
Steel Titanium
a57626f828 Clean up the comments a bit 2019-01-04 19:55:05 -05:00
Digiku
031e234d86 Merge branch 'changecontrol-text-overflow-fix' into 'master'
Resolve buffer overflow crash when configuring System Menu and GIF controls

See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
Digiku
e42e1178ed Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
Steel Titanium
d2da1db6c8 Don't increment mainwads for sounds or music.kart 2019-01-04 00:32:01 -05:00
Sal
b69013a4f1 Merge branch 'bump-fixes' into 'next'
Push bouncing players backwards if they get stuck in a wall

See merge request KartKrew/Kart-Public!3
2019-01-03 12:27:14 -05:00
Sal
1b02805445 Merge branch 'map-palette-titlefix' into 'next'
Fix per-map palette not being reset properly when it should.

See merge request KartKrew/Kart-Public!9
2019-01-03 01:08:42 -05:00
Sal
5c1267d2e6 Merge branch 'waypoint-lap-option' into 'next'
Add waypoint lap field via Parameter field

See merge request KartKrew/Kart-Public!4
2019-01-03 00:58:09 -05:00
wolfy852
b517b738c8 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
wolfy852
916d87ead6 Whitespace fixes 2019-01-02 15:43:07 -06:00
wolfy852
b3cd4283e4 Fix a duped line 2019-01-02 15:03:13 -06:00
wolfy852
bf5d14c37f Rebind the talk key by default, but move it to D-Pad Down 2019-01-02 14:50:36 -06:00
wolfy852
1c33146e95 Turns out we don't need this 2019-01-02 14:47:24 -06:00
Steel Titanium
4e0f4ed709 Remove double brackets 2019-01-02 13:04:56 -05:00
Alam Ed Arias
13e3a975d8 Merge branch 'master' into next 2019-01-01 23:00:39 -05:00
Digiku
764e6e7659 Merge branch 'expanded-nmuslist' into 'next'
Expand NMUSList to include HUD changes

See merge request STJr/SRB2!388
2019-01-01 15:06:04 -05:00
Digiku
4560b4cb41 Merge branch 'caps-lock-consistency-fix' into 'master'
Update capslock state on window re-focus

See merge request STJr/SRB2!436
2019-01-01 15:05:20 -05:00
Digiku
80dc98624b Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
MinGW64:Target nocona for 64-bit builds [revision]

See merge request STJr/SRB2!440
2019-01-01 11:15:34 -05:00
Steel Titanium
b63f4a66e8 Comment this out again.
How did this even get reverted...
2018-12-31 18:34:04 -05:00
Steel Titanium
26a257eda7 Better attempt at fixing this 2018-12-31 18:19:18 -05:00