FlykeSpice
2424418390
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
9314a0d9a9
Fix normalspeed
...
Alright fuck this branch it's misery
2019-05-02 02:58:34 -04:00
TehRealSalt
a3d2b48329
Fix up more stuff
...
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2
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
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
be458c1d05
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
e536252a8a
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
f4947820e4
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
82d93a95fd
Remove P_CanRunOnWater
2019-03-11 00:28:30 -05:00
wolfy852
19e515d439
Kill all skin flags but SF_HIRES
2019-03-09 23:18:55 -06:00
wolfy852
ddc296575f
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
2850ca17df
Kill SF_RUNONWATER
2019-03-06 22:02:56 -06:00
Sally Cochenour
b10d0f74c9
Fix floating lob items
2019-03-06 01:53:52 -05:00
Sally Cochenour
5dbdc903ba
Make smoke opaque to reduce lag
2019-03-05 20:56:02 -05:00
Sally Cochenour
a2f0935bee
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
22cfbd8fd1
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:15:24 -05:00
James
aebc8179cc
Water skipping speed requirements are stricter
2019-02-19 21:57:56 -05:00
James
5ce17bc17b
Missed a line
2019-02-19 20:29:53 -05:00
James
4397db9b65
Reduce explosion radius, lives forever, longer startup
2019-02-19 20:19:01 -05:00
James
a31b204cf2
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
2b47818d66
Fix respawning in reverse gravity
2019-02-18 14:00:36 +01:00
wolfy852
096cd50bae
Merge branch 'upsidedown-brain' into next
...
# Conflicts:
# src/k_kart.c
# src/k_kart.h
2019-02-17 20:45:12 -06:00
fickleheart
0bbff7f6d4
[WIP, CRASHES] Save ghost data in netreplays
2019-02-16 12:42:24 -06:00
fickleheart
1c6046ac43
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
838c2aa68d
Offroad spark fix & sink
2019-02-02 00:58:51 -05:00
Sally Cochenour
9870378c37
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
e5033da2a3
Small optimization + item throwing + battle stuff
2019-01-30 15:25:41 +01:00
Latapostrophe
4a35b95fbf
Start of a fix for antigrav
2019-01-30 00:30:48 +01:00
fickleheart
08582fa7cc
Fix spectators spawning as players in netreplays
2019-01-27 17:48:39 -06:00
toaster
4e4d663b3e
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
553f3a9295
Fix really dumb flags on MT_SPBEXPLOSION
2019-01-14 21:55:10 -05:00
Sal
900c6df765
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
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
Sal
5c1267d2e6
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
e5f2f39b46
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
68525de00a
Merge branch 'master' into mobj-scale-global
2018-12-27 13:58:42 -05:00
mazmazz
7fe19c2f09
Merge branch 'ctf-enemy-flag-sound' into 2122-version
2018-12-25 00:27:08 -05:00
mazmazz
96dadf64a7
Play flag-returned SFX for the opposing team
2018-12-23 22:57:14 -05:00
SeventhSentinel
d9a3b37e30
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
f35e5d816a
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
ee474bab23
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
2ff31a7b72
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
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -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
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
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
Sryder
5533f03351
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
1419eef5db
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