Commit Graph

1666 Commits

Author SHA1 Message Date
Sryder 0d16d6c1f4 Further drift fixes
Fix weird start drifting wrong way bug
Drifting no longer adds to regular turn speed
Drift boosts start as soon as you finish drifting
2017-03-07 05:00:00 +00:00
Sryder 680fdf1416 Re-implement the small turn-back after a drift ends 2017-03-07 03:27:44 +00:00
Sryder 6b83d1cdc5 Gradual turn into drift push angle 2017-03-07 03:00:10 +00:00
Sryder cac7171d48 Merge branch 'cleanupv2' into sonickart 2017-03-07 01:07:55 +00:00
Sryder 62aec16b59 Change Linux executable name 2017-03-07 01:07:23 +00:00
Sryder 515054c599 Fix drifting
No longer does all the angle adjustments inside of the player thinker and instead does it with the controls
Should hopefully avoid any desynch from drifting
Also maybe fixed player 2's controls
2017-03-07 01:05:18 +00:00
Sryder 2807c45b03 Merge branch 'cleanupv2' into sonickart 2017-03-06 21:26:25 +00:00
Sryder bdd03bc830 Remove driftfix and disable looking backwards
I believe editing the player data in G_BuildTiccmd will cause desync, especially for anything that would effect gameplay
driftfix didn't seem to do much, will find a way to re-enable looking backwards properly later (probably change one of the buttons, DRIFTLEFT or DRIFRRIGHT?)
2017-03-06 21:24:23 +00:00
Sryder f00f74d69b remove checkpointtimes and k_playerahead
they are basically unused outside of timeattack and checkpointtimes isn't sent for netplay anyway
we can reimplement later with a more sensible solution for lap times in time attack
2017-03-06 21:02:36 +00:00
Sryder 7e45718be1 Merge branch 'cleanupv2' of http://git.magicalgirl.moe/KartKrew/Kart.git into sonickart 2017-03-06 16:20:06 +00:00
Sryder 1970f4f280 kartspeed and kartweight not being set from a resynch 2017-03-06 16:05:02 +00:00
Sryder 75ba41a8cf Try to stop the weird desync that happens rarely with items 2017-03-06 15:58:10 +00:00
Sryder 88e2c460df Merge branch 'cleanupv2' into sonickart 2017-03-06 03:25:20 +00:00
Sryder 6968f39b43 Increase the effect of lower friction on movefactor
to account for lower friction in this branch
2017-03-06 03:22:18 +00:00
Sryder cf2671be77 Fix toaster's slower acceleration on ice surfaces
Will likely act slightly different because of acceleration being reworked and it using a different variable
2017-03-06 03:21:28 +00:00
Sryder aff9a78d76 Remove kart offroad variable and workings.
We can set a standard for friction sectors in maps and people can then do what they want with it.
Also caused problems with Ice and FOFs above friction sectors.
2017-03-06 02:38:35 +00:00
Sryder 2472d3e39f Send kartstuff when joining netgame 2017-03-06 00:38:08 +00:00
Sryder d860202b8a use R_PointToDist2 to avoid an overflow when walls glitch out and you can accelerate into them endlessly 2017-03-05 23:24:17 +00:00
Sryder 92f33c1d60 Low friction and Disable Jump
We will look into disabling jump a better way later
2017-03-05 22:08:13 +00:00
Sryder ba9ca32c54 Fix the items being given as if having 1 more player than there should be 2017-03-05 19:16:38 +00:00
Sean Ryder d20d3cd478 Make the random items work without the global variables (they broke after the cleanup and started to cause desync) 2017-03-05 17:36:14 +00:00
Sean Ryder e673ea0088 Fix broken turning from earlier warning cleanup 2017-03-05 01:22:29 +00:00
Sean Ryder debe8916b3 1-tic shells 2017-03-05 00:18:20 +00:00
Sean Ryder be3acfff0b Fix warnings
Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
ZTsukei 592c4482a9 Thwomps now squish the player - might need to reduce player height to 1 or something temporarily
Mushrooms rewritten to not use Instathrust, instead they jack up your accel to 10x. Feels nicer.
Floor mushroom panels no longer activate while above them
Mushrooms force player to accelerate (and cannot brake)
K_PlayTauntSound works now. (YES YES YES HUP HUP YES HUP HERE WE GO)
Star and Mega sfx might stop correctly now in netgames (need to test)
Item box radius and height increased from 32 to 36.
2017-03-02 17:59:38 -05:00
ZTsukei 87d09228fa Roulette timer stops manually again - as more players join the game, the player in first will have to wait longer to stop the roulette manually. Players further back will also wait slightly longer, while the person in last will always only take 1 second to stop the roulette.
Fixed drifting so it stops when you're too slow.
2017-02-27 23:54:02 -05:00
ZTsukei f1f78a2349 Reverting friction, but left a note for iceman's magic number.
Intermission timer is back down to 20 seconds unless something breaks with auto-transmissions again.
Also I remembered to enable Magnets this time. Super low odds on it though.
2017-02-27 18:16:53 -05:00
ZTsukei 5d0b9ef551 Friction updated. Added KARTSTUFF to lua. Added ->kartstuff to network syncing stuff (surprised it even worked before now???), also maybe items correctly reset at the end of level now. 2017-02-27 17:55:26 -05:00
ZTsukei f50ecc0dcd Most items work (netgame needs testing), will do fireballs later. 2017-02-26 17:38:24 -05:00
ZTsukei 98137822b8 Fake Items working - Still a weird bug where the item won't throw if you're turning. 2017-02-26 10:19:33 -05:00
ZTsukei e7280fc53a Some drift adjustments 2017-02-24 20:01:06 -05:00
ZTsukei d9944e9c41 Steering fixes, drifting changed, weight has effect now 2017-02-23 20:37:16 -05:00
ZTsukei 66a206cc55 Driftboosting now increases player accleration
Consolidated the turning and drifting values to k_kart functions for easier editing
Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-21 23:42:21 -05:00
ZTsukei 226e7ead59 DevEXE version 1.1.00: Added some MD5 checks, increased md2 triagle limit, temporarily disabled magnet 2017-02-20 20:08:24 -05:00
ZTsukei 28544af035 Star works, configured to work in multiplayer with just speed items for now... Will return to look for color stuff later. 2017-02-19 19:42:10 -05:00
ZTsukei 493436dc1a Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size 2017-02-19 15:54:23 -05:00
ZTsukei 7b7a6e5458 Added fancypants mega shroom, fixed drift boosting 2017-02-19 12:19:02 -05:00
ZTsukei d83cbe0b72 BooTake working now, maybe BooSteal does too ¯\_(ツ)_/¯ 2017-02-18 16:46:08 -05:00
ZTsukei 3fecdd7658 Item boxes no longer solid 2017-02-18 15:51:35 -05:00
ZTsukei 0a782bf79e Fixed thwomp sectors, Added Magnet Item. 2017-02-18 13:39:50 -05:00
ZTsukei 559607dfe2 version num 1.0.04; Removed unneeded files from the md5 check 2017-02-17 19:39:10 -05:00
Sryder 35b789d330 Fix random duplicate code from merge in hw_main.c and r_segs.c
Whitespace cleanup
2017-02-18 00:25:16 +00:00
Sryder 68d439a783 Merge branch 'upstream/next' into zarrotsu_vanillamerge
# Conflicts:
#	src/Makefile
#	src/doomdef.h
#	src/hardware/hw_main.c
#	src/p_mobj.c
#	src/p_user.c
#	src/r_segs.c
#	src/sdl/i_video.c
#	src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Sryder 2d6c7959ed Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge
# Conflicts:
#	.gitignore
#	libs/zlib/projects/visualc10/zlib.vcxproj
#	src/Makefile
#	src/am_map.c
#	src/d_main.c
#	src/dehacked.c
#	src/doomdef.h
#	src/g_game.c
#	src/hardware/hw_main.c
#	src/hardware/hw_md2.c
#	src/info.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_mobj.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_bsp.c
#	src/r_plane.c
#	src/r_segs.c
#	src/r_things.c
#	src/s_sound.c
#	src/s_sound.h
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/win32/Srb2win-vc10.vcxproj
#	src/win32/Srb2win.ico
#	src/y_inter.c
2017-02-17 20:03:10 +00:00
ZTsukei 5cc8445812 Finished the item roulette numbers, thank god. 2017-02-17 10:26:41 -05:00
ZTsukei 370f290a08 Fixed position code, added some item numbers 2017-02-16 21:33:15 -05:00
ZTsukei b0b51f9a61 Some position code 2017-02-12 23:25:06 -05:00
ZTsukei fadcd17022 Some accelcode changes to let CC's work. 2017-02-09 23:57:36 -05:00
Monster Iestyn 9b737d1165 Merge branch 'record-attack-custom-exit-fix' into 'next'
Record attack custom exit fix

This fixes the bug reported here: http://mb.srb2.org/showthread.php?t=42342

Record Attack now no longer allows the tally to be skipped, whether by custom exits or by Lua etc.

See merge request !164
2017-02-08 20:18:06 -05:00
ZTsukei 580f909c6c Added Accelcode, start boosting, reverted drifting, etc. 2017-02-07 17:19:58 -05:00