Commit graph

418 commits

Author SHA1 Message Date
Eidolon
7062fe394c Revert "Most Pipe Towers stuff, I'm tired"
This reverts commit db5d9053f2.
2025-01-18 13:55:53 -06:00
Eidolon
70df636bb6 Revert "Add Evertone to credits and adjust some objs"
This reverts commit b91854fa25.
2025-01-18 13:54:32 -06:00
Eidolon
5cc68e23d5 Revert "Trampolines!"
This reverts commit ae0886e279.
2025-01-18 13:54:31 -06:00
Radicalicious
b22c89ed22 Fix freeslots + add DeltaSanic to the credits 2025-01-17 20:32:00 -06:00
Radicalicious
171720ba35 add jump to credits (almost forgor) 2024-12-25 19:47:52 -06:00
Radicalicious
41a8bb2d24 Silver Shiver trees 2024-12-21 22:23:35 -06:00
Radicalicious
ae0886e279 Trampolines! 2024-12-21 19:38:40 -06:00
Radicalicious
b91854fa25 Add Evertone to credits and adjust some objs 2024-12-20 14:52:28 -06:00
Radicalicious
db5d9053f2 Most Pipe Towers stuff, I'm tired
Added Linedef type 430: Bounce Player, bouncy FOFs suck ass
Revamped a few existing PTZ assets
Added most new PTZ decorations, only missing shield mushrooms and trampolines (but I'll probably replace the latter with springs idk)
also Dave goes by Skydusk now
2024-12-19 21:49:52 -06:00
Radicalicious
5205d64f4a Update f_finale.c 2024-12-18 17:10:22 -06:00
Lactozilla
5b2f3df8a6 Merge branch 'public_next' into 2214 2024-12-18 19:00:21 -03:00
Radicalicious
588aa1db2d Update credits + add special stage clear themes 2024-12-16 21:18:54 -06:00
Lactozilla
5fd606ead3 Fix #1324 2024-12-13 15:18:27 -03:00
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03:00
pastel
8d49d5612a update my username 2024-09-12 18:03:32 +00:00
sphere
cd5a6ddeb4 Revert "Merge branch 'quick-intro' into 'next'"
This reverts merge request !2132
2024-06-25 12:17:40 +00:00
sphere
86d6919606 Merge branch 'quick-intro' into 'next'
Streamline start-up & STJr intro

See merge request STJr/SRB2!2132
2024-06-25 11:47:30 +00:00
Lactozilla
4502e67f0f Ignore flats when loading patches 2024-05-20 02:48:38 -03:00
sphere
fcd4c8334c Merge branch 'playersetup-and-continue-lua' into 'next'
Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu

See merge request STJr/SRB2!2227
2024-03-13 11:11:36 +00:00
spherallic
373e23dd90 Merge branch 'next' into quick-intro 2024-03-12 17:19:36 +01:00
Logan Aerl Arias
084f7bc4f7 Merge branch SRB2:next into playersetup-and-continue-lua 2024-03-04 17:21:26 +00:00
Logan Aerl Arias
5dd82cb7db Merge branch 'next' into more-sprite2 2024-03-03 11:16:35 -05:00
Alam Ed Arias
a0c27b22c3 Merge branch 'next' into stringop 2024-02-28 13:14:11 -05:00
spherallic
7f51bb3001 Fix build errors & fix F_DrawContinueCharacter somehow becoming unused 2024-02-27 14:22:57 +01:00
spherallic
9fb4b4cfbb Merge branch 'next' into playersetup-and-continue-lua 2024-02-27 12:31:12 +01:00
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01:00
sphere
f804ae42c1 Merge branch 'fix-credit-text-disappear' into 'next'
Fix credit sequence not compensating for non-green resolutions

Closes #1184

See merge request STJr/SRB2!2320
2024-02-24 00:28:28 +00:00
Alam Ed Arias
53d74e7f89 Clean up stringop-overflow=4 warnings 2024-02-20 13:17:50 -05:00
spherallic
3165f8b792 Merge branch 'next' into quick-intro 2024-02-20 14:12:19 +01:00
Arthur
a9b003d35c If somebody's gonna watch the intro 50+ times, it's gonna be me. :) 2024-02-19 16:59:20 -05:00
Logan Aerl Arias
a7d1d53778 Merge branch 'next' into playersetup-and-continue-lua 2024-02-17 22:17:50 -05:00
Hanicef
e74a819b68 Fix overshoot on credit text rendering 2024-02-15 23:05:03 +01:00
Hanicef
71ce173a0d Fix credit sequence not compensating for non-green resolutions 2024-02-15 22:03:28 +01:00
Lactozilla
7fbd8f7025 Merge branch 'next' into more-sprite2 2024-01-02 22:09:17 -03:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
56325399cc Merge branch SRB2:next into playersetup-and-continue-lua 2023-12-31 17:10:47 +00:00
Lactozilla
70e9e2bdb0 Merge branch 'next' into more-sprite2 2023-12-27 23:48:20 -03:00
Gustaf Alhäll
ddba6e80f7
Handle player state is P_MobjSetState 2023-12-23 13:45:16 +01:00
Lach
e412230ba9 Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu 2023-11-29 19:27:52 +11:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
5f5f8053fe Update sprite2 serialize
Increase demo version
Fix code not using P_GetSkinSpritedef
Fix code not using correct data type for player sprite
2023-11-13 11:46:55 -03:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next'
Re-delete netcode

See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Zwip-Zwap Zapony
3faa29ded9 Fix the Record Attack background jumping 2023-09-01 22:36:15 +02:00
spherallic
68ad3a1c62 STJr intro tweaks:
- Disable initial fade from startup screen
- Add half-second pauses at the start and end
2023-09-01 02:53:08 +02:00
spherallic
25c220d363 Some credits updates 2023-08-31 16:25:14 +02:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
LJ Sonic
0b17e3c418 Move netcode files to a new folder 2023-07-27 15:38:42 +02:00
Sally Coolatta
77576c3c5d Allow Record Attack in modified games
Replays now store & validate the add-on list before loading them. Custom characters can now be allowed in Record Attack.
2023-07-25 08:45:42 -04:00