Commit graph

534 commits

Author SHA1 Message Date
TehRealSalt
f720dd3ddb Merge v1 2019-05-06 21:23:29 -04:00
TehRealSalt
7bfc394792 Fix normalspeed
Alright fuck this branch it's misery
2019-05-02 02:58:34 -04:00
TehRealSalt
a187656a8f Fix up more stuff
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
1f61397545 Huge splitscreen refactor
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
4b7d2aea84 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
7fc1f02b07 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
2019-03-19 22:17:25 -05:00
fickleheart
9ff8b73936 Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c
2019-03-11 21:59:45 -05:00
wolfs
af67c7abf5 Merge branch 'maxskins-bump' into 'next'
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
wolfy852
2b66daf12d Remove P_CanRunOnWater 2019-03-11 00:28:30 -05:00
wolfy852
499dcc6bdb Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
wolfy852
a181cd24cd Fix my fuckups
Not fond of what I did in P_CanRunOnWater but it at least carries the desired effect...
2019-03-06 22:28:06 -06:00
wolfy852
87d60eef86 Kill SF_RUNONWATER 2019-03-06 22:02:56 -06:00
Sally Cochenour
f5fe073627 Fix floating lob items 2019-03-06 01:53:52 -05:00
Sally Cochenour
4e570739fe Make smoke opaque to reduce lag 2019-03-05 20:56:02 -05:00
Sally Cochenour
36a7e88e63 Mine updates
- Increase gravity of super-forward throws
- Revert explosion radius change
- Nerf generic explosion stun (SPB explosion stun is identical)
2019-03-05 20:49:11 -05:00
Sally Cochenour
4ecd71d026 Merge branch 'next' into minor-item-tweaks 2019-02-27 01:15:24 -05:00
James
ca87cfbf01 Water skipping speed requirements are stricter 2019-02-19 21:57:56 -05:00
James
ff57b4bc22 Missed a line 2019-02-19 20:29:53 -05:00
James
f822eb94cf Reduce explosion radius, lives forever, longer startup 2019-02-19 20:19:01 -05:00
James
2f4d3eb087 Mines can be punted
Setting behind leaves a longer startup animation window so that it can be punted more easily
2019-02-19 18:38:54 -05:00
Latapostrophe
91ce3617ef Fix respawning in reverse gravity 2019-02-18 14:00:36 +01:00
wolfy852
b9264821a2 Merge branch 'upsidedown-brain' into next
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
2019-02-17 20:45:12 -06:00
fickleheart
78adae109a [WIP, CRASHES] Save ghost data in netreplays 2019-02-16 12:42:24 -06:00
fickleheart
6da810a994 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
2019-02-06 20:47:35 -06:00
Sally Cochenour
6a14d79cf0 Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
Sally Cochenour
bc4832aa40 Slower orbit, always have 1 orbit item deploy behind you, and higher gravity for Orbinaut/Jawz 2019-01-30 14:14:24 -05:00
Latapostrophe
4c19c36fbb Small optimization + item throwing + battle stuff 2019-01-30 15:25:41 +01:00
Latapostrophe
4261e0b61a Start of a fix for antigrav 2019-01-30 00:30:48 +01:00
fickleheart
3a467889ae Fix spectators spawning as players in netreplays 2019-01-27 17:48:39 -06:00
toaster
ce09566e11 Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream.
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
2019-01-26 19:13:49 +00:00
TehRealSalt
c61fcc8db6 Fix really dumb flags on MT_SPBEXPLOSION 2019-01-14 21:55:10 -05: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
SeventhSentinel
73542c008c merge srb2 next 2019-01-05 15:59:23 -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
fickleheart
90e553d81a Use waypoint extrainfo to determine lap it works on
This can be useful to improve waypoint tracking on sprint maps.
2018-12-27 17:11:16 -06:00
SeventhSentinel
7e936d18d2 Merge branch 'master' into mobj-scale-global 2018-12-27 13:58:42 -05:00
mazmazz
73a67fc9f5 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz
9d1bc3063f Play flag-returned SFX for the opposing team 2018-12-23 22:57:14 -05:00
SeventhSentinel
2422501ab9 Add a mapobjectscale global
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
SeventhSentinel
bbf8222767 Stupid Orbinaut bullshit
- Fix Orbinaut/Jawz not accepting top speed changes (This means back-spam being slower now for real works, and the speed buff on boosters for real works.)
- Make the top-speed buffs for boosters not work for back-spam
2018-12-12 21:25:18 -05:00
Monster Iestyn
582c5332f4 Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens 2018-12-11 18:39:58 +00:00
TehRealSalt
188c0164b6 Buff item hitbox size
I was gonna hold off for v2 to do this, but frankly... this is too good to have. Honestly I think this is a big buff for karma items... people unable to hit as bombs will have a LOT less trouble as item.
2018-12-03 17:30:27 -05:00
TehRealSalt
5534017954 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -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
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
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
Sryder
ab5dc3226b Revert change to P_SlopeLaunch
Don't call slopelaunch just from object z difference if the slope has no physics.
2018-11-26 23:10:24 +00:00
TehRealSalt
b5bf8e09c3 Karma fireworks
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
2018-11-26 02:17:14 -05:00
TehRealSalt
0f1206af6f Shrink no longer causes old-style wipeout, getting squished reduces the timer on it.
Maybe this might help some of the desyncing, too! Mainly done for gameplay reasons, though :p
2018-11-25 20:14:01 -05:00