Commit graph

4519 commits

Author SHA1 Message Date
TehRealSalt
9a96ca84f9 Un-nerf Mines on activation tic 2018-11-30 03:09:49 -05:00
TehRealSalt
33946b7879 Colormap crash fix 2018-11-30 03:09:01 -05:00
TehRealSalt
6d6b6a1e6b Update GPL notice 2018-11-30 00:15:14 -05:00
TehRealSalt
e9575f3d28 Fix this memory freeing 2018-11-29 22:31:20 -05:00
Sryder
7836dce57d Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git 2018-11-29 22:19:54 +00:00
Sryder
696ab280d0 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
1337624f89 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
561c8a3d79 Reimplement png warning 2018-11-29 11:16:40 -05:00
TehRealSalt
2a1a572d39 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 10:26:38 -05:00
TehRealSalt
cf866c706f Enable pk3 in addons menu 2018-11-29 10:07:53 -05:00
TehRealSalt
e1c71f652d Fixes to merge process 2018-11-29 10:07:35 -05:00
TehRealSalt
3a915c857e Merge branch 'master' into merge-next 2018-11-29 09:46:46 -05:00
Monster Iestyn
4f7daecf65 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
c5d1950002 Rename "giveadmin" and "removeadmin" to "promote" and "demote" 2018-11-29 07:58:26 -06:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Sal
b40e666f6f 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
dbacaaaf5e Update patch.kart hash 2018-11-29 08:04:41 -05:00
Sal
c3dd0de911 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
68f465f7a6 Remove in death pits 2018-11-29 07:50:58 -05:00
TehRealSalt
ef19830c31 Set indirectitemcooldown for SPB/Shrink drops 2018-11-29 07:49:34 -05:00
Sal
171e54d251 Merge branch 'mobjdamage-hook' into 'master'
Lua "damage" hooks

See merge request KartKrew/Kart!115
2018-11-29 07:16:22 -05:00
TehRealSalt
c42089a025 Merge branch 'possibly-better-turn' 2018-11-29 07:13:24 -05:00
TehRealSalt
d5abeafc91 Update credits for bonuschars 2018-11-29 06:54:36 -05:00
TehRealSalt
d79d2d0e66 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-29 05:36:45 -05:00
TehRealSalt
b09c83e35f ...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
a9342fe0fd MT_FIREDITEM crash fix 2018-11-29 05:34:57 -05:00
Latapostrophe
1cd00ad6ef 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
d240cfef86 Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s 2018-11-28 19:41:01 +01:00
Sal
452c44c56b 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
28307fbd75 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
64ac4a9816 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
7b3e55b431 Upper-bound restrict the setting of numlaps for sectionrace levels mid-game 2018-11-28 16:45:45 +00:00
toaster
2cf5350c0f 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
2196fa1cc2 Multiply turn values by realtics 2018-11-28 03:10:36 -05:00
TehRealSalt
48be0e5246 Nerf activation range of Mines, keep explosion radius 2018-11-28 02:31:16 -05:00
TehRealSalt
261a50fe68 Fix exit music occasionally being wrong on race exit, add K_KartUpdatePosition to Lua 2018-11-28 00:45:33 -05:00
Sal
959e51af45 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
4e532b7ae5 I like working on Kart... 2018-11-27 19:00:48 -05:00
Monster Iestyn
d2c822c583 backport string len tweaks I made to LUA_LoadLump in internal 2018-11-27 23:06:31 +00:00
Monster Iestyn
b4838e3afa remove redundant wadfile loop within wadfile loop for ANIMDEFS code 2018-11-27 23:05:33 +00:00
TehRealSalt
668efe9105 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
Sal
521b67834b Merge branch 'netcode-vars-strict' into 'master'
Make netcode var defaults stricter, add Advanced Server Options

See merge request KartKrew/Kart!110
2018-11-27 12:27:47 -05:00
Latapostrophe
a6bea8483f Separated the damage hooks into multiple more precise hooks for players. 2018-11-27 18:27:43 +01:00
Sal
5cad8e272f Merge branch '102-gameplay' into 'master'
v1.0.2 gameplay

See merge request KartKrew/Kart!107
2018-11-27 12:25:37 -05:00
Sal
9e4d826f1a Merge branch 'better-buffering' into 'master'
Better vote level buffering

See merge request KartKrew/Kart!109
2018-11-27 12:25:02 -05:00
Sal
96a37cc36b Merge branch 'rotate-the-md2' into 'master'
Rotate the MD2

See merge request KartKrew/Kart!108
2018-11-27 12:23:48 -05:00
TehRealSalt
74daafd9eb Advanced Server Options menu
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 12:10:46 -05:00
Monster Iestyn
a6a4b74692 Merge branch '21-controls' into 'next'
Default control changes for 2.1.21

See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
TehRealSalt
a7a27bc636 SEVERELY nerf jointimeout & resynchattempts, too
All of these previous defaults are "this is an insane time to reach, by that point you might as well disconnect"
2018-11-27 11:23:28 -05:00
Monster Iestyn
f526d99a27 use UINT8 * instead of void or Bytef * 2018-11-27 15:49:41 +00:00