Commit graph

1285 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
Alam Ed Arias
1c2c4d43a6 Merge branch 'public_next' into 2214 2025-01-11 08:24:51 -05:00
Gustaf Alhäll
be7c2d9dd3 Reset target focus in P_LoadLevel instead 2024-12-29 12:57:42 +01:00
Lactozilla
88c39ae033 Merge branch 'restrict-script-exec' into '2214'
Restrict console script execution the same way Lua does

See merge request STJr/SRB2Internal!657
2024-12-24 02:33:42 +00: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
Lactozilla
4dfbfa80d5 Restrict console script execution the same way Lua does 2024-12-18 21:07:34 -03:00
Lactozilla
5fd606ead3 Fix #1324 2024-12-13 15:18:27 -03:00
Lactozilla
98aed03f15 Fix HWR_ClearLightTables being called too late
extracolormaps own the OpenGL-specific light table data, so that has to be freed earlier.
2024-12-07 17:43:05 -03:00
LJ Sonic
baec79e01d Merge branch 'fix-bot-spawn-twod' into 'next'
Fix crash when spawning a BOT_2PAI on a 2D map

See merge request STJr/SRB2!2552
2024-12-07 14:56:25 +00:00
LJ Sonic
14199102b7 Fix AddonLoaded hook 2024-12-03 19:57:29 +01:00
LJ Sonic
d3f454e18a Merge branch 'addonloadedhook' into 'next'
Add "AddonLoaded" Lua hook

See merge request STJr/SRB2!2405
2024-12-03 16:48:16 +00:00
Gustaf Alhäll
e7e7a5c472 Fix crash when spawning a BOT_2PAI on a 2D map 2024-12-01 16:19:13 +01:00
spherallic
b796a2cc32 Disable UDMF console notice 2024-11-12 00:51:01 -03:00
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03:00
Skydusk
675667cb83 Merge branch SRB2:next into addonloadedhook 2024-07-05 10:24:19 +00:00
spherallic
e7dc0506d5 Fix tedious mistakes, comment out unused functions 2024-06-12 15:38:52 +02:00
spherallic
28dfe91b4f Per-wall lighting 2024-06-12 14:25:45 +02:00
sphere
3d4ab0279f Merge branch 'xgl2' into 'next'
Implement support for ZDoom GL2 nodes

See merge request STJr/SRB2!2474
2024-06-07 13:28:17 +00:00
sphere
4e9e321e51 Merge branch 'fix-1153' into 'next'
Fix #1153 and #1198

Closes #1198 and #1153

See merge request STJr/SRB2!2476
2024-06-06 22:45:44 +00:00
Lactozilla
85376ebe25 Fix #1153 2024-06-05 18:18:02 -03:00
Lactozilla
b480f78c96 Implement support for ZDoom GL2 nodes 2024-06-04 18:35:37 -03:00
Skydusk
855a4011dc Merge branch SRB2:next into addonloadedhook 2024-06-04 06:15:25 +00:00
Lactozilla
37270c871e Raise TEXTMAP parser limits 2024-06-04 02:08:25 -03:00
sphere
57e17184d1 Merge branch 'lessthan3emeraldshards' into 'next'
Allow less than 3 emerald shards instead of crashing

See merge request STJr/SRB2!2433
2024-06-03 13:24:58 +00:00
Lactozilla
3fb5907eff Add slope data to lines 2024-05-20 20:10:49 -03:00
spherallic
efced4e763 Allow less than 3 emerald shards instead of crashing 2024-05-03 15:54:36 +02:00
Ace Lite
4147569e10 Just moved Lua_HookVoid really to the end of the function. 2024-03-30 19:06:52 +01:00
Ace Lite
0a1662a893 Initial Commit - Hook addon load 2024-03-30 12:41:44 +01:00
sphere
4018a7fa0f Merge branch 'udmf-nophysicsequation' into 'next'
Add sector flags to disable equation slope physics

See merge request STJr/SRB2!2028
2024-03-13 17:38:45 +00:00
sphere
70626a683f Add sector flags to disable equation slope physics 2024-03-13 17:38:45 +00:00
spherallic
0f9ed1b822 Write colormap alpha to textmap in old range, for now 2024-03-13 14:57:37 +01:00
sphere
261e2d4347 bruh
# Conflicts:
#   src/doomstat.h
2024-03-04 14:23:45 +00:00
spherallic
6768bc7178 Merge branch 'next' into maretimers 2024-03-04 15:17:04 +01:00
Logan Aerl Arias
7fbdd02087 Merge branch 'next' into texture-scaling-fixes 2024-03-03 12:21:20 -05:00
sphere
6d02f1823e Merge branch 'issue1199' into 'next'
Bring back WRITETHINGS, with custom filename and UDMF support!

See merge request STJr/SRB2!2339
2024-02-25 23:36:20 +00:00
Lactozilla
2d3dd624f5 Merge branch 'next' into texture-scaling-fixes 2024-02-24 14:22:41 -03:00
Alam Ed Arias
8c7fe2ae95 Make tokenizer keep a copy of string in normal memory 2024-02-21 21:41:16 -05:00
Arthur
73d354b956 Bring back WRITETHINGS, with custom filename and UDMF support! 2024-02-18 11:29:00 -05:00
Lactozilla
6e109be076 Fix #1193 2024-02-17 04:00:27 -03:00
Lactozilla
98ba396dbc Fix issues related to texture scaling 2024-02-16 17:28:55 -03:00
Logan Aerl Arias
bf4efe968f Merge branch 'patch-refactor' into 'next'
Patch and texture refactor

See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
sphere
41613d89a1 Merge branch 'blockmap-links' into 'next'
Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592)

Closes #592

See merge request STJr/SRB2!2267
2024-02-08 23:16:59 +00:00
spherallic
8f2f70aeec Merge branch 'next' into maretimers 2024-02-04 22:39:25 +01:00
sphere
fd92193f7e Merge branch 'fix-slope-plane-distortion' into 'next'
Fix equation plane distortion

See merge request STJr/SRB2!2283
2024-02-04 21:33:17 +00:00
Sally Coolatta
c6a68f69ce Update unlockables before level load executors
Another issue that seems related to #1122
2024-02-04 01:22:11 -05:00
Lactozilla
6180ddde32 Fix slope plane distortion 2024-01-29 22:08:22 -03:00
Sally Coolatta
1e04896d3f Update & save unlockables when visiting a new map
Resolves #1122
2024-01-26 15:37:38 -05:00
Lactozilla
756e9d0d48 Link objects into multiple blockmap sectors
Ported from ZDoom
2024-01-17 19:10:19 -03:00
Logan Aerl Arias
a3b79056e9 Merge branch 'translations' into 'next'
ZDoom translations

See merge request STJr/SRB2!2190
2024-01-17 03:24:54 +00:00
Lactozilla
72b63a1305 Merge branch 'next' into patch-refactor 2024-01-14 22:16:32 -03:00