Commit graph

27180 commits

Author SHA1 Message Date
Sally Coolatta
f224cf3dc7 SRB2 -> DRRR copyright in hud folder 2024-04-05 10:02:00 -04:00
Sally Coolatta
8f88c29387 SRB2 -> DRRR copyright in hardware folder 2024-04-05 10:00:33 -04:00
Sally Coolatta
a7a0c31d8c SRB2 -> DRRR copyright in dummy folder 2024-04-05 09:49:36 -04:00
Sally Coolatta
672765f05c SRB2 -> DRRR copyright in core folder 2024-04-05 09:48:01 -04:00
Sally Coolatta
2926a547d8 SRB2 -> DRRR copyright in audio folder 2024-04-05 09:46:07 -04: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
Oni
e19ed5bc29 Merge branch 'statistics-101percent' into 'master'
Statistics 101%

See merge request KartKrew/Kart!2231
2024-04-05 02:27:48 +00:00
Gunla
a9b5fb5861 Merge branch 'adventure-air-booster-model' into 'master'
Adjust Adventure Air Boosters for 3D models

See merge request KartKrew/Kart!2227
2024-04-05 01:19:53 +00:00
Gunla
75e4c63e04 Merge branch 'music-dim-acs' into 'master'
ACS: add Music_Dim function, API to g_musicfade

See merge request KartKrew/Kart!2229
2024-04-05 01:14:44 +00:00
Gunla
691e2535ee Merge branch 'acs-side-offset-interp' into 'master'
ACS: interpolate changes to sidedef offsets

See merge request KartKrew/Kart!2228
2024-04-05 01:02:56 +00:00
Gunla
2e9b280000 Merge branch 'renderview-2' into 'master'
renderview: add Force option, renders while paused

See merge request KartKrew/Kart!2226
2024-04-05 00:57:39 +00:00
Gunla
fb75485c9c Merge branch 'dialogue-optimization' into 'master'
Dialogue: cache common patches instead of doing name lookup every frame

See merge request KartKrew/Kart!2221
2024-04-05 00:45:34 +00:00
toaster
e3a22019ab Update Statistics menu to use the same font as the micro version of the Timestamp 2024-04-05 00:46:19 +01:00
toaster
0427f7f3ff Don't show uncollected Platinum medals
You'll see the Platinum time to reach as a guiding star when Time Attacking the specific course, but with no accompanying empty medal icon.

Also
- fixes an x coordinate issue for higher medal quantity on the version that draws under the timestamp
- cache SECRET_ENCORE and SECRET_SPBATTACK availability in the statistics drawer too
2024-04-05 00:45:31 +01:00
toaster
b35a05ad61 M_CountMedals: Don't count Platinums towards the overall counter, they're explicitly 101%
(This func isn't used by Challenges - M_GotEnoughMedals is, and that doesn't care about AUTOMEDAL_PLATINUM)
2024-04-05 00:38:58 +01:00
James R
78da8bb816 ACS: add Music_Dim function, API to g_musicfade 2024-04-04 05:20:19 -07:00
James R
c9b57548e9 ACS: interpolate changes to sidedef offsets 2024-04-04 03:09:29 -07:00
Lach
d2a53a0e64 Adjust Adventure Air Boosters for 3D models 2024-04-04 20:41:21 +11:00
James R.
de651b6d6c Merge branch 'with-you-in-the-dark' into 'master'
Update confirmation sound for using the tasteless taunt cheat

See merge request KartKrew/Kart!2223
2024-04-04 07:14:58 +00:00
James R.
e44661817b Merge branch 'numlaps-msg-begone' into 'master'
Numlaps Message Begone

See merge request KartKrew/Kart!2222
2024-04-04 03:50:44 +00:00
James R.
dda817d429 Merge branch 'lua-action-profile' into 'master'
lua_profile: measure lua actions

See merge request KartKrew/Kart!2219
2024-04-04 03:50:26 +00:00
Oni
2a2a03eed9 Merge branch 'pull-up' into 'master'
Hardcode SA2 Pulley (ipullup.lua)

See merge request KartKrew/Kart!2220
2024-04-04 02:01:32 +00:00
James R
d26755ab3e renderview: add Force option, renders while paused
Useful for debugging
2024-04-03 17:57:42 -07:00
Sal
224d66062e Merge branch 'spb-shrine-swapsies' into 'master'
Fix copypaste error for Mystic Melody savedata interaction (resolves #1242)

Closes #1242

See merge request KartKrew/Kart!2224
2024-04-03 21:48:19 +00:00
toaster
6c0cc158d1 Fix copypaste error for Mystic Melody savedata interaction (resolves #1242)
Was causing all Mystic Melody shrine interactions to turn into SPB Attack emblems on game restart
2024-04-03 22:41:26 +01:00
toaster
bc1be64e84 Update confirmation sound for using the tasteless taunt cheat 2024-04-03 21:21:23 +01:00
toaster
2c5f0de69c The author of this commit hates the print in NumLaps_OnChange so much
- Don't print outside of Playing()
    - Fixes the one cvar set message when playing back any Staff Replay
- Have a bespoke map default print for outside-of-level changes
2024-04-03 21:01:08 +01:00
toaster
b8c67dcc9e Copyright update: Recieved notice of legal name change
(which is formal speak for I got back in contact with an old friend :D )
2024-04-03 20:44:19 +01:00
James R
3931c00cd7 Dialogue: cache common patches instead of doing name lookup every frame 2024-04-03 05:27:17 -07: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
4297179e12 lua_profile: measure lua actions 2024-04-03 01:53:10 -07:00
Oni
79a4e05a1c Merge branch 'look-up' into 'master'
Hold up/down for 2 seconds while not moving to pan the camera vertically

Closes #1223

See merge request KartKrew/Kart!2218
2024-04-03 03:30:59 +00:00
James R
192c770c16 Hold up/down for 2 seconds while not moving to pan the camera vertically 2024-04-02 19:23:53 -07:00
Oni
5dbee14281 Merge branch 'audience-polish' into 'master'
Adjust Audience bobbing, give them shadow

Closes #1194

See merge request KartKrew/Kart!2217
2024-04-03 01:43:43 +00:00
Oni
7c69767a6a Merge branch 'battle-half-screen-shake' into 'master'
Battle: half screen shake radius, strength and max strength

See merge request KartKrew/Kart!2216
2024-04-03 01:23:25 +00:00
James R.
58a2bba3ad Merge branch 'lua-case-take-2' into 'master'
Lowercase player_t from Lua, take 2

See merge request KartKrew/Kart!2180
2024-04-03 01:13:34 +00:00
James R.
607611daaf Merge branch 'goner-free' into 'master'
V_ScaledWordWrap allocates Zone memory, so be sure to free Goner's usage

See merge request KartKrew/Kart!2198
2024-04-03 01:09:39 +00:00
Oni
4d0b02413d Merge branch 'gl-no-resend-load' into 'master'
Don't draw OpenGL loading screen when resynching the gamestate

See merge request KartKrew/Kart!2209
2024-04-03 01:06:56 +00:00
James R
c591087ac4 Audience: shadow, auomatically becomes white on fullbright frames 2024-04-02 18:06:26 -07:00
Oni
1f97d70ff8 Merge branch 'tasteless-audio' into 'master'
Tasteless Taunts

See merge request KartKrew/Kart!2215
2024-04-03 00:48:21 +00:00
James R
e41b371096 Audience: double scale bobbing height 2024-04-02 17:44:36 -07:00
toaster
fa77631c25 Alternate tooltip for Follower Horn option under tasteless conditions 2024-04-03 01:30:40 +01:00
James R
4ce2dbf1bc Battle: half screen shake radius, strength and max strength 2024-04-02 17:28:30 -07:00
toaster
44951e2f86 Adjust the menu descriptions for Character Voices and Follower Horns 2024-04-03 01:19:23 +01:00
toaster
dea698a276 Tasteless Taunts
Uninhibited voices/horns (see the "meme" setting in v1).
Removes the SECRET_MEMETAUNTS unlock, which didn't fit the general level of cohesion main game content should have.
2024-04-02 23:26:57 +01:00
toaster
224deed01d More copyright updates
- TehRealSalt and Lat` are currently preoccupied, so handle their credits
- Correct some accidential copypastes of existing boilerplate into new files
- Add a handful more of mine
- Consistency for Kaito Sinclaire's online handle
2024-04-02 22:14:49 +01:00
Oni
eb6d48aee4 Merge branch 'ice-cube-tooltip' into 'master'
Ice cube button prompt + fixes

See merge request KartKrew/Kart!2212
2024-04-02 18:03:19 +00:00
Oni
c3239b3746 Merge branch 'top-thrown-scale' into 'master'
Preserve scale of Garden Top when thrown

See merge request KartKrew/Kart!2213
2024-04-02 18:03:10 +00:00
Oni
437d5283e0 Merge branch 'no-frameskip-replays' into 'master'
Do not pause 3d rendering ever in replays

Closes #1226

See merge request KartKrew/Kart!2210
2024-04-02 18:03:06 +00:00
toaster
a6a6515721 The final menu layout for Time attack in v1 and SRB2 2.2 was also largely me, and I forgot how little this code has been altered at its core 2024-04-02 18:15:09 +01:00