Commit Graph

4530 Commits

Author SHA1 Message Date
wolfy852 3ec0afc09d AXISBRAKE, take out GameController stuff for now 2018-12-02 19:33:09 -06:00
wolfy852 d1a0df09a5 Merge remote-tracking branch 'remotes/origin/master' into unfuck-gamepads 2018-12-02 02:01:51 -06:00
wolfy852 aba7711c39 Potentially fix spectators floating when inputting right on the analog stick. 2018-12-02 02:01:06 -06:00
TehRealSalt d9fa45d850 Back to numstarposts/2 2018-12-02 02:29:47 -05:00
TehRealSalt d125f7cc2d Wrong color for UFO fireworks 2018-12-01 23:08:42 -05:00
TehRealSalt 15b05f6e75 Fireworks carry momentum, UFOs spawn fireworks 2018-12-01 20:48:19 -05:00
TehRealSalt ac64290cc7 Forgotten include 2018-11-30 17:07:30 -05:00
TehRealSalt 5d8a63da64 Add TC_ to dehacked 2018-11-30 03:43:16 -05:00
TehRealSalt d3ecdeb364 Do 800 instead 2018-11-30 03:36:44 -05:00
TehRealSalt 9598995150 Un-nerf Mines on activation tic 2018-11-30 03:09:49 -05:00
TehRealSalt b7ff6d56d2 Colormap crash fix 2018-11-30 03:09:01 -05:00
TehRealSalt f2a87356d0 Update GPL notice 2018-11-30 00:15:14 -05:00
TehRealSalt aa9b36ac04 Fix this memory freeing 2018-11-29 22:31:20 -05:00
Sryder 969d606c6b Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git 2018-11-29 22:19:54 +00:00
Sryder 6350e6c00b Merge branch 'cmake-patch-fix' into 'master'
Update CMakeLists.txt

See merge request KartKrew/Kart-Public!1
2018-11-29 17:17:11 -05:00
Sal ce14755156 Merge branch 'rename-cmds' into 'master'
Rename "giveadmin" and "removeadmin" to "promote" and "demote"

See merge request KartKrew/Kart!117
2018-11-29 11:18:57 -05:00
TehRealSalt 4cfaf746bb Reimplement png warning 2018-11-29 11:16:40 -05:00
TehRealSalt d9654bcc1a Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 10:26:38 -05:00
TehRealSalt 6bdbc45ffe Enable pk3 in addons menu 2018-11-29 10:07:53 -05:00
TehRealSalt 46571fbda2 Fixes to merge process 2018-11-29 10:07:35 -05:00
TehRealSalt 936bd43266 Merge branch 'master' into merge-next 2018-11-29 09:46:46 -05:00
Monster Iestyn 305ad4f73e backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading 2018-11-29 14:16:02 +00:00
wolfy852 f2072b973b Rename "giveadmin" and "removeadmin" to "promote" and "demote" 2018-11-29 07:58:26 -06:00
TehRealSalt 5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Sal aa56911b2e Merge branch 'version-prep' into 'master'
Update version to v1.0.2

See merge request KartKrew/Kart!111
2018-11-29 08:05:24 -05:00
TehRealSalt 7ed6fb8483 Update patch.kart hash 2018-11-29 08:04:41 -05:00
Sal 594fae05ff Merge branch 'floating-item-fixes' into 'master'
Floating item fixes

See merge request KartKrew/Kart!116
2018-11-29 08:00:56 -05:00
TehRealSalt a32b3bf07b Remove in death pits 2018-11-29 07:50:58 -05:00
TehRealSalt be4fb2bcfb Set indirectitemcooldown for SPB/Shrink drops 2018-11-29 07:49:34 -05:00
Sal e88dbedbc4 Merge branch 'mobjdamage-hook' into 'master'
Lua "damage" hooks

See merge request KartKrew/Kart!115
2018-11-29 07:16:22 -05:00
TehRealSalt 5f3abae81b Merge branch 'possibly-better-turn' 2018-11-29 07:13:24 -05:00
TehRealSalt 1a4648b6e9 Update credits for bonuschars 2018-11-29 06:54:36 -05:00
TehRealSalt 97f0dc3875 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-29 05:36:45 -05:00
TehRealSalt 2789e76683 ...Welp, I mixed up my commit names :V
THIS commit's the MT_FIREDITEM fix, the LAST commit was me making sure the size of translationtablecache was correct.
2018-11-29 05:36:40 -05:00
TehRealSalt 576617ec71 MT_FIREDITEM crash fix 2018-11-29 05:34:57 -05:00
Latapostrophe 54a7e65ff6 Moved (void)inflictor;s below and put scoremultiply at the top of all the damage funcs 2018-11-28 19:50:30 +01:00
Latapostrophe 5660e3fccd Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s 2018-11-28 19:41:01 +01:00
Sal 8cfa05471f Merge branch 'sectionspawn' into 'master'
Respawn on intermediate finish line + cap numlaps cvar in sectionraces

See merge request KartKrew/Kart!113
2018-11-28 13:16:37 -05:00
Sal 4dae90ddcd Merge branch 'msgametypeDOUBLEfix' into 'master'
ALWAYS have web MS show Battle servers as Match rather than Tag

See merge request KartKrew/Kart!114
2018-11-28 13:14:51 -05:00
toaster 0133bf275a Definitively fix the MS thinking that Battle servers are playing on Tag, and KEEP it that way even when we exceed 2.1's version number eventually... 2018-11-28 17:37:36 +00:00
toaster 2c8855cd5f Upper-bound restrict the setting of numlaps for sectionrace levels mid-game 2018-11-28 16:45:45 +00:00
toaster d8955f1f87 LF_SECTIONRACE now has a secondary function!
* Sets the player respawn coords on the finish line, so dying in the short interval between crossing an intermediate finish line and hitting a checkpoint doesn't send you all the way back to the beginning.
2018-11-28 16:33:52 +00:00
TehRealSalt 79359a3672 Multiply turn values by realtics 2018-11-28 03:10:36 -05:00
TehRealSalt ecba6a0cb4 Nerf activation range of Mines, keep explosion radius 2018-11-28 02:31:16 -05:00
TehRealSalt 7b475d0f91 Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua 2018-11-28 00:45:33 -05:00
Sal 29410bb93d Merge branch 'stricter-checkpoints' into 'master'
Require 3/5ths of checkpoints instead of 1/2 for a lap

See merge request KartKrew/Kart!112
2018-11-27 19:18:43 -05:00
TehRealSalt 3206ce716f I like working on Kart... 2018-11-27 19:00:48 -05:00
Monster Iestyn e158206e55 backport string len tweaks I made to LUA_LoadLump in internal 2018-11-27 23:06:31 +00:00
Monster Iestyn cb53bc8afe remove redundant wadfile loop within wadfile loop for ANIMDEFS code 2018-11-27 23:05:33 +00:00
TehRealSalt e2a9aeb34c Require 3/5ths of checkpoints instead of 1/2
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00