Commit graph

1320 commits

Author SHA1 Message Date
Jack
af16e3f993 Implemented SPR2_DKRT and integrated it into the state system 2024-09-07 14:40:12 +01:00
Jack
51112a07f7 Revert "I've spent the last 3 or so hours just trying to get a feel as to how to even begin approaching this task but I think it's just way beyond my understanding, I don't have enough experience with big C / C++ projects to know if its just me or if this project being 2 decades running makes it a freak of nature but I'm just barely holding on here and not seeing any results, so nuts to it for now."
This reverts commit 6125572b63.
2024-09-06 01:13:55 +01:00
Jack
6125572b63 I've spent the last 3 or so hours just trying to get a feel as to how to even begin approaching this task but I think it's just way beyond my understanding, I don't have enough experience with big C / C++ projects to know if its just me or if this project being 2 decades running makes it a freak of nature but I'm just barely holding on here and not seeing any results, so nuts to it for now. 2024-09-01 14:50:27 +01:00
Lach
ddbb1709d0 Don't remap MT_SNEAKERPANEL in encore mode 2024-04-13 13:15:53 +10:00
toaster
f9c0c535a2 Final object/state missing flags
- Fullbright for Servant Hand
- Don't encore remap for wallspike base, Big Ring
2024-04-13 00:49:01 +01:00
Sally Coolatta
7dfa597c7d SRB2 -> DRRR copyright in src, acs, android folder
Be consistent with toaster's recent changes to copyright
2024-04-05 02:08:23 -04:00
Lach
d2a53a0e64 Adjust Adventure Air Boosters for 3D models 2024-04-04 20:41:21 +11:00
James R
551a101f7b Hardcode SA2 Pulley (ipullup.lua)
Differences from Lua version:

- Does not set cusval
- Does not have individual states for pulley, hook
  - Simply sets sprite on S_INVISIBLE
- Does not do P_CheckPosition, sets Z directly
- Does not spawn chain visual every tic
  - Spawns a single object and vertically stretches it to
    the correct length
- MT_IPULLUP has MF_SCENERY and a short-circuiting
  thinker, also MF_NOBLOCKMAP so there is never any
  collision against it (it is a controller)
- MT_PULLUPHOOK has MF_NOCLIP to avoid extra collisions
  while moving
2024-04-03 04:37:44 -07:00
James R
bf0041644a Add destroyed kart effects
- Removed hitlag sparks and extra quakes from player death
- Removed dontdraw flag from NO CONTESTED player
- Moved most dead kart code to objects/destroyed-kart.cpp
2024-03-31 00:58:14 -07:00
James R
6d217b8fd6 Fix Sealed Star Mace hardcode
- Was broken and didn't have a hitbox or sprite
- Didn't notice because there was a SOC file taking
  precedence
2024-03-27 18:17:16 -07:00
Sally Coolatta
6b9029bede Replace item pickup sound 2024-03-25 01:35:05 -04:00
AJ Martinez
33fe1a140d Merge branch 'sealed-star-lamp-fixes' into 'master'
Remove fullbright from Sealed Star Lamps and re-add missing bulb segment

See merge request KartKrew/Kart!2086
2024-03-12 00:07:43 +00:00
James R
44666f0c2e Add SF_BADNIK flag for characters, spawn an explosion on death
- Plays a pop sound too!
2024-03-11 01:25:03 -07:00
Lach
7e651c1ef8 Remove fullbright from Sealed Star Lamps and re-add missing bulb segment 2024-03-11 16:11:21 +11:00
Gunla
20ecc22ccf Merge branch 'blend-end' into 'master'
Blend End

See merge request KartKrew/Kart!2039
2024-03-10 20:30:38 +00:00
toaster
4a36d5f947 MT_SPIKEDTARGET: Don't encoremap 2024-03-09 20:33:24 +00:00
James R
2b121bf3d0 Underwater: tweak bubble VFX
- Spawn around the player, not just on a single point
- 1.5x scaled
- Opaque, not translucent
- Carries player momentum
2024-03-09 01:10:14 -08:00
Oni
1b3c63f24a Merge branch 'adventure-air-booster-hardcode' into 'master'
Hardcode Adventure Air Booster & Dimension Disaster objects

Closes #1116

See merge request KartKrew/Kart!2038
2024-03-09 08:28:51 +00:00
AJ Martinez
c4ed9ee19d Merge branch 'noclip-sealed-star-light-rays' into 'master'
Sealed Star Window: make light rays noclip, so they are not offset by level geometry

Closes #1059

See merge request KartKrew/Kart!2049
2024-03-09 06:03:22 +00:00
Lach
5e70a5b8e7 Scale Adventure Air Booster centerpiece from its center 2024-03-09 16:52:30 +11:00
Lach
2f19582941 Merge remote-tracking branch 'origin/master' into adventure-air-booster-hardcode 2024-03-09 15:19:29 +11:00
James R
f7d396d150 Power-ups: spawn spinning power-up icon on player
- Spins for 40 tics, speeds up over duration
- Starts wide stretched, ends thin and tall
- Additive, fades into translucency
2024-03-08 17:53:07 -08:00
James R
a23a632082 Sealed Star Window: make light rays noclip, so they are not offset by level geometry 2024-03-08 08:10:09 -08:00
Lach
a419ea48c6 Hardcode Adventure Air Booster & Dimension Disaster objects 2024-03-08 10:38:33 +11:00
James R
c73e9cedaf Optimize Ice Cube breaking particles 2024-03-06 20:01:38 -08:00
James R
18654a8a70 Extra effects for Prison Egg CD
- The goal here is to make it more obvious if a CD drops,
  and make the CD more visible.
- Rainbow sparkles scaled up by x3.
- Play long "powering down" noise when a Prison with a CD
  inside is destroyed.
  - CD spawns after noise stops playing.
- Spawn a twinkle (Gainax).
  - Flickers while "powering down" noise is playing.
  - Enlarges and disappears in sync with the "CD dropped"
    sound effect.
- Darken the map while all of this is happening.
2024-03-05 03:35:35 -08:00
AJ Martinez
47a9cce133 Add shittysigns cheat 2024-03-02 04:27:41 -07:00
toaster
65d553a5f9 Restore Sapphire Coast decorative objects
Removed in !1811, putting back because used in Lake Margorite and a handful of other stages as generic decoration
2024-02-26 19:39:10 +00:00
James R
6df73670dd Talk Point visual (for dialogue)
- Spinning question mark surrounded by multi-colored orbs,
  representing the radius of the dialogue activator
- Collect animation
2024-02-23 06:15:31 -08:00
Eidolon
9c14c59929 Fix MT_SSCANDLE initialization 2024-02-17 16:35:46 -06:00
toaster
106553f89d Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into srb2-tidy
# Conflicts:
#	src/p_mobj.c
2024-01-27 17:04:00 +00:00
James R
2364fb80a0 Battle: remove overhead arrows (physical object)
Old shitty object from v1 that is about to be replaced by
HUD tracking. :D
2024-01-26 14:30:56 -08:00
James R
aefbd8c58a Remove unused overhead WANTED code
From v1 Battle
2024-01-26 14:30:56 -08:00
toaster
5680514012 Per Sal's request, remove SMK stuff too 2024-01-26 00:56:01 +00:00
toaster
6fdec66dc3 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into srb2-tidy 2024-01-26 00:29:06 +00:00
SteelT
678250ab3c Fix gachatarget hitbox
Fixes the targets in sealed star 8 having really small hitboxes
2024-01-14 23:07:34 -05:00
toaster
1d13cb64c0 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into srb2-tidy
# Conflicts:
#	src/p_mobj.c
2024-01-13 22:08:44 +00:00
James R
69c3aaf4f2 Gachabom Rebound: fix crash after owner object is removed 2024-01-12 02:05:56 -08:00
Eidolon
58557b274f Hardcode Sealed Star objects 2024-01-11 14:18:15 -08:00
James R.
3084b5ee18 Merge branch 'fix-bufo-fof' into 'master'
Fix Battle UFO tractor descending through FOFs

Closes #876

See merge request KartKrew/Kart!1807
2024-01-11 20:42:47 +00:00
SteelT
10e9cd7480 Hardcode waterfall particles spawner 2024-01-11 03:55:12 -08:00
wolfy852
55761769cf Hardcoding: fix missing MF_SPECIAL, check for MT_AGZ_CLOUDCLUSTER before scaling 2024-01-10 20:38:47 -08:00
wolfy852
fa0092006f Hardcoding: AHZ/AGZ/SSZ cloud object/state/sprite definitions 2024-01-10 20:37:29 -08:00
toaster
325079a39a Delete everything major flagged up by listunusedsprites
Notable deletions:
- Metal Sonic Race
    - Includes all the specialised recording/playback apparatus which made g_demo.c harder to read
- A bunch of hyperspecialised code inside several A_ actions
- EXCEPTION: intentfully left in the spriteless SMK stuff for Sal's add-on down the line.
2024-01-11 01:21:43 +00:00
James R
20353f2a84 Battle UFO: fix tractor descending past FOFs 2024-01-09 22:38:53 -08:00
James R
670b3995f1 Monitor: extend death state so sound doesn't cut off
see a982b3bf6
2024-01-06 02:08:07 -08:00
Oni
10f8bb5a3f Merge branch 'battle-release' into 'master'
Battle is (almost) ready for release

Closes #681

See merge request KartKrew/Kart!1788
2024-01-06 06:08:28 +00:00
James R
967cb65124 Battle UFO: extend hitbox down by 1/4 2024-01-05 21:00:42 -08:00
Eidolon
61db93db0c Hardcode Joypolis trick balloons 2024-01-05 17:56:38 -06:00
Oni
3437688566 Merge branch 'explosions-trick' into 'master'
Do not punt SPB explosion (eggmark)

Closes #796

See merge request KartKrew/Kart!1710
2023-12-24 16:30:25 +00:00