Commit Graph

5112 Commits

Author SHA1 Message Date
fickleheart a444a214d0 Here too 2019-01-09 09:07:41 -06:00
fickleheart d20122327f Make sure cmd.latency is always 0 in mode attack? 2019-01-09 09:05:57 -06:00
fickleheart 81a7cdf6e8 oops 2019-01-09 00:49:32 -06:00
fickleheart acfe6c4616 Don't use netticbuffer for servers 2019-01-08 23:27:51 -06:00
fickleheart 26af4e8561 Save stored turn ranges in NetArchivePlayers 2019-01-08 23:27:39 -06:00
fickleheart 100ce5958b Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 21:11:02 -06:00
fickleheart 01d7dc35ff Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-08 20:56:14 -06:00
fickleheart 6792fd92aa Experimental nettic buffer to stop net-induced frame drops? 2019-01-08 20:55:33 -06:00
fickleheart cd71e94785 Remove filthy filthy cheats 2019-01-08 20:36:06 -06:00
fickleheart 1bacc4e395 Make starting boost timing compensate for latency 2019-01-08 20:27:54 -06:00
Sal 94ff7c33fd Merge branch 'kart-public-appveyor-improvements' into 'next'
Add Windows installer building and 64-bit builds to AppVeyor

See merge request KartKrew/Kart-Public!7
2019-01-08 21:20:51 -05:00
TehRealSalt 5e8e08ad95 Misc level init fixes 2019-01-08 20:14:58 -05:00
Marco Z 20a117cfc7 Kart Public Next merge 2019-01-08 18:39:11 -05:00
Sal e0f18f6d03 Merge branch 'gamepad-tweaks' into 'next'
Gamepad Improvements

See merge request KartKrew/Kart-Public!5
2019-01-08 18:08:00 -05:00
wolfy852 e528750444 Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852 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
Sal 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
TehRealSalt b713903208 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal 7f8609d335 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
Sal 6916667c41 Merge branch 'animtimer-fix' into 'next'
Cast animtimer to int before negating

See merge request KartKrew/Kart-Public!17
2019-01-08 15:47:14 -05:00
Sal 82246f6c25 Merge branch 'makefile-develop' into 'master'
Compile flag for DEVELOP

See merge request KartKrew/Kart-Public!18
2019-01-08 15:45:04 -05:00
wolfy852 bcf687c3af Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
wolfy852 e115dbf34f Cast animtimer to int before negating
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
Sal 7176490d5e 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 e545a8ab7d Merge remote-tracking branch 'next' into merge-srb2 2019-01-06 02:02:33 -05:00
Sal 50a6df7563 Merge branch 'load-order-adjustment' into 'next'
Load sounds.kart after patch.kart

See merge request KartKrew/Kart-Public!13
2019-01-06 01:51:41 -05:00
SeventhSentinel 8736952aad 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 49f2d65e95 Fix errors from merge 2019-01-06 01:00:30 -05:00
wolfy852 aa3c058321 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
Sal 4a3ea6e51e Merge branch 'unsigned-errors' into 'master'
Fix unsigned abs errors

See merge request KartKrew/Kart-Public!14
2019-01-05 20:49:06 -05:00
SeventhSentinel daec4f9f7e Merge remote-tracking branch 'srb2public/master' into merge-srb2 2019-01-05 18:42:58 -05:00
SeventhSentinel 73542c008c merge srb2 next 2019-01-05 15:59:23 -05:00
fickleheart bc429ad4f8 Determine latency with leveltime BS instead of nettics 2019-01-05 01:13:16 -06:00
SeventhSentinel a10ac14462 turn these signed before abs-ing em 2019-01-05 00:42:36 -05:00
SeventhSentinel 4de91cfea5 Load sounds.kart after patch.kart 2019-01-05 00:33:24 -05:00
fickleheart 656de08b96 test stuff 2019-01-04 23:09:29 -06:00
fickleheart 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
fickleheart 12b0e7d5da Send latency in players' ticcmds 2019-01-04 23:09:26 -06:00
fickleheart 87a09e051d Add k_kart files to CB project 2019-01-04 23:09:25 -06:00
Sal 9e09d8cb8c Merge branch 'mainwads-fix' into 'next'
Don't increment mainwads for sounds or music.kart

See merge request KartKrew/Kart-Public!12
2019-01-04 20:01:57 -05:00
Steel Titanium 888b5056d7 Clean up the comments a bit 2019-01-04 19:55:05 -05:00
Digiku d5870e6f8a 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 c97dc5d3c4 Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
Steel Titanium a69239bfa8 Don't increment mainwads for sounds or music.kart 2019-01-04 00:32:01 -05:00
Sal e52d5fd2fd 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 0b0cbcabb7 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 220ef1a490 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 15b0e3ab51 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
wolfy852 80390fdfa7 Whitespace fixes 2019-01-02 15:43:07 -06:00
wolfy852 ad7dc11b79 Revert CMake/Appveyor changes 2019-01-02 15:39:57 -06:00