Commit graph

1881 commits

Author SHA1 Message Date
TehRealSalt
74a757ad69 Merge remote-tracking branch 'kartpublic/next' into rings 2019-03-07 21:31:45 -05:00
TehRealSalt
129268121d Added rings. 2019-03-07 17:11:31 -05:00
Latapostrophe
e2c72c08cd Fix map load crash and other additions / clean ups 2019-03-07 23:10:07 +01: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
Jimita the Cat
f8ed0857c0 a 2019-03-06 21:40:38 -03: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
Monster Iestyn
2ef1d63b63 Fix compiler warnings 2019-02-13 18:06:56 +00: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
b2d2d64323 Merge branch 'master' into fortnite 2019-02-04 20:01:20 -05:00
MascaraSnake
3c0cb14a29 In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC 2019-02-03 14:32:07 +01:00
Sryder
5fba15a58b Make waypoints setup on map load
Refactor some things to make slightly clearer code
Change comments to use completely tabs
Add extra error checks to methods for helpful debugging and safety
Use a heap of waypoints during creation to be able to search for them to make links, to not freeze the game
Add a way to clear waypoints so that the methods don't error after more than one map load
Flip the ambush flag so that adding it will make the waypoint unable to be respawned at when the feature happens
Temporarily disable K_UpdateKartPosition so that it doesn't crash on map load
2019-02-02 13:50:22 +00:00
Sally Cochenour
838c2aa68d Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
Sryder
a72630942d Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/p_mobj.c
2019-02-01 17:29:17 +00: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
TehRealSalt
450e693c65 Extra improvements
- The rainbow item now spawns in the middle before slowly expanding in radius. This keeps it anti-campy, but doesn't make it a pain in the ass to grab if it's being constantly picked up like intended.
- Entirely remove the potential for holes in the barrier sprites
- Flip particles that are attached to ceilings
- More throughly check to make sure particles don't spawn in the skybox
2019-01-08 20:36:42 -05:00
TehRealSalt
c6c13bda64 Use mapobjectscale 2019-01-08 18:36:02 -05:00
TehRealSalt
02425bade6 Double time for overtime to kick in, make barrier always completely visible 2019-01-08 18:26:16 -05:00
TehRealSalt
f8a1cf849f Merge branch 'master' into fortnite 2019-01-08 18:17:09 -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
SeventhSentinel
562ff616e3 New visual
Will be replaced later regardless, but ah well
2019-01-02 19:32:23 -05:00
SeventhSentinel
7790a6110c Minor issues 2019-01-02 16:22:49 -05:00
SeventhSentinel
d6255ddbb2 Merge branch 'master' into fortnite 2019-01-02 14:08:10 -05:00
SeventhSentinel
8391dd520a Add item spinning, turn into papersprites, spawn more orbs
Also tried to fix a memory issue I only get from Sev's compiles by removing the need to free memory for this... but didn't fix anything :/
2019-01-02 14:08:00 -05:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -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
TehRealSalt
b27c709879 a bunch of stuff I left uncommited 2018-12-15 19:14:30 -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