stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
4505 commits 60 branches 11 tags 94 MiB
Commit graph

4505 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Sal
28488cc0dc 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
ed4477705d Separated the damage hooks into multiple more precise hooks for players. 2018-11-27 18:27:43 +01:00
Sal
a2ab230bfa 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
cc8af2acdb 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
59f59c8042 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
f0b042a4b6 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
cd57be640c 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
969801ef09 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
3e6388c183 use UINT8 * instead of void or Bytef * 2018-11-27 15:49:41 +00:00
Monster Iestyn
6e839d30a2 Merge branch 'master' into next 2018-11-27 15:31:28 +00:00
Monster Iestyn
95e13d9ad3 Merge branch 'save-soundmenu-toggles' into 'master' 
Save sound toggles to config

See merge request STJr/SRB2!348
 2018-11-27 10:07:06 -05:00
Monster Iestyn
1889c36dea add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?) 2018-11-27 13:57:32 +00:00
TehRealSalt
92225748e5 Fix order so the new sound can actually play 2018-11-26 23:34:43 -05:00
Alam Ed Arias
b7f7c2ecf7 PK3: fixup support for newer version of zlib 2018-11-26 20:08:26 -05:00
Alam Ed Arias
9a042cd5e2 Merge branch 'master' into next 2018-11-26 19:49:19 -05:00
Alam Ed Arias
776e920895 TravisCI: need WFLAGS for cmake builds 2018-11-26 19:39:36 -05:00
Alam Ed Arias
5ba788e089 Revert "TravisCi: remove WFLAGS" 
This reverts commit fd12e85697.
 2018-11-26 19:38:30 -05:00
Alam Ed Arias
78a1931bdf Makefile: disable implicit-fallthroug warnings 2018-11-26 19:38:14 -05:00