Commit graph

1675 commits

Author SHA1 Message Date
Sally Coolatta
ecec1e8a8f OK the compiler still didn't like it, so just properly remove it entirely. 2020-08-10 17:22:55 -04:00
Sally Coolatta
0c06da879e Merge p_mobj.c 2020-08-10 14:37:15 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
7accb3f8d2 Merge p_mobj.c/h 2020-08-08 15:22:29 -04:00
Sal
21dfe49bf8 Merge branch 'antigrav-respawn' into 'master'
Antigravity fixes, round 2

See merge request KartKrew/Kart!305
2020-07-31 21:55:38 -04:00
Nev3r
0bd31d8862 Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now. 2020-07-30 09:45:58 +02:00
Nev3r
3d90a6aebe Merge branch 'udmf-next' into 'next'
Merge udmf-next into next

See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00
Sally Coolatta
69b6ba2f18 I tore apart the entire code to try and fix braking friction and gave up, so now it's back to v1
My rewrites clean up a LOT of weird/misleading behavior anyway, so I'm gonna push this regardless. Someone else will have to figure out another way to reimplement braking friction though -- we can't use it as is because it prevents being able to bump people.
2020-07-28 03:34:39 -04:00
Latapostrophe
b62ef5a51d Kill flipcam again but nothing else associated with it. 2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c Revert "Push flipcam down the nearest staircase"
This reverts commit 06d70c1f8e.
2020-07-26 20:27:22 +02:00
Sally Coolatta
f61f9a010c Merge branch 'master' into spindash 2020-07-24 21:26:17 -04:00
Sally Coolatta
1a61810f16 Make ring respawn faster 2020-07-24 20:19:14 -04:00
Latapostrophe
06d70c1f8e Push flipcam down the nearest staircase 2020-07-24 16:17:07 +02:00
Sally Coolatta
25e9c72bab Merge branch 'master' into spindash 2020-07-23 19:12:00 -04:00
James R
34a7c2ee88 Hammer cocks on rainbow sparks; hella bullet clips on rainbow boost + new sfx 2020-07-22 19:09:14 -07:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04:00
lachwright
c9d8fcc1cb Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
James R
93e0872d9a Merge remote-tracking branch 'origin/master' into driftboost 2020-07-19 22:19:59 -07:00
James R
37aedad288 Sounds for big blue boost and bullet clip bouncing 2020-07-19 21:49:23 -07:00
James R
b23581ac38 The drift boost clip is fatter 2020-07-19 21:05:29 -07:00
James R
280791a832 Drift Boost Plumes, play every other frame of Drift Boost Explosion (normally flicker frames) 2020-07-19 19:11:19 -07:00
James R
3ff00e851e Better spawning for the clip spark 2020-07-19 18:09:52 -07:00
James R
f8b19a239f Drift Boost Clip, bounces on floor and sparks, then flickers until it dies 2020-07-19 18:04:11 -07:00
James R
1dae3d196b Who said anything about a 5th frame? 2020-07-18 14:52:30 -07:00
James R
59c0f99865 5th frame + rainbow colors cycle on the drift explody 2020-07-17 23:44:00 -07:00
Ashnal
bb6a5662c2 Fixing RocketSneakers
New function specifically for dropping rocketsneakers K_DropRocketSneaker
Used by Eggbox touchspecial to properly dispose of shoes and clean up hnext
Now also used by the shoe thinker to drop themselves
Fixes angle of spent shoe launch
2020-07-14 18:45:45 -04:00
James R
716898ebf6 Probably a good idea to flip with mobjscaled height 2020-07-13 19:58:00 -07:00
James R
f348cd0f1f Multiply ring float height by mobjscale 2020-07-13 19:55:00 -07:00
GoldenTails
a913a8a652 Expose P_PlayerZMovement to Lua.
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
GoldenTails
6124e010b2 Expose P_SceneryZMovement to Lua.
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
GoldenTails
93edc25cae Expose P_RingZMovement to Lua.
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
GoldenTails
d0f9d79170 Expose P_ZMovement to Lua.
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
GoldenTails
1fb799203c Expose P_SceneryXYMovement to Lua.
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
GoldenTails
0bbd08f980 Expose P_RingXYMovement to Lua.
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
Nev3r
9210b2ba0b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
James R
65550cc9b7 Make drift explode animation LONGER 2020-07-09 18:03:27 -07:00
James R
dc83e6ee0b Merge remote-tracking branch 'origin/master' into driftboost 2020-07-09 16:48:33 -07:00
James R
856eda9f95 Don't scale drift explosion 2020-07-09 16:48:21 -07:00
James R
e250796886 WIP "Drift explosion" 2020-07-08 21:30:34 -07:00
lachwright
c5d74a1859 Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades 2020-07-09 05:56:11 +08:00
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
lachwright
6a7565686b Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic
5c61f059e8 Merge branch 'sf_nosupersprites' into 'next'
Add SF_NOSUPERSPRITES

See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
lachwright
10b09f49c3 Add sightcheck boolean to P_RadiusAttack
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
LJ Sonic
85f5698c9b Merge branch 'dragonbomber-height' into 'next'
Fix Dragonbomber z positioning

See merge request STJr/SRB2!1004
2020-07-03 17:05:10 -04:00
lachwright
0a3b728e81 Knuckles changes:
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
lachwright
5ec234e726 Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
James R
34eeb98cc4 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
lachwright
575fafedaa Fix Dragonbomber z positioning 2020-06-19 00:52:24 +08:00