Commit graph

899 commits

Author SHA1 Message Date
TehRealSalt
f2bbcbefa2 Drafting 2019-03-14 19:43:58 -04:00
TehRealSalt
40093a9213 Merge branch 'master' into rings 2019-03-12 01:27:11 -04: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
TehRealSalt
6aa55bdbe2 Merge remote-tracking branch 'kartpublic/next' into fortnite 2019-03-11 13:49:12 -04:00
Latapostrophe
00ddf6e9f3 Fix boost / rocket sneakers for antigrav 2019-03-09 17:25:42 +01:00
TehRealSalt
4a68f98dc2 double ring hitbox, buff ring boost to 20% top speed increase 2019-03-08 20:33:44 -05:00
wolfy852
2dc5dde769 Merge remote-tracking branch 'remotes/origin/master' into waypoints
# Conflicts:
#	src/k_kart.c
2019-03-08 12:24:03 -06:00
wolfy852
b19d9f69f1 Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2019-03-08 02:34:04 -06:00
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
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
Alam Arias
2967638cf3 remove whitespaces 2019-03-02 19:49:21 -05:00
James
4397db9b65 Reduce explosion radius, lives forever, longer startup 2019-02-19 20:19:01 -05:00
Latapostrophe
92ab2845c8 Followers but they crash when you join netgames 2019-02-14 03:56:28 +01:00
Alam Arias
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05: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
79f381ebd4 Add visual debugging mode for waypoints
Fix some compiler warnings
2019-02-02 21:35:21 +00: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
TehRealSalt
553f3a9295 Fix really dumb flags on MT_SPBEXPLOSION 2019-01-14 21:55:10 -05:00
SeventhSentinel
562ff616e3 New visual
Will be replaced later regardless, but ah well
2019-01-02 19:32:23 -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
TehRealSalt
b27c709879 a bunch of stuff I left uncommited 2018-12-15 19:14:30 -05:00
SeventhSentinel
8a9f274f71 Fix Ballhog under the last commit...
It actually uses trailing item's throw speeds instead of its own, oddly enough; I don't want to mess with the gameplay there, so I just gave it its own exception.
2018-12-13 09:47:14 -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
TehRealSalt
19ca7bf134 Show the central item on the minimap, and other minor aesthetic touches 2018-12-06 16:17:17 -05:00
TehRealSalt
dfa0522326 Battle Mode overtime
After the time limit is up, spawn a shrinking kill-field. This is one hefty initial commit!
2018-12-06 13:46:38 -05:00
Sryder
93e63d42cb Add MF_SCENERY to the waypoints, if what I remember from toaster is correct, we probably can't use MF_NOTHINK due to it not being synched properly for netplay. 2018-12-04 22:35:14 +00:00
Sryder
9b00709966 Merge branch 'master' into waypoints 2018-12-04 22:29:22 +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
Sryder
746a004f18 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
# Conflicts:
#	src/info.c
#	src/p_mobj.c
#	src/p_spec.c
2018-12-01 22:09:03 +00:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
TehRealSalt
48be0e5246 Nerf activation range of Mines, keep explosion radius 2018-11-28 02:31:16 -05:00
TehRealSalt
1c02dd8213 Slow down animation 2018-11-26 07:43:05 -05: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
Monster Iestyn
d824e05a6f Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
TehRealSalt
4acadbf66f Mess with display offset for some Battle objects 2018-11-25 05:43:17 -05:00
Digiku
7e48af8afd Merge branch 'nights-ideyaspawn-dronebox' into 'master'
NiGHTS: Ideya Anchor Points

See merge request STJr/SRB2Internal!160
2018-11-21 21:03:29 -05:00
Digiku
aed64a7c73 Merge branch 'nights-dronebox' into 'master'
NiGHTS: Drone hitbox improvements and player position correction on Nightserize

See merge request STJr/SRB2Internal!158
2018-11-21 20:19:39 -05:00
TehRealSalt
bb88a9150e Remove duplicate/removed objects
As well as other compile errors
2018-11-18 03:43:33 -05:00
Steel Titanium
924594e6c6 Fix skybox disappearing after using objectplace command 2018-11-13 17:25:42 -05:00
TehRealSalt
339a2a6ee6 Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
toaster
886613164f MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone. 2018-11-05 23:06:28 +00:00
toaster
c2b790d14a Blank out the fancharacters as requested, but don't remove them from the info lists... a fun thing for TCRF to look at eventually, maybe, and I don't want to have to do a from-scratch build at this stage in the game or risk any instability that could arise from sweeping info cleanups.
In fact, the only reason I even considered doing this is that the sprites had to be removed, leaving these actively causing errors when placed.
2018-11-05 19:58:20 +00:00
mazmazz
8f5f32a1b8 Trigger line exec by whether mobj is facing its tracer
* MFE_TRACERANGLE
* Thing 758 MT_ANGLEMAN
* mobj thinker behavior
* Line Exec 457/458 Enable/Disable
2018-11-04 16:28:25 -05:00