Commit graph

1389 commits

Author SHA1 Message Date
AJ Martinez
e7ff5292a4 Merge branch 'master' into 'jartha/bubble-shield-new-sprite'
LOOK MOM I'M USING THE WEB UI

# Conflicts:
#   src/objects/CMakeLists.txt
2025-05-17 02:34:26 +00:00
James R
48f5a8a1e4 Add new Bubble Shield states (held version) 2025-05-13 18:24:52 -07:00
Lach
22817ac60b Add stun mechanic & Flybot767 2025-05-14 01:39:42 +10:00
AJ Martinez
95cd51cada Dynamic tripwire 2025-05-01 17:12:40 -04:00
Ashnal
42e30cd8bb Landmine forwardthrow 2025-04-09 04:42:54 +00:00
VelocitOni
3139101305 Flipped frame-count & speed
Flipped where frame count and speed were, oops
2025-04-06 14:07:49 -04:00
VelocitOni
f493087cc4 FF_Animate
Shot in the dark, idk how this fucking works LOL
2025-04-06 13:59:44 -04:00
Eidolon
cb7f437e60 Merge public master 2025-02-13 15:48:11 -06:00
Eidolon
a4d304a1f5 Update copyright years to 2025 2025-02-13 15:32:26 -06:00
Eidolon
1a8467fdaf Merge public master 2025-02-12 19:02:38 -06:00
James R
1b4bdf247c Fix Battle Overtime resync under certain conditions
Resync can be triggered when server/clients differ in the
number of Overtime laser objects spawned. For example,
when one of the clients is in splitscreen.

- MT_OVERTIME_PARTICLE had a spawnstate of S_NULL
- P_SetupStateAnimation is always called on spawn,
  regardless of if the spawnstate is S_NULL
- S_NULL inexplicably has FF_RANDOMANIM in its frame flags
  - This is NOT intentional and the likely source of the
    error is SOC/Lua
- Setting MT_OVERTIME_PARTICLE's spawnstate to S_INVISIBLE
  solves the problem
2024-10-04 14:57:29 -07:00
Antonio Martinez
d4c0603808 Wall transfer buffs 2024-09-15 21:05:30 -07:00
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
Sally Coolatta
d33b123e32 Implement reticule gfx, fix FOFs/walls/scale 2024-08-28 01:26:54 -04:00
Sally Coolatta
03874c3374 New Ballhog design
Taking the old charge idea, but instead of missiles, it's bananas that explode on the floor and can only be lobbed forward. Charging creates more projectiles in a circle pattern around it.
2024-08-28 01:26:53 -04:00
Antonio Martinez
57c4fccd03 gameplay prototyping lightning round 2024-08-27 19:42:56 -07:00
Antonio Martinez
4d202fbd67 WIP: Overdrive VFX refactor 2024-07-23 17:00:17 -07:00
Antonio Martinez
81e9441218 WIP: Overdrive polish 2 2024-07-22 21:51:33 -07:00
Antonio Martinez
2b61497536 WIP - Overdrive polish 2024-07-22 20:35:28 -07:00
Antonio Martinez
199a92ebb2 WIP: Overdrive 2024-07-22 02:14:11 -07: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