Commit graph

220 commits

Author SHA1 Message Date
Alam Ed Arias
4378b29627 Merge branch 'public_next' into 2214 2025-01-16 09:19:30 -05:00
Lugent
3d6d53a926 Oops, forgot the commit. 2025-01-12 00:54:27 -04:00
Radicalicious
588aa1db2d Update credits + add special stage clear themes 2024-12-16 21:18:54 -06:00
Eidolon
aabf8ae54e Merge branch 'next' of git.do.srb2.org:STJr/SRB2 into 2214 2024-10-16 17:43:38 -05:00
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03:00
spherallic
a9d7da6003 Restore super transformation conditions 2024-08-13 14:43:24 +02:00
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01:00
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
Logan Aerl Arias
82f37ccadd Merge branch SRB2:next into emblemexitfix 2023-12-31 17:03:43 +00:00
Lactozilla
0498c16cb6 Merge branch 'next' into raise-skin-limit 2023-11-26 23:08:13 -03:00
SMS Alfredo
e50993861e Dedicated Shield / Super Transformation Button 2023-11-26 20:38:49 +00:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -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
SMS Alfredo
7bcad024f8 Only Award Bonuses / RA Emblems from Physically Beating a Level 2023-09-19 21:48:01 -05: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
sphere
32a40e3dbe Merge branch 'alphabetsoup' into 'next'
Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen

See merge request STJr/SRB2!1642
2023-08-20 17:29:03 +00:00
katsy
1a0d9eab79 Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen 2023-08-20 17:29:03 +00:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
Sally Coolatta
33c7a930a7 Total score starts at record score
Means there's actually feedback for how much score you got in the current level.
2023-08-02 11:31:05 -04:00
LJ Sonic
0b17e3c418 Move netcode files to a new folder 2023-07-27 15:38:42 +02:00
Sally Coolatta
91e915b963 Fix recordscore not including intermission bonuses 2023-07-26 13:44:43 -04:00
Sally Coolatta
49fa46d80e Online emblems
Currently, emblems share with everyone. Will add an option to toggle this.
2023-06-02 16:06:43 -04:00
MascaraSnake
e4933b3e94 Merge branch 'allow-modified-saving' into 'next'
[SUGOI] Allow saving in modified games.

See merge request STJr/SRB2!1749
2023-05-24 05:04:26 +00:00
spherallic
c2c430853c If Lua disabled intermission emeralds, skip sounds 2023-04-19 20:17:50 +02:00
spherallic
6ff37b47d9 Skip emerald bounce logic in Y_Ticker on dedicated 2023-04-19 12:13:29 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
spherallic
91ef59f76b Fix tiny regression with special stage tally 2023-03-31 13:36:54 +02:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging"
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
717e0d5a17 Move netcode files to a new folder 2022-12-31 14:10:19 +01:00
Sally Coolatta
1b43cdddd5 Allow saving in modified games. 2022-11-16 11:14:29 -05:00
Alam Arias
1b5dd687d2 Cleanup whitespace changes from master branch 2022-11-11 20:31:41 -05:00
Eidolon
82310e0ae2 Add Lua HUD drawlists
Buffers draw calls between tics to ensure hooks
run at the originally intended rate.
2022-04-30 01:55:10 -05:00
Eidolon
8597f3876c Move intermission emerald bounce to ticker 2022-04-26 20:56:35 -05:00
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
spherallic
6f5b34f7c1 Don't award end-of-level bonuses to bots. 2021-12-09 12:45:18 +01:00
sphere
f191525fbb Merge branch 'interfree' into 'next'
Don't cache the default background patches if we have an interscreen (resolves #546)

Closes #546

See merge request STJr/SRB2!1619
2021-11-25 09:19:46 +00:00
katsy
3d2f9e6150 don't create the default patches if we have an interscreen 2021-09-13 17:20:20 -05:00
James R
c33d8b3b5d Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor 2021-09-12 18:37:47 -07:00
Tatsuru
eec765749b Merge branch 'drawcroppedpatch-improvements' into 'next'
V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request STJr/SRB2!1316
2021-09-10 16:14:38 +00:00
Jaime Ita Passos
1a84f1bcba Minor changes and fixes 2021-08-10 15:17:22 -03:00
Jaime Ita Passos
2aa9bb59ef Memory management fixes
Date:      Mon Aug 9 15:57:07 2021 -0300
2021-08-09 15:57:35 -03:00
James R
b4fa98d2fb Refactor hudlib hooks to hooklib
HUD hooks now meet the standard of hooklib. HUD registry
magic numbers are gone.

HUD hooks may also be added using addHook.

    addHook('HUD', fn[, type])

hud.add still exists, but the intention is to remove it
eventually.
2021-07-07 00:23:51 -07:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
sphere
5a91f3326a Merge branch 'disable-int-emeralds' into 'next'
Some more intermission features for Lua

See merge request STJr/SRB2!1329
2021-06-01 15:38:00 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next'
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
2021-05-28 21:51:00 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Tatsuru
376d6cd6a2 Don't try to free patches in dedicated 2021-04-25 14:26:43 -03:00
Zwip-Zwap Zapony
acff5c1ada Merge branch 'next' into drawcroppedpatch-improvements 2021-04-25 10:15:16 +02:00
GoldenTails
43c21edcbd Send IntermissionThinker and intermission hud hooks stagefailed. 2021-04-20 23:52:25 -05:00