James R
acbb4cf912
Revert change to gamemap default value
...
- Some code assumes mapheaderinfo[gamemap-1] is valid
before gamemap is set
blame 5d0c062785
2023-12-10 22:02:32 -08:00
Oni
a07b54bc5c
Merge branch 'fix-music-reset' into 'master'
...
Fix Sealed Star / Tutorial music overriding other levels
Closes #791
See merge request KartKrew/Kart!1683
2023-12-09 02:40:19 +00:00
Oni
df57953025
Merge branch 'hardcode-rocks' into 'master'
...
Hardcode Angel Island and Endless Mine
See merge request KartKrew/Kart!1680
2023-12-09 01:55:46 +00:00
James R
b68947e636
Hardcode Endless Mine faucet / rain
...
- Note: rain does not use the weather system
2023-12-08 17:42:17 -08:00
James R
69541b9422
Hardcode bustable rocks -- Angel Island + Endless Mine
2023-12-08 17:42:17 -08:00
James R
441d526a15
Hardcode Angel Island scenery objects
2023-12-08 17:42:17 -08:00
James R.
5233217b86
Merge branch 'hardcode-balloons' into 'master'
...
Hardcode Carnival Night balloon edits (also seen in Joypolis)
See merge request KartKrew/Kart!1682
2023-12-09 01:40:14 +00:00
James R
51d9e4bf4b
P_Ticker: fix typo playing level music
2023-12-08 17:32:29 -08:00
James R
50f8db9f4d
Balloon: bob at random phase
2023-12-08 03:57:51 -08:00
James R
dd22ef5c88
Balloon: state edits
2023-12-08 03:57:46 -08:00
James R
581df0848d
Balloon, Bumper: increase shadow size
2023-12-08 03:54:51 -08:00
Oni
49b09a3cf5
Merge branch 'hardcode-lost-colony' into 'master'
...
Hardcode Lost Colony Fuel Canisters
See merge request KartKrew/Kart!1681
2023-12-08 04:45:59 +00:00
Oni
6378c9d544
Merge branch 'no-position-no-music-reset' into 'master'
...
Do not reset music in Sealed Stars and Tutorials
See merge request KartKrew/Kart!1676
2023-12-08 04:37:17 +00:00
Oni
20f2f6d515
Merge branch 'gametype-vote' into 'master'
...
Pause menu: changing gametype goes to vote screen
See merge request KartKrew/Kart!1679
2023-12-08 04:36:51 +00:00
Oni
14b037cde4
Merge branch 'fix-music-credit-too-long' into 'master'
...
S_ShowMusicCredit: subtract indentation amount from available screen space
Closes #775
See merge request KartKrew/Kart!1675
2023-12-08 04:36:33 +00:00
Oni
e77a52e9fa
Merge branch 'sealed-vanish' into 'master'
...
Winning player vanishes when crossing finish line in Sealed Stars
See merge request KartKrew/Kart!1677
2023-12-08 04:36:17 +00:00
Oni
44701386ec
Merge branch 'fix-shield-noclip' into 'master'
...
Lightning/Bubble/Flame Shield: add MF_NOCLIPHEIGHT
Closes #777
See merge request KartKrew/Kart!1674
2023-12-08 04:36:03 +00:00
James R.
eca0310828
Merge branch 'fix-super-flicky-targeting' into 'master'
...
Do not let Super Flicky target spectators
Closes #785
See merge request KartKrew/Kart!1672
2023-12-08 03:28:06 +00:00
James R.
3c9f4fe3b5
Merge branch 'fix-ufo-desync' into 'master'
...
Fix Battle UFO desync if midgame joins + UFO bobbing speed fix
Closes #783
See merge request KartKrew/Kart!1671
2023-12-08 03:27:42 +00:00
James R
5cba9d63b3
Hardcode Lost Colony Fuel Canisters
2023-12-07 19:19:02 -08:00
James R
f6ce183cee
Add Lost Colony Fuel Canister states
2023-12-07 19:18:33 -08:00
James R
df023246a5
Broly: separate explosion behavior from main class
2023-12-07 19:15:22 -08:00
James R
b5062e8627
Broly: move Broly class into srb2::objects namespace
2023-12-07 19:14:26 -08:00
James R
11555a2a3c
Add objects/objects.hpp, common header for object classes
2023-12-07 16:06:39 -08:00
Eidolon
4627e9b17b
Merge branch 'fix-zero-lump-sfx' into 'master'
...
Fix zero lump sfx
Closes #789
See merge request KartKrew/Kart!1678
2023-12-07 23:58:28 +00:00
James R
a96a64dff6
Broly: scale hitbox
2023-12-07 15:42:58 -08:00
James R
c5f421831f
Broly: customize scale start/end
2023-12-07 15:42:14 -08:00
James R
dc20fca17d
Broly: convert to C++
2023-12-07 14:35:47 -08:00
Oni
940ce281ae
Merge branch 'fix-hazard-scale-comparisons' into 'master'
...
Don't do scale-to-scale collision checks vs static hazards (resolves #491 , #781 )
Closes #781 and #491
See merge request KartKrew/Kart!1665
2023-12-07 05:22:12 +00:00
Oni
6639db90f3
Merge branch 'trick-prisons' into 'master'
...
Trick prisons
Closes #784
See merge request KartKrew/Kart!1673
2023-12-07 05:21:57 +00:00
James R
4931f32bb8
SpawnerList::random_id: avoid division by zero in PRNG function
2023-12-06 04:06:00 -08:00
James R
b6c7a42a97
Pause menu: changing gametype goes to vote screen
...
- If you change it during the vote screen, voting
restarts.
2023-12-06 00:00:54 -08:00
Eidolon
c5db728606
Immediately load 0-length sfx lumps as nullopt
2023-12-05 19:19:01 -06:00
Eidolon
98ba6c0590
Fix behavior of SpanStream/VecStream seek-from-end
2023-12-05 19:18:42 -06:00
James R
8546643b0c
level_nosync only temporarily resists batch operations
...
It's supposed to resist Music_StopAll so it doesn't get
reset when the level changes. But only do this for one
turn, so level music does not have the potential to leak
into other contexts.
2023-12-05 04:18:27 -08:00
James R
806067f48f
Add Music_BatchExempt, temporarily exemplify a tune from batch operations
2023-12-05 04:15:21 -08:00
James R
4746f877c3
Tricking players tumble other players, in all gametypes
2023-12-04 20:57:11 -08:00
James R
d97fece311
S_ShowMusicCredit: use at most 3/4 screen width
2023-12-04 20:40:18 -08:00
James R
e51fa390c1
Obj_BeginEmeraldOrbit: set emerald punt_ref to orbit target
2023-12-04 20:26:17 -08:00
James R
2277b2017e
K_UpdateTripwire: set Tripwire Blaster punt_ref to player
2023-12-04 20:25:47 -08:00
James R
d80689f0d1
K_HandleFollower: set follower punt_ref to player
2023-12-04 20:25:30 -08:00
James R
7aa5b47851
P_RunOverlays: copy punted state from target
2023-12-04 20:24:25 -08:00
James R
1a78e55f4c
P_DoPlayerExit: abuse K_MakeObjectReappear to vanish player if they win a Sealed Star
2023-12-04 20:22:41 -08:00
James R
be8d8178bb
Add level_nosync tune, played if GTR_NOPOSITION
...
- Does not reset if level music does not change between
levels
2023-12-04 20:19:55 -08:00
James R
95a0fcabd5
Music_Init: refactor some code for less duplication
2023-12-04 20:18:14 -08:00
James R
97a66a1856
srb2::music::TuneManager::insert: add optional field, to duplicate an existing tune's configuration
2023-12-04 20:17:17 -08:00
James R
f7eddffdb4
Give GTR_NOPOSITION to GT_SPECIAL
2023-12-04 20:14:00 -08:00
James R
e1f2ed11c7
S_ShowMusicCredit: subtract indentation amount from available screen space
2023-12-03 17:06:01 -08:00
James R
eea1d76871
Lightning/Bubble/Flame Shield: add MF_NOCLIPHEIGHT
2023-12-03 16:45:17 -08:00
James R
7d998d0d91
Let player punt if tricking
2023-12-03 16:28:56 -08:00
