MascaraSnake
53f8a1bfb2
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-09-26 07:01:23 +02:00
MascaraSnake
98f99e52f8
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-26 06:56:12 +02:00
MascaraSnake
db0e6b23d7
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-26 06:53:20 +02:00
MascaraSnake
bfc13c2529
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
2021-09-26 06:50:34 +02:00
MascaraSnake
f26f41e03a
Fix thinker functions that still use tag instead of args[0] for FOFs
2021-09-26 06:48:26 +02:00
SteelT
0f4074f22d
Remove unused I_GetMouseGrab function
2021-09-23 13:46:26 -04:00
MascaraSnake
3cc66ba9cb
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2021-09-23 11:44:17 +02:00
MascaraSnake
25bc48b8dd
Merge branch 'udmf-lighting' into udmf-linedef-executors
2021-09-23 11:31:01 +02:00
MascaraSnake
f22e0a41da
Merge branch 'udmf-polyobjects' into udmf-lighting
2021-09-23 11:22:23 +02:00
MascaraSnake
05b93b676e
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-23 11:02:23 +02:00
MascaraSnake
7f6933317d
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-23 10:41:23 +02:00
MascaraSnake
5df1dd324d
Fix oversight in T_MoveFloor
2021-09-23 10:24:02 +02:00
MascaraSnake
280d23782c
Adapt linedef executor triggers that don't involve sector effects to UDMF
2021-09-23 10:21:53 +02:00
katsy
ed5942a0b6
fix tailsbot controls
2021-09-22 23:18:54 -05:00
katsy
791b981fd8
null gamestate during pre-intermission to prevent unwanted interaction
2021-09-22 16:22:47 -05:00
MascaraSnake
a61343bc8b
P_LinedefExecute: Use global taglists to find trigger linedefs
2021-09-22 10:38:08 +02:00
MascaraSnake
03c1c592ab
I surrender - we need more linedef args (also adapt the remaining linedef executors to UDMF)
2021-09-22 08:57:48 +02:00
MascaraSnake
8ef8279764
Adapt FOF-related linedef executors to UDMF
2021-09-22 07:32:39 +02:00
MascaraSnake
df7b22ac8a
Minor cleanup in P_ConvertBinaryMap
2021-09-21 15:34:47 +02:00
MascaraSnake
61e9adf30b
Adapt linedef type 412 to UDMF
2021-09-21 15:31:53 +02:00
MascaraSnake
132f3f21f1
Adapt linedef type 457 to UDMF
2021-09-21 15:10:50 +02:00
MascaraSnake
d8b5cb6c90
Adapt linedef type 422 to UDMF
2021-09-21 14:59:58 +02:00
MascaraSnake
be480eead0
Linedef type 464: Re-add mobjtype check that I accidentally removed
2021-09-21 12:59:20 +02:00
MascaraSnake
8b6140ddb2
Linedef type 464: Use taglist search to find egg capsule center
2021-09-21 12:55:56 +02:00
MascaraSnake
41d18bc591
Binary-to-UDMF conversion: Set up mapthing tags before global taglists are built
2021-09-21 12:55:22 +02:00
MascaraSnake
2e120953ec
Fix typo in linedef type 400 conversion
2021-09-21 11:35:04 +02:00
MascaraSnake
d47069fbb6
Adapt linedef types 409 and 410 to UDMF
2021-09-21 11:30:34 +02:00
James R
d88eb7cc14
Missed the 'i'
2021-09-21 02:17:44 -07:00
James R
143a515445
Correct Big Wave Dave/InstantSonic credits
2021-09-21 02:15:11 -07:00
MascaraSnake
cabafeef1c
Adapt linedef type 464 to UDMF
2021-09-21 10:35:01 +02:00
MascaraSnake
890934264b
Adapt linedef type 414 to UDMF
2021-09-21 10:14:55 +02:00
MascaraSnake
69e0c636a0
Adapt linedef type 459 to UDMF
2021-09-21 09:05:40 +02:00
MascaraSnake
ea1d442f31
Adapt linedef type 434 to UDMF
2021-09-21 08:34:55 +02:00
MascaraSnake
17bd20a15e
Adapt linedef type 463 to UDMF
2021-09-21 07:44:55 +02:00
MascaraSnake
b898a773ab
Adapt linedef types 425 and 442 to UDMF
2021-09-21 07:36:54 +02:00
MascaraSnake
76c6b6f24f
Forgot to adapt half of linedef type 449
2021-09-20 15:07:08 +02:00
MascaraSnake
1bbf1b2887
Adapt linedef type 438 to UDMF
2021-09-20 14:50:18 +02:00
MascaraSnake
3a73c6167c
Adapt linedef type 439 to UDMF
2021-09-20 14:42:21 +02:00
MascaraSnake
877ec96eec
Adapt a whole bunch of linedef executors to UDMF
2021-09-20 14:25:07 +02:00
MascaraSnake
00b04f6d9e
Adapt some player-related linedef executors to UDMF
2021-09-20 13:31:32 +02:00
MascaraSnake
4028d392b0
Adapt linedef types 423 and 424 to UDMF
2021-09-20 12:42:31 +02:00
MascaraSnake
d2eb4587c2
Adapt linedef type 415 to UDMF
2021-09-20 12:32:01 +02:00
MascaraSnake
1b339a9e00
Adapt linedef types 600-601 to UDMF
2021-09-20 08:36:55 +02:00
MascaraSnake
609fb91e4b
Stop elevator abuse
2021-09-20 08:18:59 +02:00
MascaraSnake
1784c7b0ef
Add linedef executor for modifying (as opposed to copying) a sector's light level
2021-09-20 07:54:10 +02:00
MascaraSnake
6871262909
Allow "fade light level" linedef executor to fade relative to current value
2021-09-19 23:12:30 +02:00
MascaraSnake
318c1b477d
Adapt lighting effects to UDMF
2021-09-19 17:07:08 +02:00
MascaraSnake
44faed6285
Make light levels in thinkers INT16
2021-09-19 16:25:27 +02:00
MascaraSnake
9180b86e9e
No more unnecessary light level twiddling
2021-09-19 16:12:06 +02:00
MascaraSnake
18c2cfcace
Clean up arguments for the lighting effect functions
2021-09-19 15:52:54 +02:00
MascaraSnake
fe708db398
Adapt setup of some lighting linedef executors to UDMF
2021-09-19 14:23:04 +02:00
MascaraSnake
68aa14f7d0
Netsync floor/ceiling lighting
2021-09-19 09:20:00 +02:00
MascaraSnake
e43831bedb
Expose floor/ceiling lighting to Lua
2021-09-19 09:06:39 +02:00
MascaraSnake
e15c160773
Implement per-sector floor/ceiling lighting
2021-09-19 08:58:21 +02:00
MascaraSnake
de82afe338
Merge branch 'udmf-scrollers' into udmf-polyobjects
2021-09-17 10:36:35 +02:00
MascaraSnake
e144f97d35
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-17 10:35:41 +02:00
MascaraSnake
a5959c0248
Merge branch 'next' into udmf-plane-linedefs
...
# Conflicts:
# src/p_inter.c
2021-09-17 10:34:07 +02:00
MascaraSnake
9d3dc98939
Fix "render insides" condition being inverted for intangible FOFs
2021-09-17 09:57:53 +02:00
katsy
3d2f9e6150
don't create the default patches if we have an interscreen
2021-09-13 17:20:20 -05:00
James R
0ac36b7ce1
Remove mixed code and declarations warning
2021-09-12 19:07:40 -07:00
James R
923e6f31aa
Fix faulty comparison
...
Logical comparisons evaluate to a boolean value...
2021-09-12 19:03:39 -07:00
James R
fec5f2778e
Fix compiler warnings
2021-09-12 19:03:39 -07:00
James R
c33d8b3b5d
Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor
2021-09-12 18:37:47 -07:00
Tatsuru
db92f31f7d
Revert "Merge branch 'draw-act-num' into 'next'"
...
This reverts merge request !1532
2021-09-12 18:41:36 -04:00
Tatsuru
30567d75df
Merge branch 'draw-act-num' into 'next'
...
Expose act number drawing functions to Lua
See merge request STJr/SRB2!1532
2021-09-12 22:15:43 +00:00
Tatsuru
252a48c2dc
Merge branch 'shorter-hidetime' into 'next'
...
Cut cv_hidetime's minimum value to 1 (resolves #586 )
Closes #586
See merge request STJr/SRB2!1544
2021-09-12 22:13:26 +00:00
Tatsuru
1875c0dc79
Merge branch 'where-the-fuck-is-my-mobj-at' into 'next'
...
Add player mobj check to P_PlayerInPain (resolves #640 )
Closes #640
See merge request STJr/SRB2!1587
2021-09-12 22:06:54 +00:00
Tatsuru
bb0a0bd4ab
Merge branch 'oneline' into 'next'
...
Add a missing scale assignment to A_Boss3ShockThink
See merge request STJr/SRB2!1588
2021-09-12 22:04:28 +00:00
SMS Alfredo
d5cdb2dc78
Add a missing scale assignment to A_Boss3ShockThink
2021-09-12 22:04:28 +00:00
Tatsuru
9187656b90
Merge branch 'shocksplit' into 'next'
...
Split up x/y/z averages in A_Boss3ShockThink (resolves #589 )
Closes #589
See merge request STJr/SRB2!1538
2021-09-12 21:49:28 +00:00
Tatsuru
cd5ba1271a
Merge branch 'youvebeenblocked' into 'next'
...
Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332 )
Closes #332
See merge request STJr/SRB2!1491
2021-09-12 21:38:40 +00:00
Tatsuru
66f054f150
Merge branch 'mapload-trigger-fix' into 'next'
...
Don't call map load trigger linedefs when joining or reloading gamestate
See merge request STJr/SRB2!1592
2021-09-12 21:08:52 +00:00
Tatsuru
df249a4a4d
Merge branch 'folder-fixes' into 'next'
...
Fix minor issues with folder addons
See merge request STJr/SRB2!1617
2021-09-12 21:08:07 +00:00
LZA
aaf4653f1e
Fix minor issues with folder addons
2021-09-12 21:08:06 +00:00
Tatsuru
96a378ef1e
Merge branch 'replay-overwrite-fix' into 'next'
...
Replay overwrite fix
See merge request STJr/SRB2!1523
2021-09-12 20:33:15 +00:00
Tatsuru
94799e2196
Merge branch 'fix-antique-ghost-netvars' into 'next'
...
Fix antique ghost netvars
See merge request STJr/SRB2!1545
2021-09-12 20:33:01 +00:00
Tatsuru
59e1706f5c
Merge branch 'png-trans-fix' into 'next'
...
Fix issue with png_get_tRNS
See merge request STJr/SRB2!1606
2021-09-12 20:30:36 +00:00
Tatsuru
7a53b242b6
Merge branch 'develop-fix' into 'next'
...
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility
Closes #663
See merge request STJr/SRB2!1607
2021-09-12 20:29:02 +00:00
Tatsuru
9016b5cf7c
Merge branch 'playercontroldirection' into 'next'
...
Remove camera dependency from P_GetPlayerControlDirection
Closes #183
See merge request STJr/SRB2!1512
2021-09-12 20:27:42 +00:00
Tatsuru
0781b91de5
Merge branch 'fix-archiving-error-msg' into 'next'
...
Fix incorrect error message during Lua archiving
See merge request STJr/SRB2!1593
2021-09-12 20:27:17 +00:00
Tatsuru
bcd7468d25
Merge branch 'lua-camera' into 'next'
...
Allow Lua write access to camera_t variables & expose the cameras globally
See merge request STJr/SRB2!1581
2021-09-12 20:20:49 +00:00
SteelT
f62064d4ba
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into next
2021-09-12 16:18:26 -04:00
Tatsuru
bff2106016
Merge branch 'even-more-slope-copying' into 'next'
...
Add flag to line slopes for even more slope copying
See merge request STJr/SRB2!1550
2021-09-12 20:16:52 +00:00
SteelT
e2ea480af9
Merge branch 'master' into next
2021-09-12 15:46:32 -04:00
SteelT
a822de5ffc
Merge branch 'fix-gme-disabled' into 'master'
...
Fix gme support being effectively disabled
See merge request STJr/SRB2!1586
2021-09-11 15:05:34 +00:00
Tatsuru
8aee7fcbce
Merge branch 'floorsprite-fix' into 'next'
...
Fix #649
Closes #649
See merge request STJr/SRB2!1604
2021-09-11 15:00:14 +00:00
Tatsuru
6ed063dcce
Merge branch 'polish-lua-inputs' into 'next'
...
Polish the Lua input library
See merge request STJr/SRB2!1598
2021-09-11 14:59:41 +00:00
Tatsuru
033c661431
Merge branch 'folder' into 'next'
...
Implement folder loading
See merge request STJr/SRB2!1568
2021-09-10 17:10:26 +00:00
Tatsuru
2eed4a9265
Merge branch 'sunbehindcloud' into 'next'
...
Refactor weather switching (fixes #541 )
Closes #541
See merge request STJr/SRB2!1498
2021-09-10 17:00:44 +00:00
katsy
50fe45efe6
Refactor weather switching ( fixes #541 )
2021-09-10 17:00:43 +00: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
Tatsuru
ce98758bd6
Merge branch 'equationslopes' into 'next'
...
Add generalized slopes in UDMF
See merge request STJr/SRB2!1530
2021-09-09 22:12:18 +00:00
SteelT
2578e01cfb
Merge branch 'writable-colormaps' into 'next'
...
Make the colormap returned by v.getColormap() writable.
See merge request STJr/SRB2!959
2021-09-05 21:07:10 +00:00
James R
1af05afb0e
Merge branch 'better-gcc-check' into 'master'
...
Makefile: Improve gcc detection
See merge request STJr/SRB2!1608
2021-09-04 00:43:16 +00:00
James R
cbc5cc3b2a
Fix GCC 11 array-bounds warning in P_SetupStateAnimation
...
Removing inline here silences the warning somehow, it
could be a GCC bug?
2021-09-03 17:18:00 -07:00
James R
c1458aa6c7
Merge branch 'master' into next
2021-09-03 17:15:53 -07:00
James R
8e0831a183
Fix unused variable warning under NOPNG
2021-09-03 17:15:36 -07:00
GoldenTails
1639676e8d
Actually free the drawnstr pointer after we're done using it.
...
It probably was like this originally because past Golden was confused about why free was throwing errors :P
2021-09-03 09:14:04 -05:00
GoldenTails
f0bee67d6e
Remove unused static-alloc drawnstr
, rename drawnstrptr
to drawnstr
.
2021-09-03 09:03:46 -05:00
GoldenTails
7e3a6bd44c
Increase Connect via IP textbox width and have shorten and truncate the text as necessary
2021-09-03 09:03:46 -05:00
namishere
39bd9c6da8
Make next compile again
2021-08-30 23:18:25 -07:00
James R
f4f7af6f6d
Add my full name
2021-08-30 18:40:36 -07:00
GoldenTails
1a8ec7975c
Makefile: Improve gcc detection
...
Wasn't working for me until I fixed it.
Turns out gcc really doesn't like giving its name out.
Most of the time it reads argv[0].
2021-08-28 15:39:34 -05:00
Shane Ellis
b73c24a0c5
Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility
2021-08-28 17:14:36 +00:00
Jaime Ita Passos
3ff8d9d3b1
Fix issue with png_get_tRNS
...
This fixes an oversight where the return value of png_get_tRNS was
being ignored.
2021-08-26 13:37:52 -03:00
Jaime Ita Passos
450955cba2
Fix floor sprite projection
2021-08-26 13:22:32 -03:00
Shane Ellis
ccc71ddafc
Merge branch 'addplayer' into 'next'
...
Multiplayer Bot Features (aka AddPlayer)
See merge request STJr/SRB2!1383
2021-08-25 21:38:37 +00:00
GoldenTails
72bf2a9897
Add angle field to linedef_t
2021-08-24 03:13:18 -05:00
SteelT
4a6acc2c8d
Fix metal recordings not being saved in srb2home
2021-08-22 16:13:40 -04:00
LJ Sonic
9b7263855e
Prevent input.setMouseGrab from interfering with window focus
2021-08-18 20:58:13 +02:00
sphere
4309b592f8
Merge branch 'shiny' into 'next'
...
Give Coins drop shadows
See merge request STJr/SRB2!1591
2021-08-17 13:09:53 +00:00
LJ Sonic
5340db5f67
Make gc_ constants uppercase
2021-08-15 16:15:28 +02:00
LJ Sonic
772695741c
Rename KeyNumToString to KeyNumToName and vice-versa
2021-08-15 15:24:23 +02:00
James R
3b6d8eca83
Merge branch 'master' into next
2021-08-14 15:34:52 -07:00
James R
824b1ab28c
Makefile: use full stem in dependency generation
...
Previously took only the filename, so the directory
component was stripped. This broke dependencies for
basically every file.
2021-08-14 15:29:21 -07:00
LJ Sonic
5bc0ce7a62
Give fields in event_t better names
2021-08-14 23:42:39 +02:00
LJ Sonic
c2907b89f7
Pass a keyevent_t userdatum to key hooks
2021-08-14 20:34:59 +02:00
LJ Sonic
5b949a6751
Expose keyevent_t to Lua
2021-08-14 20:33:42 +02:00
LJ Sonic
38e82e55fc
Add a "repeated" field to event_t
2021-08-14 20:33:20 +02:00
LJ Sonic
8adf4b672a
Put Lua input library in its own namespace
2021-08-13 22:34:36 +02:00
LJ Sonic
6403a38c72
Fix again
2021-08-10 01:48:26 +02:00
LJ Sonic
a9b35a6f7a
Fix incorrect error message during Lua archiving
2021-08-10 00:15:44 +02:00
LJ Sonic
d1e8b05749
Don't call map load trigger linedefs when joining or reloading gamestate
2021-08-08 19:43:42 +02:00
SMS Alfredo
2d218859ff
Give coins a drop shadow
2021-08-06 23:25:19 -05:00
sphere
1d92456ad5
Merge branch 'gl-texfmt-p8-ap88-a8-ai8-fix' into 'next'
...
Fix #492
Closes #492
See merge request STJr/SRB2!1431
2021-08-02 13:10:32 +00:00
sphere
ab044a270b
Merge branch 'nolua-alias' into 'next'
...
Fix console aliases bypassing CV_NOLUA
Closes #619
See merge request STJr/SRB2!1573
2021-08-02 13:09:12 +00:00
sphere
198127dd6f
Merge branch 'demos-revert-netvars' into 'next'
...
Revert netvars to user value after demo finishes playback
See merge request STJr/SRB2!1578
2021-08-02 13:08:43 +00:00
Lach
6cf4f79bab
Merge branch 'zmovement-remove-fix' into 'next'
...
Fix for #551
See merge request STJr/SRB2!1590
2021-08-02 02:01:45 +00:00
Monster Iestyn
df99cde40f
mo not mobj!
2021-07-31 22:11:44 +01:00
Monster Iestyn
7dddc631d7
P_ZMovement: add a P_MobjWasRemoved check after P_CheckPosition, so we can bail out if the mobj was removed (by Lua most likely)
2021-07-31 21:14:48 +01:00
Radicalicious
d50e3bff70
ACTUALLY fix the issue.
2021-07-29 15:55:19 +00:00
Radicalicious
58db5a6904
Fix P_PlayerInPain crash.
2021-07-28 15:42:44 +00:00
lachablock
434b119ccf
Merge remote-tracking branch 'origin/next' into playercontroldirection
2021-07-28 11:55:12 +10:00
Nev3r
6d76d05d62
Merge branch 'working-server-incompatibility-checks' into 'next'
...
Actually tell you if the server is running an incompatible version
See merge request STJr/SRB2!1509
2021-07-16 16:55:41 -04:00
SteelT
71f905f95b
Fix gme support being effectively disabled
...
I found this easier than trying to adjust the makefile, as it uses the same thing to automatically generate the various NO* compile options.
2021-07-16 15:26:09 -04:00
CobaltBW
bac4116130
Merge branch 'addplayer' of https://git.do.srb2.org/STJr/SRB2.git into addplayer-2021-7-15
2021-07-15 15:36:44 -07:00
CobaltBW
95359fef51
Amendment to G_RemovePlayer to preserve lua error handlers
2021-07-15 15:19:47 -07:00
CobaltBW
22f42efb61
Cleaned up leftover comments
2021-07-15 15:09:02 -07:00
CobaltBW
48514ee88d
Fixed G_RemovePlayer crash in players.iterate
...
This was done by storing flag-for-removal status as a boolean inside the player struct.
Bot players are instead removed at the start of G_Ticker, rather than being removed immediately by G_RemovePlayer.
2021-07-15 15:04:24 -07:00
CobaltBW
4486ff065a
All remaining player->bot checks modified to rely on BOT_ constants
2021-07-15 13:03:26 -07:00
CobaltBW
1c3a898bbb
Fixed locked characters being visible in multiplayer select screen
2021-07-15 12:53:13 -07:00
Nev3r
3a49b9519d
Remove &, since args and stringargs are arrays
2021-07-13 17:55:06 +02:00
Nev3r
22dfa05c31
Forgot the stringargs.
2021-07-13 17:44:28 +02:00
Nev3r
aed86781fc
Bugfix - Fix sporadically occurring incorrect userdata types in Lua, caused by previously loaded userdata which didn't get invalidated in previous sessions.
...
Invalidate userdata for line and mapthing args.
Invalidate userdata for slopes and their normal, origin and direction vectors.
2021-07-13 17:41:38 +02:00
Shane Ellis
33ae95bf13
G_RemovePlayer error handling
2021-07-12 23:38:52 -04:00
sphere
113cedd4b6
Merge branch 'polyobject-plane-stability' into 'next'
...
Use floating-point math for polyobject planes as well.
Closes #581
See merge request STJr/SRB2!1533
2021-07-12 12:47:35 -04:00
James R
58fa44e8dc
CMP0115
2021-07-12 03:50:44 -07:00
SteelT
0faecf0959
version.h: Update comment about contacting an MS admin
2021-07-11 20:51:06 -04:00
Monster Iestyn
c337709d10
Update f_finale.c
2021-07-11 16:32:36 -04:00
lachablock
117e3e2670
Expose P_TryCameraMove and P_TeleportCameraMove, disallow write access to camera.x and camera.y, allow write access to camera.height and camera.radius
2021-07-11 16:23:50 +10:00
lachablock
366b1f65a1
Allow Lua write access to camera_t variables & expose the cameras globally
2021-07-10 18:22:07 +10:00
James R
e30d4f954b
Revert netvars after demo finishes playback
...
(Demos do not call CL_Reset BTW.)
2021-07-08 14:37:03 -07:00
SMS Alfredo
cb619fad5d
Rebase on !1307
2021-07-07 19:57:28 -05: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
ae57b6ca86
MORE MACROS
...
I just can't stop myself!
2021-07-07 00:21:08 -07:00
James R
331329306c
Refactor hook ref allocation
2021-07-06 20:27:00 -07:00
James R
a75d4a1c36
Automatically count hook values
2021-07-06 18:42:08 -07:00
lachablock
2e7141b54a
Use tracer's color for uncolored objects flagged with MF2_LINKDRAW
2021-07-06 18:56:45 +10:00
lachablock
7ea73bf817
Add a color field to vissprites and use that instead of referencing its mobj
2021-07-06 18:36:05 +10:00
James R
14c5d2c916
Warn if Lua attempted access NOLUA consvar
...
And quote variable name.
2021-07-05 18:39:12 -07:00
James R
18cbc1e370
Fix aliases bypass COM_SAFE
2021-07-05 18:31:04 -07:00
MascaraSnake
7e88db938d
Adapt polyobject translucency fade linedef to UDMF
2021-07-04 19:28:14 +02:00
MascaraSnake
6d007f388a
Adapt set translucency linedef to UDMF
2021-07-04 15:37:42 +02:00
MascaraSnake
d2ad12c034
Adapt polyobject displacement linedefs to UDMF
2021-07-04 14:41:37 +02:00
MascaraSnake
429c6588af
Adapt polyobject waving flag linedef to UDMF
2021-07-04 14:10:11 +02:00
MascaraSnake
5c2ce62f00
Adapt polyobject visibility/tangibility linedefs to UDMF
2021-07-04 13:45:41 +02:00
MascaraSnake
2cbda0e5ac
Adapt polyobject waypoint movement linedef to UDMF
2021-07-04 13:20:10 +02:00
MascaraSnake
6e9afabd44
Adapt polyobject move and rotate linedef types to UDMF
2021-07-04 12:54:48 +02:00
LJ Sonic
0482eacb7c
Load add-ons in the order in which the -file and -folder arguments are specified
2021-07-03 19:58:59 +02:00
James R
e24fe29114
Merge remote-tracking branch 'origin/master' into next
2021-07-02 15:55:36 -07:00
MascaraSnake
3b1d64703d
Adapt polyobject door move linedef types to UDMF
2021-07-02 17:18:55 +02:00
MascaraSnake
805bafd936
Adapt "change plane scroller direction" linedef type to UDMF
2021-07-02 12:51:39 +02:00
MascaraSnake
64b67bcfe0
Wind/current linedef: Apply to front sector if tag = 0
2021-07-01 23:15:13 +02:00
MascaraSnake
9718674d3b
Check for sector type in T_PointPusher
2021-07-01 20:59:46 +02:00
MascaraSnake
dcba011cf3
Adapt wind/current linedefs to UDMF
2021-07-01 20:35:13 +02:00
MascaraSnake
6f698b3065
Refactor wind/current thinker
2021-07-01 20:05:23 +02:00
MascaraSnake
d0888c4ac5
Split wind/current and point push/pull thinkers
2021-07-01 18:48:18 +02:00
MascaraSnake
052bfe130c
Make exclusive scrolling the default
2021-07-01 00:47:56 +02:00
MascaraSnake
977887f456
Adapt scroller linedefs to UDMF
2021-06-30 23:50:54 +02:00
Shane Ellis
afa8466b30
comment cleanup
2021-06-30 01:38:04 -04:00
Shane Ellis
94441d6eee
comment cleanup
2021-06-30 01:36:28 -04:00
Shane Ellis
ee765d1043
comment cleanup
2021-06-30 01:34:21 -04:00
Shane Ellis
dad361721f
comment cleanup
2021-06-30 01:32:24 -04:00
James R
22ab611daa
Makefile: do not automatically set WINDOWSHELL
...
According to this answer--
https://stackoverflow.com/a/45952425
--Make will always prefer a unix shell, even on Windows,
if one can be found in Path. So we can't check PATH to
determine if it's a Windows shell... this is just too much
bother.
2021-06-29 16:23:27 -07:00
James R
abdf5c101c
Makefile: report SHELL
2021-06-29 16:22:46 -07:00
James R
17e31f21ff
Merge branch 'master' into next
2021-06-29 14:42:53 -07:00
James R
6c03f9b5b3
fuck
2021-06-29 14:42:40 -07:00
CobaltBW
4f04097066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into addplayer
2021-06-29 14:32:46 -07:00
CobaltBW
c3fa9bea0f
ri# mified: src/tazx# mofied: src/tazx# modified: src/tazx# modified: src/tazxc
2021-06-29 14:07:49 -07:00
James R
215edeb395
Merge branch 'master' into next
2021-06-29 13:58:48 -07:00
James R
c1ecfa306f
Makefile: 'dep' not 'deps'
2021-06-29 13:58:38 -07:00
James R
7d01bd38d8
Fix return value of Lua key hooks not being used
2021-06-29 01:49:53 -07:00
James R
90763d42e1
Shuffle LUA_HookKey
2021-06-29 01:49:45 -07:00
MascaraSnake
06e06a1cb6
Replicate old hack in binary maps: Translucent FOFs set to full opacity cut cyan pixels
2021-06-27 18:45:56 +02:00
MascaraSnake
b0a762a45e
Add missing null checks after P_AddFakeFloor calls
2021-06-27 17:49:00 +02:00
MascaraSnake
09bcc918c5
Fix alpha for rising and intangible FOFs
2021-06-27 17:14:34 +02:00
MascaraSnake
6f38e2fc8e
Merge branch 'next' into udmf-fofs-mkii
2021-06-27 16:47:28 +02:00
MascaraSnake
ac5eb1518d
Add floor/ceiling/both enum
2021-06-27 12:36:46 +02:00
MascaraSnake
2da5b54e73
Now that set flats linedef exists, simplify set heights linedef
2021-06-27 12:21:26 +02:00
MascaraSnake
099cea0a19
Implement "set flats" linedef type
2021-06-27 11:56:06 +02:00
MascaraSnake
4b0e311740
Fix typo
2021-06-27 09:54:48 +02:00
MascaraSnake
92982be76b
Adapt the remaining plane movement linedef types to UDMF
2021-06-27 09:53:57 +02:00
flarn2006
a5cd764772
move MT_BOXSPARKLE in the list
2021-06-26 15:42:41 -04:00
flarn2006
22272732f0
Exclude MT_BOXSPARKLE from Mario blocks
2021-06-26 14:59:56 -04:00
MascaraSnake
588c56b224
Floor/ceiling movers: Stop abusing the texture variable to store the sourceline
2021-06-26 16:25:14 +02:00
MascaraSnake
202c56054e
Remove unused ceiling_t variables
2021-06-26 16:15:38 +02:00
MascaraSnake
299b2dcff2
Fix a small oversight
2021-06-26 15:29:42 +02:00
MascaraSnake
446e78b6e2
Linedef type 403: Allow executor chaining and flat change at the same time
2021-06-26 15:28:28 +02:00
MascaraSnake
63eafff5fe
Linedef type 403: Don't run the linedef executor twice
2021-06-26 14:53:14 +02:00
MascaraSnake
9fdd9060e4
Adapt crusher linedefs to UDMF
2021-06-26 12:53:14 +02:00
MascaraSnake
c8bb18b389
Adapt linedef type 53-58 to UDMF
2021-06-26 10:23:12 +02:00
MascaraSnake
5b1a42af4c
Refactor T_MoveFloor
2021-06-26 10:00:40 +02:00
MascaraSnake
de462f1213
Refactor T_MoveCeiling
2021-06-26 09:43:46 +02:00
MascaraSnake
d5490132b9
Remove crusher types from T_MoveCeiling (they're handled by T_CrushCeiling)
2021-06-26 09:30:17 +02:00
MascaraSnake
8f39e23105
Adapt linedef type 405 and 407 to UDMF
2021-06-26 08:43:35 +02:00
MascaraSnake
53976e4b52
Adapt linedef types 403-404 to UDMF
2021-06-26 08:31:59 +02:00
MascaraSnake
0eabbf0170
Instant ceiling movement: Only change texture if it's not -1
2021-06-25 22:06:04 +02:00
MascaraSnake
df965b1578
Fix thwomps going too fast by a factor of 8
2021-06-25 18:41:14 +02:00
MascaraSnake
6abcba6876
Adapt linedef types 400-401 to UDMF + some EV_ cleanup
2021-06-25 18:34:56 +02:00
MascaraSnake
825b4b384a
Remove unused elevateCurrent elevator type
2021-06-25 11:40:19 +02:00
MascaraSnake
770612bc9d
Adapt moving platform linedef specials to UDMF
2021-06-25 11:33:16 +02:00
MascaraSnake
259700be3c
Get rid of customspeed in EV_DoElevator and read speed from args[1]
2021-06-25 11:11:16 +02:00
MascaraSnake
7025f12d95
-Pass tag as argument to EV_ functions
...
-Get rid of junk linedefs for specialized EV_ calls
-Store tag in args[0]
2021-06-25 10:12:16 +02:00
LJ Sonic
4af3b860fd
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into folder-next
2021-06-25 00:30:30 +02:00
James R
753522fbb6
Merge remote-tracking branch 'origin/master' into next
2021-06-24 14:14:17 -07:00
MascaraSnake
5df079c653
Backwards compatibility: Add back bouncy FOF sector type, but mark it as deprecated
2021-06-23 22:21:19 +02:00
MascaraSnake
23efeeed8e
Merge branch 'next' into udmf-fofs-mkii
2021-06-23 19:48:26 +02:00
James R
ed85e994a4
Remove misplaced parentheses
2021-06-22 15:49:59 -07:00
James R
c3ad5de912
Makefile: let variables be defined on Make line
...
If a variable is defined as in 'make CC=gcc-10', then that
definition overrides anything other definition in the
Makefile.
2021-06-22 15:47:48 -07:00
James R
5f4d7e3c5b
Makefile: fail if old build directories exist
...
After a checkout from before revision, old directories
such as bin/Linux64 only remain if untracked files exist
within. This may be confusing to the user. They may even
use an outdated executable if it is one of those untracked
files.
2021-06-22 15:14:42 -07:00
LJ Sonic
c319f46462
Merge branch 'hooklib-refactor' into 'next'
...
Hooklib refactor
See merge request STJr/SRB2!1307
2021-06-22 09:52:12 -04:00
GoldenTails
389cea2bc1
You probably don't want to memorise the formula to convert arccos to arcsin so
2021-06-22 01:38:37 -05:00
James R
d5146945a6
Makefile: don't automatically set WINDOWSHELL unless PATH matches Windows norms
...
This is for MSYS2, which requires unix shell commands.
2021-06-21 16:10:13 -07:00
James R
2d7a8c3c57
Makefile: use shell commands to read in Sourcefile
...
File function is not supported < Make 4.2.
2021-06-21 14:51:42 -07:00
James R
fa7a674113
Merge remote-tracking branch 'origin/master' into next
2021-06-19 19:39:15 -07:00
James R
c1aca51fc3
Fix basic warnings
2021-06-19 18:32:56 -07:00
Shane Ellis
09f445f227
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/g_game.c
2021-06-19 20:20:45 -04:00
LJ Sonic
e3a5da3f6f
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD
...
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
2021-06-19 20:49:12 +02:00
LJ Sonic
cfa48574be
Merge branch 'next' into 'lua-inputs'
...
# Conflicts:
# src/lua_script.c
2021-06-19 10:34:48 -04:00
sphere
357b64129c
Merge branch 'robo-hood-nojump' into 'next'
...
Restore toggle for Robo-Hood to not jump away from nearby players.
See merge request STJr/SRB2!1548
2021-06-18 10:00:42 -04:00
Radicalicious
63d217b689
Revert "Hopefully fix ghosts"
...
This reverts commit e46afda896
2021-06-18 05:06:52 +00:00
Radicalicious
e46afda896
Hopefully fix ghosts
2021-06-18 01:04:49 -04:00
sphere
3486e12088
Merge branch 'multitag-ignore0' into 'next'
...
Ignore a linedef tag of 0 when using linedef action 96.
See merge request STJr/SRB2!1543
2021-06-17 13:03:05 -04:00
sphere
0e030466e1
Add flag to line slopes for copying their slopes to the other side.
2021-06-17 13:23:27 +02:00
James R
b04c79d8a7
Say 'at'
2021-06-16 16:58:47 -07:00
James R
c142b3241d
Makefile: alert full path of final executable
...
With added textual contrast.
2021-06-16 16:26:17 -07:00
James R
3a044e71cc
Disable EXE disassembly and compression by default
...
NOOBJDUMP=1 and NOUPX=1 have been removed. Make 'dump'
target to disassemble. UPX=upx to compress executable.
Setting UPX used to cause it to fail. That has been fixed.
2021-06-16 15:39:23 -07:00
sphere
df5c9933ec
Restore toggle for Robo-Hood to not jump away from nearby players.
2021-06-16 16:12:38 +02:00
sphere
d90b6949d7
Merge branch 'i-havent-the-foggiest' into 'next'
...
Allow P_CheckSight to see through FF_FOG FOFs
See merge request STJr/SRB2!1546
2021-06-16 09:29:01 -04:00
sphere
d11a1bb016
Merge branch 'srbii' into 'next'
...
Replace "II" in credits with "2" for consistency
See merge request STJr/SRB2!1547
2021-06-15 05:42:59 -04:00
Radicalicious
781678389f
Replace "II" with "2" for consistency
2021-06-12 20:36:57 -04:00
James R
8be7c1a03d
Fix double micros conv.
...
blame e0a307da15
2021-06-11 18:31:38 -07:00
Radicalicious
460d46bbc9
Cut cv_hidetime's minimum value all the way down to 1
2021-06-11 10:52:31 -04:00
James R
46ca9613c6
Pop hook id fetched from table
2021-06-10 18:09:39 -07:00
James R
c9417f26e5
Fix pop original table in lua net archive
2021-06-10 17:47:03 -07:00
Monster Iestyn
4c9b83b6bd
Allow P_CheckSight to see through FF_FOG FOFs
2021-06-10 21:20:42 +01:00
Ors
2a89154667
Revert an accidental whitespace change
2021-06-10 14:23:51 -04:00
Riku Salminen
f1a96bd7ee
Add support for ghosts with netvars in 2.2.6 and before
2021-06-10 21:18:45 +03:00
Radicalicious
9210923b86
Cut cv_hidetime's minimum value to 5 seconds
2021-06-10 12:59:54 -04:00
sphere
52f9b47ce3
Ignore a linedef tag of 0 when using linedef action 96.
2021-06-10 17:49:33 +02:00
Radicalicious
165be34206
Fix player maxstep, oops
2021-06-09 12:59:06 -04:00
Riku Salminen
45e57fa791
Revert "Revert "Made height/spinheight and height change values in replays more accurate""
...
This reverts commit fbeabad797
.
2021-06-09 19:40:59 +03:00
Riku Salminen
fbeabad797
Revert "Made height/spinheight and height change values in replays more accurate"
...
This reverts commit 3daee0ebf8
.
2021-06-09 19:28:14 +03:00
sphere
786516fa5f
Merge branch 'kart-latency' into 'next'
...
Kart cmd->latency port
See merge request STJr/SRB2!1470
2021-06-09 10:53:09 -04:00
Radicalicious
976373dd37
Calculate maxstep for pushables
2021-06-08 23:45:50 -04:00
sphere
be8c97728c
Merge branch 'aproxdistance' into 'next'
...
Restore P_AproxDistance Lua parity
See merge request STJr/SRB2!1531
2021-06-08 07:47:38 -04:00
lachablock
4d1b3edb03
Split up x/y/z averages in A_Boss3ShockThink
2021-06-08 17:21:54 +10:00
James R
c325306ddf
Merge remote-tracking branch 'origin/master' into makefile-revision-final
2021-06-07 18:36:01 -07:00
James R
0f4eb4fab9
Merge conflicts 4d22b9f17
2021-06-07 18:13:56 -07:00
James R
4d22b9f17f
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2021-06-07 18:12:52 -07:00
lachablock
0c5018040c
Merge remote-tracking branch 'origin/master' into next
2021-06-06 21:25:08 +10:00
sphere
c266a27073
Merge branch 'master' into 'master'
...
Fix console text bleeding
See merge request STJr/SRB2!1434
2021-06-06 07:01:30 -04:00
GoldenTails
409cba678d
metalrecording
2021-06-05 18:35:44 -05:00
Monster Iestyn
090e5384d5
Merge branch 'blendmode-rangecheck' into 'next'
...
Handle invalid blend modes
See merge request STJr/SRB2!1486
2021-06-05 09:02:31 -04:00
Radicalicious
7483a9d049
Switch num and flags so flags is optional
2021-06-03 10:55:42 -04:00
sphere
6ff212b79f
Use floating-point math for polyobject planes as well.
2021-06-03 16:01:09 +02:00
Radicalicious
cb5e433a49
Update lua_hudlib.c
2021-06-03 09:34:18 -04:00
lachablock
476dcc861b
Restore P_AproxDistance Lua parity
2021-06-03 14:36:29 +10:00
Shane Ellis
18c47afc76
Merge branch 'next' into 'addplayer'
...
# Conflicts:
# src/lua_baselib.c
# src/r_skins.c
2021-06-02 11:47:11 -04:00
sphere
2df75610e6
Merge branch 'allow-lua-to-override-special-stages' into 'next'
...
Allows Lua to transport you to a different map in place of a Special Stage.
See merge request STJr/SRB2!1368
2021-06-02 11:16:15 -04:00
sphere
8cfe7cd971
Merge branch 'unix-rdynamic' into 'next'
...
Compile with -rdynamic for UNIXCOMMON platforms
See merge request STJr/SRB2!1481
2021-06-02 06:31:14 -04:00
sphere
4aa3bea6ca
Merge branch 'fix-console-splitting' into 'next'
...
Fix the console splitting up halfway through startup.
Closes #349
See merge request STJr/SRB2!1494
2021-06-02 06:31:01 -04:00
sphere
fb453491dd
Merge branch 'models-spr2endstate' into 'next'
...
Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state
See merge request STJr/SRB2!1515
2021-06-02 06:28:51 -04:00
Nev3r
a4300220e9
whitespace
2021-06-02 11:36:52 +02:00
Nev3r
9c68f8cbb0
Fix the equation constant fields not being filled properly.
2021-06-02 11:21:37 +02:00
Nev3r
aec1ab304a
Let equation slopes be read from textmaps.
2021-06-02 11:00:57 +02:00
Nev3r
36ce44e0a3
Add slope equation constant parsing functionality.
2021-06-02 11:00:47 +02:00
Nev3r
8cb62eeca5
Initialize slopes before the map loads.
2021-06-02 10:59:57 +02:00
sphere
d040b61edc
Merge branch 'multitagging_plus' into 'next'
...
Enhance the multitagging functionality added by !1485
See merge request STJr/SRB2!1524
2021-06-01 17:25:29 -04:00
flarn2006
115254efc9
Fix compiler warning related to precedence
2021-06-01 17:10:29 -04: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
sphere
e203e457de
Merge branch 'custom3drotate-scale-fix' into 'next'
...
A_Custom3DRotate scale fix
See merge request STJr/SRB2!1525
2021-06-01 15:02:43 -04:00
sphere
70bcb6081f
Merge branch 'dashmode-lowroad' into 'next'
...
Have Metal Sonic use spinheight while dashing
See merge request STJr/SRB2!1382
2021-06-01 15:00:08 -04:00
sphere
69b6c409b5
Merge branch 'flicky-mapload-crash-fix' into 'next'
...
Flicky mapload crash fix (and other tmthing-related fixes)
Closes #81
See merge request STJr/SRB2!1522
2021-06-01 14:58:01 -04:00
flarn2006
172454f108
Fix offset_tags array indices
2021-06-01 10:09:57 -04:00
Nev3r
f7ee0dacf2
Merge branch 'lua_mapnumber' into 'next'
...
Expose M_MapNumber to Lua
See merge request STJr/SRB2!1521
2021-06-01 07:43:33 -04:00
Nev3r
2d155fa366
Merge branch 'remove-fracunit-2' into 'next'
...
I have no idea why software does this.
See merge request STJr/SRB2!1517
2021-06-01 07:42:36 -04:00
Nev3r
de0a91729b
Merge branch 'buttered-lua' into 'next'
...
Expose P_ButteredSlope to lua
See merge request STJr/SRB2!1397
2021-06-01 07:39:19 -04:00
Nev3r
6edad47788
Merge branch 'no-airwalking-springs' into 'next'
...
No airwalking (from horizontal springs)
See merge request STJr/SRB2!1428
2021-06-01 07:38:04 -04:00
Nev3r
b49238f7c4
Merge branch 'remove-iterdeclarations' into 'next'
...
Remove TAG_ITER_DECLARECOUNTER
See merge request STJr/SRB2!1398
2021-06-01 07:36:50 -04:00
Nev3r
ab06ff011e
Merge branch 'colorfret' into 'next'
...
Respect mobj->color while enemies & bosses flash (resolves #531 )
Closes #531
See merge request STJr/SRB2!1513
2021-06-01 02:31:22 -04:00
Nev3r
9e7d619a5b
Merge branch 'golden-nitpicks-use-of-base-10' into 'next'
...
Use more readable hex constants in the Software Renderer splat and floorsprite drawers.
See merge request STJr/SRB2!1442
2021-06-01 02:29:53 -04:00
sphere
4908712641
Merge branch 'go-away' into 'next'
...
Make a few messages more helpful (resolves #485 )
Closes #485
See merge request STJr/SRB2!1519
2021-05-31 16:32:42 -04:00
sphere
65350e59c9
Merge branch 'rollout-stuff' into 'next'
...
Rollout rock improvements
Closes #445 , #221 , and #532
See merge request STJr/SRB2!1401
2021-05-31 16:12:17 -04:00
Radicalicious
3e91a8b2d4
Revert "Update p_user.c"
...
This reverts commit 92209bf246
2021-05-31 19:23:37 +00:00
Radicalicious
92209bf246
Update p_user.c
2021-05-31 15:09:54 -04:00
sphere
33d0438033
Merge branch 'fuckeggguard' into 'next'
...
Make Armageddon Shield instantly kill Egg Guards (Closes #225 )
Closes #225
See merge request STJr/SRB2!1378
2021-05-31 09:34:14 -04:00
sphere
aec209ad2d
Merge branch 'slider' into 'next'
...
Allow sliders passage through spin gaps (resolves #576 )
Closes #576
See merge request STJr/SRB2!1520
2021-05-31 08:31:42 -04:00
sphere
ae9e0e7f08
Merge branch 'text-loops' into 'next'
...
Custom title card bruh moments
See merge request STJr/SRB2!1501
2021-05-31 08:25:43 -04:00
Nev3r
a48af30465
Merge branch 'easings' into 'next'
...
Easing functions
See merge request STJr/SRB2!1467
2021-05-31 02:34:02 -04:00
flarn2006
0b51b391f1
Make 96's flags consistent with 97-99 by default
2021-05-30 12:16:15 -04:00
sphere
fb4b3b8130
Merge branch 'ogl-fof-wall-slope-fix2' into 'next'
...
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg
Closes #192
See merge request STJr/SRB2!1361
2021-05-30 11:32:30 -04:00
Monster Iestyn
d10cf4faf5
A_Custom3DRotate: don't scale hspeed and vspeed - they are angular speeds, not linear!
...
(I added the scaling to this action somewhere between 7-9 years ago, and somehow never knew I made this mistake until now, welp.)
2021-05-29 22:54:58 +01:00
flarn2006
f8fe763df2
Fix linedef type 99
2021-05-29 12:28:06 -04:00
flarn2006
2d4411d077
Remove empty 'else' block (also leftover)
2021-05-29 12:23:35 -04:00
flarn2006
5090de5809
Remove leftover debug printfs
2021-05-29 12:09:30 -04:00
flarn2006
93de054786
Fix linedef type 96 (I had it all wrong)
2021-05-29 11:08:57 -04:00
Nev3r
b978bc4507
Merge branch 'sw-tilted-npo2-span-opt' into 'next'
...
NPO2 slope span optimization
See merge request STJr/SRB2!1216
2021-05-29 09:30:58 -04:00
flarn2006
eee894581a
Make linedef 96 skip the control sector
2021-05-29 00:54:31 -04:00
flarn2006
7d71d534d4
Add missing "/ FRACUNIT" to texture offset code
2021-05-29 00:40:06 -04:00
flarn2006
8d8f62baef
Add additional multitagging functionality
2021-05-28 23:59:39 -04:00
SteelT
ad2b4b1809
Merge branch 'save-skin-names' into 'next'
...
Save skin names in save files instead of skin numbers
See merge request STJr/SRB2!1503
2021-05-28 22:05:20 -04:00
SteelT
c0f8cb29aa
Merge branch 'select-heading-no-gaps' into 'next'
...
[SUGOI] Level select no longer assumes that games will always be linear
See merge request STJr/SRB2!1492
2021-05-28 21:51:52 -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
SteelT
a72d6bba22
Merge branch 'skin-unlocks-sanity' into 'next'
...
[SUGOI] Remove skin->availability, add SECRET_SKIN
See merge request STJr/SRB2!1474
2021-05-28 21:30:16 -04:00
Riku Salminen
22aaffa35d
non-misleading comment
2021-05-28 22:32:11 +03:00
Riku Salminen
21dab7bd66
Add previous demo version to acceptable demo versions for demo comparison
2021-05-28 22:30:43 +03:00
Monster Iestyn
45b1223f3e
My mistake, P_PreTicker
calls P_MapStart
and P_MapEnd
too, so rework my earlier fix a bit
2021-05-28 18:56:32 +01:00
Monster Iestyn
ada6ec07db
Fix Lua versions of P_ZMovement and its clones as well as P_MovePlayer so tmthing changes don't linger afterwards
2021-05-28 18:47:09 +01:00
Monster Iestyn
07801a2a18
move P_MapEnd call in P_LoadLevel further down, so that the P_MapStart/End pair also encloses cached actions and the MapLoad Lua hook
2021-05-28 18:42:19 +01:00
flarn2006
fd82357d4f
Expose M_MapNumber to Lua
2021-05-27 18:35:15 -04:00
sphere
75938e2dfa
Merge branch 'software-slope-plane-uv-fix-attempt' into 'next'
...
Fix slope plane rotation and alignment (resolves #508 )
Closes #508
See merge request STJr/SRB2!1464
2021-05-27 16:56:16 -04:00
katsy
6286fc8b05
add sliding flag to spinheight conditions
2021-05-26 02:37:46 -04:00
katsy
a1235e144d
allow sliders passage through spin gaps
2021-05-26 01:09:56 -05:00
katsy
b2ae7c79e7
make a few messages more helpful
2021-05-24 00:00:01 -05:00
GoldenTails
3d0e8f194a
Allow people to update their Master Server listing on command.
2021-05-23 19:21:23 -05:00
Jaime Ita Passos
75397c347d
Remove FRACUNIT/2
2021-05-22 21:09:06 -03:00
Jaime Ita Passos
a1553c4623
Update r_opengl.c
2021-05-22 20:08:11 -03:00
Jaime Ita Passos
75ebdda31b
Merge remote-tracking branch 'origin' into gl-texfmt-p8-ap88-a8-ai8-fix
2021-05-22 19:44:57 -03:00
lachablock
750bdd9d60
Respect mobj->color while enemies & bosses flash, but in OpenGL
2021-05-22 23:25:36 +10:00
lachablock
99ad188263
Fix models interpolating to frame 0 from a same-sprite2 FF_SPR2ENDSTATE state
2021-05-22 18:17:48 +10:00
lachablock
4e5c3566c9
Respect mobj->color while enemies & bosses flash
2021-05-22 16:52:01 +10:00
lachablock
7c11bc8ac5
Remove camera dependency from P_GetPlayerControlDirection
2021-05-21 20:28:50 +10:00
Steel Titanium
d9395b0a73
Merge branch 'master' into next
2021-05-19 23:09:14 -04:00
Steel Titanium
7862a557c8
Merge branch 'bugfix-1' of https://github.com/rjpfonseca/SRB2 into rjpfonseca-bugfix-1
2021-05-19 22:57:38 -04:00
SteelT
695722269b
Merge branch 'warnings' into 'master'
...
Fix some compiler warnings
See merge request STJr/SRB2!1504
2021-05-19 22:54:48 -04:00
sphere
60bbf1d8bc
Merge branch 'fix-pit_checkthing-crash' into 'next'
...
Check against null tmpusher source before attempting to push a thing.
See merge request STJr/SRB2!1413
2021-05-19 08:12:30 -04:00
sphere
dc5572ba21
Merge branch 'trns-chunk-fix' into 'next'
...
tRNS chunk fix
See merge request STJr/SRB2!1393
2021-05-19 06:07:38 -04:00
sphere
bcd3a6b82b
Merge branch 'optimize-getpatchpixel' into 'next'
...
Optimize Picture_GetPatchPixel
See merge request STJr/SRB2!1342
2021-05-19 06:07:23 -04:00
sphere
186ef0479d
Merge branch 'death-of-musicslots2' into 'next'
...
Remove music slot compatibility
See merge request STJr/SRB2!1321
2021-05-19 05:27:31 -04:00
Jaime Ita Passos
5b86b8991c
Use floating point trigonometry
2021-05-16 21:43:52 -03:00
Jaime Ita Passos
7500d12eeb
Merge remote-tracking branch 'origin' into software-slope-plane-uv-fix-attempt
2021-05-16 20:56:53 -03:00
Steel Titanium
a2667f4dc9
Merge branch 'master' into next
2021-05-11 20:08:44 -04:00
James R
c13e1a74dd
Reject banned players with refusereason
2021-05-10 18:10:53 -07:00
James R
8486a9386d
serverinfo: enumerate refusereason
2021-05-10 18:10:16 -07:00
James R
22bfc2db78
Refactor HandleConnect refusals
...
Also removed some version fields from serverconfig_pak and
clientconfig_pak. Client version will be checked with
SRB2APPLICATION and MODVERSION.
Not updating PACKETVERSION because those packets shouldn't
have been packetversion'd in the first place.
2021-05-10 17:50:01 -07:00
James R
0edbca5e02
Actually report server version mismatches
...
Incompatible servers get dropped from the server list. It
turns out the server list is also used when connecting
directly to a server. This meant that if you tried
connecting to a server that was incompatible, you'd just
get an infinite connection screen, as if the server was
completely unreachable.
Now it won't drop the server if you are directly
connecting to it. I also copied some incompatibility
messages from HandleConnect.
2021-05-10 16:51:18 -07:00
sphere
d915da6509
Merge branch 'dashaction' into 'next'
...
Scale minimum dashmode thok speed on actionspd, not normalspeed
See merge request STJr/SRB2!1311
2021-05-10 08:45:26 -04:00
Lach
5cab285b2c
Merge branch 'make-ghosts-target-origin' into 'next'
...
Set the target of a spawned ghost to where it came from.
Closes #517
See merge request STJr/SRB2!1358
2021-05-10 08:40:41 -04:00
Lach
5fb4b34f8c
Merge branch 'steamed' into 'next'
...
Make steam apply sprung flag
See merge request STJr/SRB2!1365
2021-05-10 08:39:06 -04:00
Lach
e1843841bc
Merge branch 'lunch' into 'next'
...
Don't apply pw_justlaunched if the player didn't actually launch off a slope
See merge request STJr/SRB2!1447
2021-05-10 08:37:55 -04:00
Lach
58a070ca03
Merge branch 'no-fire-shield-palflash' into 'next'
...
No fire shield palflash (resolves #512 )
Closes #512
See merge request STJr/SRB2!1473
2021-05-10 08:37:20 -04:00
Lach
ecd59feafb
Merge branch 'rosycolormap-raspberry' into 'next'
...
Change Raspberry's chat colormap to V_ROSYMAP
See merge request STJr/SRB2!1441
2021-05-10 08:36:26 -04:00
sphere
c25ecfc35f
Merge branch 'more-slope-copying' into 'next'
...
Add more actions for slope copying
See merge request STJr/SRB2!1406
2021-05-10 07:43:03 -04:00
sphere
44f3edb218
Merge branch 'binary-multitagging' into 'next'
...
Add linedef specials for multitagging in binary maps
See merge request STJr/SRB2!1485
2021-05-10 07:42:55 -04:00
RJPFonseca
69647eb78d
Used spaces instead of tabs in Makefile.cfg
2021-05-09 19:10:53 +01:00
James R
35244fa736
Clang: fix -Wimplicit-const-int-float-conversion
...
Some of these integers exceed the precision of float. In
that case the number is rounded. The rounding shouldn't
matter too much anyway, so just shut the compiler up.
2021-05-08 16:49:23 -07:00
James R
210c9419e4
Ignore -Wtrigraphs
2021-05-08 16:49:18 -07:00
Sally Coolatta
ec8e884a31
Removed this function
2021-05-08 12:56:33 -04:00
Sally Coolatta
5d93f86499
Merge branch 'next' into skin-unlocks-sanity
2021-05-08 12:55:46 -04:00
lachablock
d2db204058
Fix rollout rock controls in 2D mode
2021-05-08 18:34:32 +10:00
lachablock
755cf6e952
Merge remote-tracking branch 'origin/next' into rollout-stuff
2021-05-08 13:03:18 +10:00
lachablock
3880263f1f
Add machine dashmode as a condition for gap passage.
...
(Also remove the sprite2 check, we don't need to be that stingy since PlayerHeight hooks allow greater control over that now!)
2021-05-08 12:27:29 +10:00
lachablock
47f465ccea
Merge remote-tracking branch 'origin/next' into dashmode-lowroad
2021-05-08 12:16:46 +10:00
James R
87afa7655a
CMake: fix ASM compile
...
- target_sources from correct directory
- enable_language must be used in add_executable directory
2021-05-07 18:59:51 -07:00
Sally Coolatta
d136c60a3f
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not.
...
I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-07 20:13:16 -04:00
Sally Coolatta
a583027006
Remove prints
2021-05-07 19:52:29 -04:00
Sally Coolatta
dc6851dabc
Save skin name instead of skin number into save files
...
Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-07 19:41:44 -04:00
James R
9e7d80c2c4
Makefile: suppress DEL error
2021-05-07 16:08:24 -07:00
Monster Iestyn
a98b0834a6
Merge branch 'deh-buffer-unclog' into 'next'
...
Fix a series of buffer overflows in SOC (primarily Character section) loading
See merge request STJr/SRB2!1457
2021-05-07 18:47:51 -04:00
Monster Iestyn
70052a099c
Merge branch 'acos' into 'next'
...
arccosine Lua exposure
See merge request STJr/SRB2!1455
2021-05-07 18:33:55 -04:00
James R
c06817d008
Makefile: fix mingw/64 swapped with 32-bit
2021-05-07 15:30:46 -07:00
Monster Iestyn
529d297895
Merge branch 'soc-caption' into 'next'
...
[SUGOI] Allow setting sound captions in SOC
See merge request STJr/SRB2!1469
2021-05-07 18:21:48 -04:00
Monster Iestyn
d00726cbe9
Merge branch 'monster-cleaning-up-again' into 'next'
...
Monster cleaning up again
See merge request STJr/SRB2!1433
2021-05-07 17:33:00 -04:00
Monster Iestyn
fa140c1eb3
Merge branch 'load-netgame-error-fixes' into 'next'
...
Load netgame error fixes
See merge request STJr/SRB2!1482
2021-05-07 17:27:19 -04:00
James R
ee72312dea
Merge remote-tracking branch 'origin/master' into makefile-revision-final
2021-05-07 13:32:19 -07:00
Monster Iestyn
b7ff0164e9
Merge branch 'polyobject-ffloor-fix' into 'next'
...
Polyobject over 3D floor fix for software renderer
See merge request STJr/SRB2!1488
2021-05-07 16:11:03 -04:00
Sally Coolatta
4478265400
Fix title card patches not actually having enough room for an entire lump name
2021-05-07 14:15:37 -04:00
Sally Coolatta
8e8881b534
Fix custom title card text not looping properly
2021-05-07 14:14:31 -04:00
LJ Sonic
07e69c5eb3
Add copyright date ranges for files created in 2020
2021-05-07 18:04:30 +02:00
LJ Sonic
d325c7e6d3
The year is 2021
2021-05-07 17:45:56 +02:00
lachablock
8b021ec16b
but if you close your eyes EH OH, EH OH
2021-05-07 12:38:24 +10:00
Tatsuru
3159d5a6e4
2.2.9 prep
2021-05-06 21:58:21 -03:00
sphere
6053740ef7
Merge branch 'light-userdata-is-wrong' into 'next'
...
Stop using metatables with light userdata
See merge request STJr/SRB2!1495
2021-05-06 12:14:36 -04:00
sphere
413c8563c9
Merge branch 'things-to-tide-you-over' into 'next'
...
Update URL on the addon screen
See merge request STJr/SRB2!1489
2021-05-06 08:18:12 -04:00
James R
ec8b63d675
Makefile: remove last of unused flags
2021-05-05 21:21:55 -07:00
James R
f9813844e7
Update CMakeLists.txt to use Sourcefiles
...
This establishes (near) parity of source code file lists
between the Makefile and CMakeLists.txt
To make that change I messed around CMakeLists.txt a bit.
It now uses target_sources and target_compile_definitions.
I also removed some MSVC stuff since we don't actually
care about MSVC--it made things easier.
CMake minimum version 3.0 -> 3.13 for target_sources.
2021-05-05 04:00:44 -07:00
James R
3d7205d494
Fix minor errors with Windows ECHO, DEL, MD
...
- Quotes were not removed by ECHO.
- DEL would print an error on nonexistent file.
- MD would do this plus return a nonzero exit code.
2021-05-04 22:34:20 -07:00
James R
888073d64d
Fix make clean printing header
2021-05-04 16:54:47 -07:00
James R
b31056c7d9
Rewrite Makefile to be modular as well as more automated
...
Some key points for programmers:
- Source code files are mostly listed in a 'Sourcefile'.
So you no longer directly edit the object list. There
can be multiple Sourcefiles and they can even live in
subdirectories--the directory name will be prepended to
every filename in the list. Of course, the Makefile
still needs to be edited to read from each Sourcefile.
- Different rules are no longer required for source code
files that live in subdirectories (such as sdl/ or
hardware/). Subdirectories Just Work so go ham!
In addition to those points, another important change is
that the bin directory is no longer divided into platform
subdirectories (Linux64, Mingw, etc). Executables now go
directly into bin. If you use DEBUGMODE or target 64-bit,
then subdirectories for 'debug' and '64' will be made
though.
Oh by the way, I don't think make clean actually removed
files before on Windows. It should now. I also fixed as
many little inconsistencies like that as I noticed.
And now just an overview of the technical aspects that
shouldn't affect anyone who doesn't REALLY care about the
Makefile...
objs and dep directories have been moved to a make
directory. Makefile.cfg and its variants have been moved
out of their various subdirectories to src/Makefile.d
make distclean removes the bin and make directories
entirely, but make clean and cleandep still only affect
the current build target.
When I say automation, I mean that a lot of copy pasting
in the Makefile has been reduced.
2021-05-04 04:22:37 -07:00
James R
44d217807f
Collect makefiles
2021-05-03 23:07:44 -07:00
Steel Titanium
80fe39bbd1
Fix MusicChange hook not returning some values correctly
2021-05-03 01:40:02 -04:00
James R
aee963f4e9
Replace LUA_PushLightUserdata with LUA_PushUserdata
...
See 7df6a309
and 83a87042
. I didn't realize that light
userdata's metatable is shared--like numbers or strings.
So it cannot be paired with a metatable.
I also made a few minor tweaks to Lua cvars, other than
accounting for the double pointer in the userdata.
2021-05-02 21:59:23 -07:00
James R
ed5a7f51e8
Revert "Merge branch 'lightmemedata' into 'next'"
...
This reverts commit d4c08a8410
, reversing
changes made to e100f21dda
.
2021-05-02 21:32:07 -07:00
GoldenTails
ab84bd5370
Fix the console splitting up halfway through startup.
2021-05-02 00:03:35 -05:00
Tatsuru
aac3ca320b
Update LOCATIONSTRING2 as well
2021-05-01 10:24:28 -03:00
Sally Coolatta
381ead4d7e
Level select no longer assumes that games will always be linear
...
- If a level is in-between two with the same header, it would previously create two headers with the same name. Now it groups all levels with the same header together.
- Previously, a header would only be visible if its first map was visible. Now it will show the header if you've visited any level under the header.
For SUGOI.
2021-04-30 21:46:09 -04:00
LJ Sonic
f97dc1093a
Merge branch 'kitchensync' into 'next'
...
Attempt to resolve teleportation resync issue
See merge request STJr/SRB2!1490
2021-04-30 20:39:11 -04:00
katsy
815db01438
adjust cooldown to 5 seconds (bandage fix for 2.2.9)
2021-04-30 20:30:35 -04:00
katsy
858cb98e57
attempt to resolve teleportation resync issue
2021-04-30 17:26:09 -05:00
Tatsuru
ea7b332525
Visit srb2.org/addons to get & make addons!
2021-04-30 15:49:09 -03:00
Jaime Ita Passos
b4a09405a7
Use 64-bit math for calculating the texture origin X/Z
2021-04-29 19:24:37 -03:00
Jaime Ita Passos
9d41325843
Only adjust slope offsets if the plane isn't rotated
2021-04-28 22:15:05 -03:00
Jaime Ita Passos
090f304f33
Use 64-bit x/y in R_GetSlopeZAt
2021-04-28 22:00:20 -03:00
Jaime Ita Passos
1cf13a22e4
Merge branch 'next' into polyobject-ffloor-fix
2021-04-28 20:29:41 -03:00
Monster Iestyn
b8ba2c5b70
Merge branch 'next' into load-netgame-error-fixes
...
# Conflicts:
# src/d_clisrv.c
2021-04-28 18:08:48 +01:00
Jaime Ita Passos
8f47a7e9cc
Prevent texture wobbling on planes with no flat alignment
2021-04-27 22:59:06 -03:00
Jaime Ita Passos
0fba870a35
Revert "Use floating point trig in R_SetSlopePlane"
...
This reverts commit 63761a2d07
.
2021-04-27 22:54:56 -03:00
Jaime Ita Passos
63761a2d07
Use floating point trig in R_SetSlopePlane
2021-04-27 20:42:59 -03:00
Jaime Ita Passos
1c6296653a
Use floating point GetSlopeZAt for the texture origin vector
2021-04-27 20:32:41 -03:00
GoldenTails
691b17a88e
Dynamically allocate space for a state's action field
...
It was previously restricted arbitrarily to 32 cells (31 usable characters) due to someone else's laziness
2021-04-27 17:28:49 -05:00
Jaime Ita Passos
e4b8dc6584
Fix sloped plane offsets in Software, and fix rotated flat alignment in OpenGL.
...
+ unrelated slope plane optimizations in Software
2021-04-27 19:01:09 -03:00
Zwip-Zwap Zapony
21da6ce704
Auto-crop at splitscreen borders
...
V_DrawCroppedPatch will no longer go beyond splitscreen borders when V_PERPLAYER is used
2021-04-27 21:30:00 +02:00
Jaime Ita Passos
548554431b
Handle invalid blend modes properly
2021-04-27 00:20:41 -03:00
Jaime Ita Passos
85c53b35cd
Use old routine for PO2 spans
2021-04-26 22:17:03 -03:00
Vincent Robinson
f437d6afec
Add linedef specials for multitagging in binary maps
2021-04-26 16:27:39 -07:00
LJ Sonic
3491112818
Update copyright date
2021-04-27 00:33:24 +02:00
LJ Sonic
0d4d3a5207
Revert "Lua: ensure order of MIN, MAX possible values"
...
This reverts commit c51c478740
.
2021-04-26 21:11:24 +02:00
LJ Sonic
cd4cfba500
Delete faulty return
2021-04-26 21:10:32 +02:00
Monster Iestyn
34fa977192
move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail
2021-04-26 19:07:11 +01:00
LJ Sonic
664f5fe5b1
Merge branch 'erz3-tol' into 'next'
...
Give TOL_ERZ3 an appropriate identifier (closes #516 )
Closes #516
See merge request STJr/SRB2!1471
2021-04-26 06:08:31 -04:00
LJ Sonic
7d167f531b
Merge branch 'lua-minmax-plus' into 'next'
...
Let Lua cvars use preset values in addition to MIN and MAX
See merge request STJr/SRB2!1480
2021-04-26 06:06:58 -04:00
Steel Titanium
7cd41a8eb7
Compile with -rdynamic on UNIXCOMMON platforms
2021-04-26 03:48:38 -04:00
James R
92aeadc36b
It is impossible for a string to be allocated in this case
2021-04-25 22:01:40 -07:00
James R
85914cc7cd
Free zstring when switching to preset value
...
This is only applicable for bounded cvars (MIN, MAX),
since otherwise there's no way to allocate a zstring.
2021-04-25 21:55:04 -07:00
James R
c51c478740
Lua: ensure order of MIN, MAX possible values
...
Cvars could now have a range (MIN, MAX) plus some preset
values, but Lua could not take advantage of this due to
table order not being guaranteed.
2021-04-25 21:51:24 -07:00
Sally Coolatta
4bafd62271
Only return skin string number if it existed
2021-04-25 18:44:07 -04:00
Sally Coolatta
92107f28d5
Add string variable for unlockables and emblems
...
Skin unlockables / skin emblems are now checked at runtime to see if there's any matches.
2021-04-25 17:54:47 -04:00
Sally Coolatta
f0b9e0e415
Default to first usable skin instead of 0, I_Error if none are usable
2021-04-25 16:38:33 -04:00
LJ Sonic
d18fc8882f
Merge branch 'dont-load-dont-unload' into 'next'
...
Fix a dedicated crash in Special Stage intermissions (2.2.9 RC1)
See merge request STJr/SRB2!1475
2021-04-25 16:35:46 -04:00
LJ Sonic
1d07fc2de3
Merge branch 'spritedef-add-hotfix' into 'next'
...
Spritedef add hotfix
See merge request STJr/SRB2!1476
2021-04-25 16:34:39 -04:00
LJ Sonic
1e394a80bf
Merge branch 'possible-netgame-quit-crash-hotfix' into 'next'
...
Possible netgame quit crash hotfix
Closes #487
See merge request STJr/SRB2!1477
2021-04-25 16:33:49 -04:00
Sally Coolatta
382c0aa7de
Fix overshadowed declaration
2021-04-25 16:27:15 -04:00
Monster Iestyn
70939a7a3d
Set "allocated" flag to off if setting a string from PossibleValue afterwards, or if not setting a new value at all.
2021-04-25 21:08:12 +01:00
LJ Sonic
02ee480abe
Merge branch 'gl-colormapped-epolyflag' into 'next'
...
Fix uninitialized reads in PreparePolygon
See merge request STJr/SRB2!1392
2021-04-25 14:19:24 -04:00
sphere
a90642bfa9
Merge branch 'ogl-midtexture-zfighting-fix' into 'next'
...
Render midtextures on two-sided lines with a z-buffer offset
See merge request STJr/SRB2!1376
2021-04-25 14:02:02 -04:00
Monster Iestyn
65624bf6c0
Change numadded counter to UINT16 instead of UINT8, to allow for more sprites properly
2021-04-25 19:01:51 +01:00
Tatsuru
376d6cd6a2
Don't try to free patches in dedicated
2021-04-25 14:26:43 -03:00
Sally Coolatta
8278e621fb
Removed skin->availability
...
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.
This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.
Other changes made to accommodate this:
- R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
- I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.
Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
2021-04-25 07:18:32 -04:00
Zwip-Zwap Zapony
acff5c1ada
Merge branch 'next' into drawcroppedpatch-improvements
2021-04-25 10:15:16 +02:00
Radicalicious
e510e71617
Remove fire shield flash
2021-04-23 15:50:48 -04:00
Tatsuru
4f2f94d02d
Compatibility with the current identifier
2021-04-21 22:22:37 -03:00
Tatsuru
da56e84d2c
Change TOL_ERZ3 identifier
2021-04-21 22:17:16 -03:00
Sally Coolatta
57d81ddb21
Kart cmd->latency port
...
Nev3r was talking about something that would've been drastically improved with this, and it is really simple, so I ported it :)
2021-04-21 19:58:14 -04:00
SMS Alfredo
abc886b9ac
REVERSESUPER rises from the grave
2021-04-21 18:20:56 -05:00
GoldenTails
e7156db79d
Allow Lua to draw level title strings, and get the width and height of what would be drawn
2021-04-20 23:52:25 -05:00
GoldenTails
43c21edcbd
Send IntermissionThinker and intermission hud hooks stagefailed
.
2021-04-20 23:52:25 -05:00
GoldenTails
aa54a04c9e
Allow Lua to stop the intermission level title strings from drawing
2021-04-20 23:52:25 -05:00
GoldenTails
6c4e7e13e0
Allow Lua to disable the emeralds that appear in the Special Stage intermission.
2021-04-20 23:52:25 -05:00
Sally Coolatta
ce3c5e081e
Missed a few lines in the prev commit
2021-04-20 22:19:56 -04:00
Sally Coolatta
8f01e85ade
Allow spaces in captions defined in SOC
2021-04-20 22:10:11 -04:00
Jaime Ita Passos
77b8578d04
Add ease Lua library
2021-04-19 21:42:00 -03:00
Sally Coolatta
41f492f2f9
Don't award any potentially cheesable bonuses if the stage was failed.
...
Time Bonus is 0'd out if the stage was failed, since you can defeat the whole point of it if the stage lets you fail it immediately. Same with Guard Bonus -- it's not really a no-hit run if you didn't interact with anything.
Kept others that are more effort-based like Ring Bonus to give the player a little bit of partial credit, especially since Special Stages do this too.
2021-04-19 17:59:55 -04:00
Sally Coolatta
30e7455178
Failing a stage just displays the level title
2021-04-19 17:50:49 -04:00
Sally Coolatta
d8d3dee46f
Add linedef executor for toggling stagefailed
...
By default, the executor will fail the stage. If Not Climbable is checked, the stage can be completed normally again.
2021-04-19 17:20:34 -04:00
SMS Alfredo
228668ce98
Change the render flags to extra flags and improve SF_NOSUPERSPRITES
2021-04-19 14:25:34 -05:00
Jaime Ita Passos
b026a6991c
Easing functions
2021-04-19 15:52:07 -03:00
sphere
d71b99a56b
Merge branch 'comparepolygons-fix' into 'next'
...
Remove bad pointer arithmetic in polygon comparators (fixes #295 )
Closes #295
See merge request STJr/SRB2!1462
2021-04-19 14:33:41 -04:00
sphere
164fbeff91
Merge branch 'fix-perfstats-3' into 'next'
...
Fix incorrect values caused by outdated use of timing functions in perfstats 3
See merge request STJr/SRB2!1460
2021-04-19 14:33:31 -04:00
sphere
194d0b8201
Merge branch 'interfission' into 'next'
...
Cache teamflags/icons before drawing if they don't exist yet (closes #511 )
Closes #511
See merge request STJr/SRB2!1459
2021-04-19 14:33:23 -04:00
sphere
315582bd6c
Merge branch 'fix-blendtables' into 'next'
...
Fix blend tables generation
See merge request STJr/SRB2!1458
2021-04-19 14:33:12 -04:00
sphere
d871612a72
Merge branch 'openglol' into 'next'
...
Fix HWR_DrawSprite sigsegv
See merge request STJr/SRB2!1454
2021-04-19 14:33:03 -04:00
Sally Coolatta
d59f25a6cd
stagefailed is more useful
...
- Can now apply to normal stages, simply defaults to "false" in normal stages.
- Post-level cutscenes are now always skipped when the stage was failed.
- Exposed the boolean as a Lua read+write global.
Desired for SUGOI, as it allows for visited flags not be updated, and level completion emblems to not be awarded. Which means a lot less crappy non-ideal workarounds.
Normal stage intermission currently does not reflect failure state at all. Maybe it could always skip, never award score bonuses, have different text... etc. Probably would leave that up to vanilla dev opinion.
2021-04-18 12:59:49 -04:00
Hannu Hanhi
ee578b68f4
Remove bad pointer arithmetic in polygon comparators, that was causing glitches
2021-04-17 03:11:29 +03:00
katsy
d35a1811d6
clean up bouncy fof code
2021-04-16 04:49:33 -05:00
Hannu Hanhi
3670af5a31
Fix incorrect values caused by outdated use of timing functions in perfstats 3
2021-04-16 00:38:34 +03:00
katsy
7b83345c75
need to create the patches here if they don't already exist
2021-04-14 19:29:53 -05:00
Jaime Ita Passos
d5e9005dd0
Fix NPOT flats, other minor changes.
2021-04-14 11:34:36 -03:00
Jaime Ita Passos
b3d7df74c0
This is my attempted fix for texture rotation on slopes, in Software.
2021-04-14 10:55:52 -03:00
Jaime Ita Passos
0d4d2ed6d8
Fix blend tables generation
2021-04-13 12:11:31 -03:00
katsy
23759c67aa
move HWR_GetMappedPatch earlier
2021-04-12 21:26:29 -05:00
X.organic
6f0b4a4f6d
Remove some dead code from DEH_LoadDehackedFile
...
Also fixes a buffer overflow, but said overflow generally got caught by
the stack smashing protector. Still, it's better for SOC files not to be
able to crash the game that easily.
2021-04-12 19:09:21 +02:00
X.organic
f0f3b33d71
Edit note_size alias to get rid of warnings
2021-04-12 19:09:21 +02:00
X.organic
701c6c8968
Fix myhashfgets-related buffer overflows in deh_soc.c
2021-04-12 19:09:12 +02:00
GoldenTails
8f322fd86f
name kinda sucked
2021-04-11 18:33:11 -05:00
GoldenTails
4f3802a2cc
acos Lua exposure
2021-04-11 18:32:49 -05:00
sphere
bcd3245b76
Merge branch 'blendmode-revision' into 'next'
...
Blending changes
See merge request STJr/SRB2!1446
2021-04-11 08:18:12 -04:00
sphere
00e81cac8e
Merge branch 'badflags' into 'next'
...
Fix CTF flag patch garbage (resolves #506 )
Closes #506
See merge request STJr/SRB2!1453
2021-04-10 11:34:07 -04:00
sphere
1d863408c7
Merge branch 'dedicated-scoretally-crash-fix' into 'next'
...
Fix dedicated server crashing when exiting special stage (Fixes #453 )
Closes #453
See merge request STJr/SRB2!1451
2021-04-10 11:34:00 -04:00
sphere
d18ef87465
Merge branch 'gl-deletetexture-fix' into 'next'
...
Fix a OpenGL backend DeleteTexture crash (Fixes #499 )
Closes #499
See merge request STJr/SRB2!1448
2021-04-10 11:33:53 -04:00
katsy
876daa7d6e
fix ctf flag garbage
2021-04-07 04:57:18 -05:00
SMS Alfredo
3f086ff612
The intial
2021-04-07 01:14:32 -05:00
Steel Titanium
77f2b1f682
Prevent redudant result patch caching on competition
2021-04-07 01:11:39 -04:00
Steel Titanium
a501b7b00d
Reorganize the switch block, add missing int_comp case
2021-04-07 00:55:08 -04:00
James R
1db163f942
Merge branch 'master' into next
2021-04-06 16:19:15 -07:00
SwitchKaze
c3d5740e98
Fix console text bleeding edge case
...
A single character could prematurely read if there were enough special characters to push 'c' past 'con_width'.
2021-04-06 15:06:44 -05:00
James R
e39bf7503f
Makefile: fix object file not depending on headers
...
BRUH MOMENT
2021-04-06 03:55:57 -07:00
Steel Titanium
101b6e46d4
Even more bruhs
2021-04-05 22:56:03 -04:00
Steel Titanium
33b7075d46
bruh
2021-04-05 22:50:22 -04:00
Steel Titanium
35c0f8b5cc
Correct function name comment
2021-04-05 22:44:16 -04:00
Steel Titanium
397fdef034
Load intermission patches in Y_LoadIntermisionData
2021-04-05 22:34:52 -04:00
Lach
c99e53d735
Merge branch 'dashmode-crash' into 'next'
...
Fix jet fume crash when dashmode is above DASHMODE_MAX
See merge request STJr/SRB2!1450
2021-04-05 21:30:16 -04:00
James R
a01a420aa0
Brackets
2021-04-05 18:10:34 -07:00
Sally Coolatta
3dd04b90c6
Fix jet fume crash when dashmode is above DASHMODE_MAX
...
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
2021-04-05 16:59:02 -04:00
LJ Sonic
2c1b383c4a
Merge branch 'uppercase-tty' into 'next'
...
Let uppercase letters thru dedicated console
See merge request STJr/SRB2!1449
2021-04-05 07:33:42 -04:00
GoldenTails
776ce2a750
bruh i messed up
2021-04-05 04:20:09 -05:00
GoldenTails
5b2abfa18d
Replace some decimal constants with more descriptive hex constants.
2021-04-05 04:19:35 -05:00
James R
84191252d2
Remove code that converts uppercase letters to lower, when coming from dedicated console
2021-04-04 17:01:54 -07:00
Hannu Hanhi
e9213b2b41
Fix a OpenGL backend DeleteTexture crash
2021-04-04 21:29:15 +03:00
katsy
57c7a18a20
don't say we launched if we didn't actually launch
2021-04-02 20:50:56 -04:00
SwitchKaze
3895c02330
Revert "Remove key stuff"
...
This reverts commit a439e569
2021-04-02 15:46:08 -05:00
SwitchKaze
0db07cef0e
Adjust joystick axis enum
2021-04-02 15:46:08 -05:00
SwitchKaze
5a247bf375
Fix typo in comment of I_GetMouseGrab
2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58
Remove key stuff
2021-04-02 15:46:08 -05:00
SwitchKaze
eb2dc9e99b
Mouse improvements
2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a
Expose inputs to Lua
2021-04-02 15:45:59 -05:00
SwitchKaze
6bf76602ed
Refactor mouse
2021-04-02 15:22:22 -05:00
LJ Sonic
99c773f39e
Merge branch 'dontdothisinsoftwarelol' into 'next'
...
don't HWR_ClearAllTextures() in software (fixes #389 )
Closes #389
See merge request STJr/SRB2!1440
2021-03-31 16:19:18 -04:00
LJ Sonic
4ef3477054
Merge branch 'smoother-freelook' into 'next'
...
Smoother freelook in Software
See merge request STJr/SRB2!1444
2021-03-31 16:17:40 -04:00
LJ Sonic
a584d7edea
Merge branch 'playercanenterspingaps' into 'next'
...
Do not let SF_NOJUMPSPIN characters enter sectors they could not enter if standing at full height (Closes #457 )
Closes #457
See merge request STJr/SRB2!1432
2021-03-31 16:15:35 -04:00
LJ Sonic
933fad7702
Merge branch 'fix-luafile-transfer' into 'next'
...
Prevent a single client from blocking Lua file transfers
See merge request STJr/SRB2!1435
2021-03-31 14:28:22 -04:00
LJ Sonic
4b15b52dfc
Our menu system sucks. That's all I have to say.
2021-03-31 19:49:37 +02:00
katsy
d1700bbf18
Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol
2021-03-31 03:15:31 -05:00
Jaime Ita Passos
7e6bc97240
Smoother freelook in Software
...
Mhm hmm...
2021-03-30 22:52:50 -03:00
Jaime Ita Passos
59be35e533
Rename functions, make more efficient, fix subtractive in Software
2021-03-30 22:12:31 -03:00
Jaime Ita Passos
eece82c481
Blend modes revision
...
This changes how blend modes render, and includes fixes.
2021-03-30 17:03:05 -03:00
Monster Iestyn
0d5284c36c
Murder MSDOS
, another of the remaining DOS port related macros
...
I also put in a missing `defined (__APPLE__)` in d_netcmd.h related to cv_mouse2opt
Also removed a redundant `!defined (__APPLE__)` in d_main.c
2021-03-30 19:27:10 +01:00
Jaime Ita Passos
4025a1d517
[Software] A few floorsprite fixes
...
This fixes the texture of the floorsprite sometimes facing the wrong way, since plane rendering can change the view angle.
2021-03-29 23:04:13 -03:00
namishere
32a4b270df
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into buttered-lua
2021-03-29 16:15:50 -07:00
Mari0shi06
29704e141b
Change Raspberry's chat colormap to V_ROSYMAP
2021-03-28 17:29:24 -04:00
Mari0shi06
715a3661b5
Revert "Change Raspberry's chat color to V_ROSYMAP"
...
This reverts commit 192fa5cb4b
2021-03-28 21:27:46 +00:00
Mari0shi06
192fa5cb4b
Change Raspberry's chat color to V_ROSYMAP
2021-03-28 17:26:41 -04:00
Mari0shi06
424f67a74b
Revert "Change Raspberry's chat colormap to V_ROSYMAP"
...
This reverts commit 428ae3127e
2021-03-28 21:19:26 +00:00
Mari0shi06
428ae3127e
Change Raspberry's chat colormap to V_ROSYMAP
2021-03-28 17:12:58 -04:00
katsy
d6eaf7e0ff
clear before switching, not after
2021-03-28 12:22:04 -05:00
katsy
55d63000f4
don't HWR_ClearAllTextures() in software
2021-03-27 18:30:59 -05:00
Monster Iestyn
df9b5c4312
Merge branch 'avoid-savemoddata' into 'next'
...
Fix addons with custom gamedata not loading
Closes #473
See merge request STJr/SRB2!1427
2021-03-26 13:06:49 -04:00
lachablock
8162d90c94
Fix LUAh_PlayerHeight returning wrong default value
2021-03-26 18:01:55 +11:00
LJ Sonic
854e43ea7c
Kick clients if they take too long to download a Lua file
2021-03-25 22:43:06 +01:00
LJ Sonic
b6e5837161
Use a separate transfer status for disconnected nodes
2021-03-25 22:28:35 +01:00
SteelT
fa8947ad8f
Merge branch 'no-apng-compile-fix' into 'next'
...
Fix unused variable warning when USE_APNG is not defined
See merge request STJr/SRB2!1343
2021-03-25 14:02:23 -04:00
SwitchKaze
6267abac8a
Fix console text bleeding
2021-03-25 12:43:30 -05:00
lachablock
000e865f80
Revise spinheight/gap entry conditions (again), let's keep things WAY simpler:
...
- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
2021-03-25 21:42:25 +11:00
lachablock
6ea9653681
Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks
2021-03-25 21:41:09 +11:00
lachablock
b1a9262889
Fix P_PlayerCanEnterGaps issues with polyobject collision
2021-03-25 15:58:52 +11:00
lachablock
f99d89742a
Revise conditions under which players use spinheight and enter gaps:
...
- players with SF_NOJUMPDAMAGE but *not* SF_NOJUMPSPIN now always use spinheight while jumping (i.e. even with PF_NOJUMPDAMAGE), as long as their panim is PA_JUMP or PA_ROLL
- players with SF_NOJUMPSPIN no longer use spinheight while jumping (but,)
- PA_ROLL is now an acceptable condition for using spinheight (but not for entering gaps, e.g. S3K shields will shrink the hitbox but not allow gap entry on their own)
- flying players now only use spinheight if they do not have SF_NOJUMPSPIN (you're welcome, EggpackRE)
- players with neither SF_NOJUMPSPIN nor SF_NOJUMPDAMAGE use the same conditions as in 2.2.9 prerelease, i.e. use spinheight and can enter gaps unless they have PF_NOJUMPDAMAGE
2021-03-25 15:57:35 +11:00
Monster Iestyn
7511911846
Merge branch 'custom3dcrash' into 'next'
...
Fix sigsegv caused by bad target check in A_Custom3DRotate
See merge request STJr/SRB2!1430
2021-03-24 14:24:21 -04:00
Monster Iestyn
4a898bace6
Merge branch 'next' into monster-cleaning-up-again
2021-03-24 15:39:38 +00:00
Monster Iestyn
91187f91be
Merge branch 'fix-opengl-drawcroppedpatch' into 'next'
...
Fix OpenGL V_DrawCroppedPatch (Fixes #452 )
Closes #452
See merge request STJr/SRB2!1412
2021-03-24 11:34:58 -04:00
Jaime Ita Passos
08937f892a
Allocate a buffer for non-RGBA to RGBA texture conversions.
...
UpdateTexture will I_Error (from AllocTextureBuffer) if the allocation fails.
2021-03-23 01:18:28 -03:00
lachablock
0405b3922c
Do not let nonspin characters enter sectors they could not enter if standing at full height
2021-03-23 15:09:04 +11:00
lachablock
5ed5984cc5
Make more player abilities and all shieldabilities remove PF_SPINNING on use
2021-03-23 15:03:12 +11:00
lachablock
04c0217774
Revert "Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly"
...
This reverts commit 4f18f6d3cf
.
2021-03-23 14:50:05 +11:00
Jaime Ita Passos
dca158096d
Experimental implementation
2021-03-22 23:56:55 -03:00
Monster Iestyn
ee8acccd3c
RETURN OF THE PORTS CHOPPING BLOCK: Destroy DOS!
...
Remove all remaining traces of the following macros for the obsolete DOS port, which were missed previously:
* `DJGPP`
* `__DJGPP__`
* `DJGPPDOS`
* `PC_DOS`
* `WATTCP`
May get rid of `MSDOS` later once I get word on whether I should kill it or not
2021-03-22 14:43:26 +00:00
Monster Iestyn
2aaaddae7c
Fix mistake I made with my previous commit for r_skins.c
2021-03-22 14:17:22 +00:00
Monster Iestyn
571d6c5438
Merge branch 'next' into monster-cleaning-up-again
2021-03-22 13:53:53 +00:00
katsy
42cfcbf7be
fix sigsegv in A_Custom3DRotate
2021-03-21 16:09:11 -05:00
Monster Iestyn
b882aea2e4
Fix clobbering error in hw_md2.c by adding "volatile" to png_FILE.
...
(Apparently Kart made this exact fix 2 years ago and it was never backported?)
2021-03-21 19:49:32 +00:00
lachablock
4f18f6d3cf
Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly
2021-03-18 14:48:15 +11:00
sphere
0c22fecafa
Make horizontal springs above floors put the player in spring state.
2021-03-17 12:42:18 +01:00
sphere
95eff8cbc5
Avoid savemoddata being set in W_InitFile to fix addons with gamedata.
2021-03-15 18:11:02 +01:00
lachablock
36c2be283c
Disallow write_backtrace on Windows entirely
2021-03-15 15:17:55 +11:00
Lach
91c9d667e1
Merge branch 'final-tweaks' into 'next'
...
More final tweaks for 2.2.9 I guess
See merge request STJr/SRB2!1417
2021-03-14 20:52:47 -04:00
Lach
cf42a62b7e
Merge branch 'dropdropSHAdow' into 'next'
...
Papersprite dropshadows no longer askance
Closes #409
See merge request STJr/SRB2!1408
2021-03-14 20:52:25 -04:00
Lach
6ab5432713
Merge branch 'opengl-renderflags-fix' into 'next'
...
Fix a few renderflags oversights in OpenGL
See merge request STJr/SRB2!1422
2021-03-14 20:51:57 -04:00
Hannu Hanhi
746c84e0b5
Fix wrong color on player models' first frame by updating variable after loading blend texture
2021-03-13 23:07:51 +02:00
LJ Sonic
efdfa55328
Remove misleading comment
2021-03-12 19:54:01 +01:00
Lachlan Wright
c589fe85e4
Merge branch 'ogl-compileshaders-bug' into 'next'
...
Remove misplaced SetShader call in CompileShaders (Fixes #402 )
Closes #402
See merge request STJr/SRB2!1423
2021-03-09 00:14:17 -05:00
Lachlan Wright
d97de6d3bd
Merge branch 'sw-culling-inaccuracy' into 'next'
...
Use double precision in R_StoreWallRange sloped seg culling calculations (Fixes #434 )
Closes #434
See merge request STJr/SRB2!1424
2021-03-09 00:13:53 -05:00
LJ Sonic
0765004188
Merge branch 'print-backtrace' into 'next'
...
Print a backtrace when SRB2 crashes in a Unix-like environment.
See merge request STJr/SRB2!1288
2021-03-07 08:26:44 -05:00
Hannu Hanhi
8cc49a0f2e
Use double precision in R_StoreWallRange sloped seg culling calculations
...
Fixes culling issues in CEZ2 skybox
2021-03-06 19:56:25 +02:00
Hannu Hanhi
caab4e96cd
Remove misplaced SetShader call in CompileShaders
2021-03-06 19:38:17 +02:00
Jaime Ita Passos
f6cb1798cc
Fix a few renderflags oversights in OpenGL
2021-03-02 02:27:14 -03:00
Lachlan Wright
e03700fc2a
Merge branch 'nogmever' into 'next'
...
Check if GME_VERSION is defined.
See merge request STJr/SRB2!1372
2021-03-01 17:50:48 -05:00
Lachlan Wright
fc1bc94d9a
Merge branch 'fix-flipped-bounce' into 'next'
...
Fix CA_BOUNCE height when flipped (Fixes #428 )
Closes #428
See merge request STJr/SRB2!1373
2021-03-01 17:49:54 -05:00
Steel Titanium
d59de95262
Merge branch 'master' into next
2021-03-01 16:55:48 -05:00
Lachlan Wright
49c68d279d
Merge branch 'marathon-pause-fix' into 'next'
...
Disable pausing during score screens in marathon mode
See merge request STJr/SRB2!1416
2021-03-01 16:51:28 -05:00
Lachlan Wright
b8873e8182
Merge branch 'skincolor-modif-fix' into 'next'
...
Fix translation colormap cache rebuilding using the old translation enumerations (fixes #443 , #449 , #459 )
Closes #443 , #449 , and #459
See merge request STJr/SRB2!1421
2021-03-01 16:49:20 -05:00
Lachlan Wright
588a40453b
Merge branch 'linkdraw-scale-fix' into 'next'
...
Fix thing scale mismatch in R_DrawVisSprite. (Fixes #458 )
Closes #458
See merge request STJr/SRB2!1420
2021-03-01 16:49:10 -05:00
Lachlan Wright
94c7124904
Merge branch 'revert-9649a9fb' into 'next'
...
Revert "Merge branch 'player-speed' into 'next'"
Closes #466 and #471
See merge request STJr/SRB2!1418
2021-03-01 16:49:00 -05:00
James R
5f4e21ed3a
Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files
2021-02-28 17:02:08 -08:00
Jaime Ita Passos
94fe7a3d8c
Change I_Error message
2021-02-28 17:47:12 -03:00
Jaime Ita Passos
401271feb7
Fix translation colormap cache rebuilding using the old translation enumerations
...
This was causing a buffer underwrite too. Lovely.
2021-02-28 17:05:25 -03:00
Jaime Ita Passos
07ffe2599c
Fix thing scale mismatch in R_DrawVisSprite
2021-02-28 16:23:40 -03:00
GoldenTails
a0396d5e43
Make it more async-signal-safe
2021-02-27 18:07:47 -06:00
GoldenTails
bdb28a06f4
Print the backtrace before showing the signal handler popup.
2021-02-27 18:07:47 -06:00
GoldenTails
5108f1f57b
Use file descriptors and ditch file streams, for now.
2021-02-27 18:07:47 -06:00
GoldenTails
4016a2e062
Crash backtrace logging for NEWSIGNALHANDLER.
2021-02-27 18:07:47 -06:00
Jaime Ita Passos
a1e0aa1812
Fix "implicit declaration of function 'DEH_TableCheck'" warning
2021-02-27 12:04:48 -03:00
Lachlan Wright
77feee73c3
Revert "Merge branch 'player-speed' into 'next'"
...
This reverts merge request !1309
2021-02-27 03:38:13 +00:00
Riku Salminen
8bcc71c629
Disable pausing during score screens in marathon mode
2021-02-26 15:43:53 +02:00
LJ Sonic
75d0e70236
Fix sector tags being signed in Lua
2021-02-25 23:41:43 +01:00
GoldenTails
12205314bc
Check against null tmpusher source before attempting to push a thing.
2021-02-21 19:32:00 -06:00
Zwip-Zwap Zapony
308ab0e079
Fix OpenGL V_DrawCroppedPatch
2021-02-21 22:16:38 +01:00
toaster
73758f50ff
Fix dropshadows of papersprites drifting depending on angle relative to camera. Discovered in Kart internal for the paper item drops and ported back, hence the branch name.
2021-02-19 06:45:28 -05:00
James R
747c278bc2
Makefile: add a SILENT flag
...
This makes it print nothing to stdout.
Also fixed some irregularities.
2021-02-18 07:24:20 -08:00
James R
3d32f3145c
Generate individual dependency files
...
This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.
As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
2021-02-18 06:23:18 -08:00
James R
3003c252d1
Makfile: don't print some messages twice
2021-02-18 06:23:12 -08:00
sphere
998d065698
Add more actions for slope copying & update the ZB config.
2021-02-17 16:06:02 +01:00
X.organic
0cbf9a791b
Fix indentation in MOBJCONSISTANCY conditional
2021-02-16 23:27:44 +01:00
X.organic
90611ed547
Fix MOBJCONSISTANCY and make it optional in DEBUGMODE
...
MOBJCONSISTANCY checks confined to gamestate GS_LEVEL. DEBUGMODE
no longer implicitly enables them, making it netgame-compatible.
2021-02-16 21:36:28 +01:00
X.organic
205ccc2727
Move Dehacked table sanity check to deh_tables.c
2021-02-16 19:46:31 +01:00
LJ Sonic
7133c703b4
Show an alternate ping icon when the player is disconnected
2021-02-15 22:19:48 +01:00
LJ Sonic
97daba68d0
Enable rejointimeout by default
2021-02-15 16:24:30 +01:00
LJ Sonic
aa33d90215
Add rejointimeout to the server options
2021-02-15 16:23:57 +01:00
LJ Sonic
0b012d5db0
Make the names of disconnected players flicker in tab HUD
2021-02-15 16:21:26 +01:00
LJ Sonic
b369243beb
Use standard Lua naming scheme for polyobject list
2021-02-15 13:37:25 +01:00
Nev3r
66d858fbcb
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations
...
# Conflicts:
# src/p_spec.c
2021-02-15 09:20:40 +01:00
SMS Alfredo
4430835a71
This might be dumb, but whatever
2021-02-14 20:49:03 -06:00
lachwright
cf389179e8
Rollout rock improvements:
...
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
2021-02-15 01:11:03 +11:00
LJ Sonic
70850b0836
Deprecate P_AproxDistance for Lua scripts
2021-02-13 18:04:27 +01:00
LJ Sonic
758de501da
Use R_PointToDist2 for the Lua versions of P_AproxDistance and FixedHypot
2021-02-13 18:04:12 +01:00
LJ Sonic
a58df577fe
Revert "Use FixedHypot over P_AproxDistance"
...
This reverts commit c5474436af
.
2021-02-13 17:46:29 +01:00
LJ Sonic
d2d1f83b62
Revert "Use R_PointToDist2 instead"
...
This reverts commit e19196a86e
.
2021-02-13 17:45:54 +01:00
LJ Sonic
09d911a5b6
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 75633bde50
.
2021-02-13 17:45:20 +01:00
Nev3r
a57c695f79
Update example comment.
2021-02-11 14:22:49 +01:00
Nev3r
fbe2a19c60
Fix __LINE__ macro expansion via recursive macro expansion; C macros sure are something sometimes...
2021-02-11 14:12:50 +01:00
Nev3r
eda6b0ad8e
Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros.
...
Declare the position counters inside the for loops instead; RIP C90.
2021-02-11 13:24:20 +01:00
namishere
326be01276
Expose P_ButteredSlope to lua
2021-02-11 04:06:40 -08:00
LJ Sonic
dfc1767794
Only call PlayerCmd hooks if added to game
2021-02-11 00:24:42 +01:00
LJ Sonic
3dff1eb1b7
Fix consoleplayer returning the server player during joining phase
2021-02-11 00:10:15 +01:00
SteelT
6089550972
Merge branch 'gl-texture-management' into 'next'
...
Manage uploaded OpenGL textures with an internal list
Closes #411
See merge request STJr/SRB2!1391
2021-02-07 13:37:33 -05:00
James R
5b287f9cce
Merge branch 'fix-doublejump-divby0' into 'next'
...
Fix a divby0 when you have specific character stats.
See merge request STJr/SRB2!1374
2021-01-31 01:17:41 -05:00
Jaime Ita Passos
8318935811
Remove GLMipmap_t.nextmipmap
2021-01-27 21:23:20 -03:00
Jaime Ita Passos
4891611ab7
tRNS chunk fix
...
Fixes a faulty check not properly detecting the presence of a tRNS chunk.
2021-01-27 19:23:04 -03:00
Jaime Ita Passos
d4044a4f82
Add PF_ColorMapped
...
Not all surfaces have tint and fade colors. Checking for a specific surface flag, that tells the backend those colors are present, avoids uninitialized reads.
2021-01-27 18:54:33 -03:00
Jaime Ita Passos
5501d495c7
OpenGL backend: Manage uploaded GPU textures with an internal list
...
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
2021-01-27 17:48:57 -03:00
James R
29b6bd5df9
Merge branch 'fix-mobj-slidemove' into 'next'
...
Make sliding against objects actually work (Fixes #400 )
Closes #400
See merge request STJr/SRB2!1348
2021-01-26 20:43:17 -05:00
LJ Sonic
36c193f317
Merge branch 'fix-boss2pogotarget' into 'next'
...
Make several actions actually check for a player smh (Fixes #387 )
Closes #387
See merge request STJr/SRB2!1340
2021-01-25 18:11:38 -05:00
LJ Sonic
83947d4428
Merge branch 'redundant-hypot' into 'next'
...
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
LJ Sonic
2d3e302929
Merge branch 'mode0-centering' into 'next'
...
Fix video mode 0 not getting centered
See merge request STJr/SRB2!1344
2021-01-25 17:59:26 -05:00
LJ Sonic
14ee92ef67
Merge branch 'gl-levelflat-fix' into 'next'
...
Fix a misuse of levelflat_t.picture in OpenGL
See merge request STJr/SRB2!1327
2021-01-25 16:40:02 -05:00
Shane Ellis
ca00e2d508
correction to nights bot clause
2021-01-24 12:46:03 -05:00
Shane Ellis
ea6879b5c2
missed a couple spots
2021-01-24 12:43:13 -05:00
CobaltBW
a2fce68f14
Specialized Lua function for bot removal
2021-01-23 17:01:48 -08:00
CobaltBW
93ec472c78
Expose BOT_ to lua
2021-01-23 14:49:20 -08:00
CobaltBW
0a60fe0b1d
Almost forgot: player.blocked
2021-01-23 14:05:36 -08:00
CobaltBW
b112e12c93
Merge remote-tracking branch 'origin/next' into addplayer
2021-01-23 13:33:19 -08:00
Shane Ellis
135032c293
Correction to implicit declaration of B_UpdateBotleader()
2021-01-23 10:58:34 -05:00
Shane Ellis
1274b4651e
Added botstuffs to savestate
2021-01-23 10:39:59 -05:00
Shane Ellis
25bf4b54e2
Restructured botticcmds into G_Ticker
2021-01-23 10:36:44 -05:00
Shane Ellis
4e47f240ad
Add new botstuffs
2021-01-23 10:30:07 -05:00
Shane Ellis
b8fea55f67
Update b_bot.c
2021-01-23 10:25:35 -05:00
Shane Ellis
fd536e91a3
void B_UpdateBotleader(player_t *player);
2021-01-23 10:17:05 -05:00
Shane Ellis
2016caa70b
Update references to player->bot
2021-01-23 10:16:27 -05:00
Shane Ellis
2e528216ac
Updated references to player->bot
2021-01-23 10:15:33 -05:00
Shane Ellis
2abf89e800
Update G_AddPlayer()
2021-01-23 10:13:16 -05:00
Shane Ellis
c391d76c11
buttons_last -> lastbuttons
2021-01-23 10:06:47 -05:00
Shane Ellis
ce8e389a2d
Add lua player.botleader and player.buttons_last (read+write)
2021-01-23 09:49:57 -05:00
LJ Sonic
41f1b3cfa3
Merge branch 'jimita-why-you-done-this!!!' into 'next'
...
Fix mobj unarchiving code
See merge request STJr/SRB2!1384
2021-01-22 18:26:26 -05:00
Lachlan Wright
ea55a614d1
Merge branch 'flipped-waterrun' into 'next'
...
Allow water running in reverse gravity
See merge request STJr/SRB2!1369
2021-01-19 23:20:57 -05:00
Jaime Ita Passos
f3ad648874
Revert "Move a few mobj spawn defaults to its own function"
...
This reverts commit 6f9c48a305
.
# Conflicts:
# src/p_mobj.c
2021-01-17 23:17:46 +01:00
Shane Ellis
e19b085684
Netcode failsafe. At least until I can figure out the best way to produce bot cmds outside of player sends.
2021-01-15 22:56:48 -05:00
Shane Ellis
b73a15a0bf
fixed G_AddPlayer not sending return value
2021-01-15 22:50:15 -05:00
Shane Ellis
0e9b4acb58
Update g_game.c (Account for bot type 3)
2021-01-15 19:29:03 -05:00
Shane Ellis
1583bf126b
lua habits
2021-01-15 18:31:09 -05:00
Shane Ellis
505ba1ff63
Update g_game.c
2021-01-15 18:06:36 -05:00
Shane Ellis
225e7c72ac
Update p_mobj.c
2021-01-15 18:00:00 -05:00
Shane Ellis
9bbebcbe9e
Update d_clisrv.c
2021-01-15 17:55:14 -05:00
Shane Ellis
93562b782e
Revert "Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player…"
...
This reverts commit 079fe9ba7e
2021-01-15 22:50:20 +00:00
Shane Ellis
8fa8ca6222
Update r_skins.c
2021-01-15 17:47:26 -05:00
Shane Ellis
4e029dbc67
Update lua_baselib.c
2021-01-15 17:45:41 -05:00
Shane Ellis
00462323c3
Revert "Implementation of lua function P_AddPlayer()"
...
This reverts commit 5e8313e157
2021-01-15 22:42:35 +00:00
Shane Ellis
6103d7a51e
Update p_user.c
2021-01-15 17:41:16 -05:00
Shane Ellis
759ff44dfd
Revert "Add conditions for new player bot type"
...
This reverts commit b995e3cb75
2021-01-15 22:32:02 +00:00
Shane Ellis
161e1c42cb
Update p_enemy.c
2021-01-15 17:29:15 -05:00
Shane Ellis
56e9b99f28
Revert "Add conditions for new player bot type"
...
This reverts commit 4b9a95a538
2021-01-15 22:28:01 +00:00
Shane Ellis
a68fee3303
oops
2021-01-15 17:22:38 -05:00
Shane Ellis
079fe9ba7e
Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player instances (e.g. player bots)
2021-01-15 17:08:16 -05:00
Shane Ellis
edc312066d
Revert "CL_RemovePlayer() - Allow for removal of non-consoleplayer and…"
...
This reverts commit f166af4d8b
2021-01-15 22:01:51 +00:00
Shane Ellis
f166af4d8b
CL_RemovePlayer() - Allow for removal of non-consoleplayer and non-secondaryviewplayer player instances (e.g. bot players)
2021-01-15 17:00:21 -05:00
Shane Ellis
9eeaef2e32
Exception made in R_SkinUsable() for player bot types
2021-01-15 16:55:49 -05:00
Shane Ellis
5e8313e157
Implementation of lua function P_AddPlayer()
2021-01-15 16:50:01 -05:00
Shane Ellis
b995e3cb75
Add conditions for new player bot type
2021-01-15 16:48:19 -05:00
Shane Ellis
4b9a95a538
Add conditions for new player bot type
2021-01-15 16:46:15 -05:00
Shane Ellis
794d927670
Add conditions for new player bot type
2021-01-15 16:44:26 -05:00
Zippy_Zolton
216f227539
12
2021-01-13 12:03:02 -06:00
lachwright
a117ec9859
oops that doesn't work in reverse gravity
2021-01-14 04:34:43 +11:00
lachwright
149535634e
Keep Metal's jet fume at a consistent height during dashmode
2021-01-14 04:24:48 +11:00
lachwright
d2be3110bd
Have Metal Sonic use spinheight while dashing
2021-01-13 22:28:38 +11:00
Tatsuru
90b0242802
Put his name at the right order
2021-01-11 21:49:31 -03:00
Zippy_Zolton
129ac4633c
Increased launch height
2021-01-11 13:25:42 -06:00
Zippy_Zolton
1917155adf
PF_THOKKED
2021-01-11 00:19:56 -06:00
Zippy_Zolton
058b681660
P_SetObjectMomz
2021-01-10 22:01:41 -06:00
Zippy_Zolton
8e9073f11f
CR_PTERABYTE tweaks
2021-01-10 21:55:25 -06:00
Tatsuru
fbcc0c25b3
Add Logan to the art credits
2021-01-10 23:17:40 -03:00
Zippy_Zolton
8aac7454b8
Make Armageddon Shield instantly kill Egg Guards
2021-01-10 17:20:07 -06:00
Hannu Hanhi
d252f074b7
Render midtextures on two-sided lines with a z-buffer offset
...
This will fix z-fighting issues when they overlap with FOFs.
2021-01-10 21:33:54 +02:00
Hannu Hanhi
eb1e7eff8f
Take slopes into account even more in FOF wall cutoff in HWR_ProcessSeg
2021-01-10 20:52:03 +02:00
GoldenTails
59bc197f32
Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT.
2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony
679bf5f999
Fix CA_BOUNCE when flipped
...
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
2021-01-08 16:25:10 +01:00
SteelT
52c96239ba
Merge branch 'fix-lua-consvars-with-functions' into 'next'
...
Fix CV_RegisterVar returning LUA_GetErrorMessage to Lua when CV_CALL is involved. (Resolves #403 )
Closes #403
See merge request STJr/SRB2!1346
2021-01-07 16:33:39 -05:00
SteelT
4041e69fad
Merge branch 'pressing-two-keys-in-the-console-crashes-srb2' into 'next'
...
Pressing Ctrl+Backspace In An Empty Console Crashes SRB2
See merge request STJr/SRB2!1370
2021-01-07 16:32:51 -05:00
SteelT
da37d3c168
Merge branch 'fix-ticcmd-received' into 'next'
...
Fix TICCMD_RECEIVED being overridden by gamelogic
See merge request STJr/SRB2!1337
2021-01-07 16:31:45 -05:00
SteelT
d9bdced3df
Merge branch 'revert-8a30576d' into 'next'
...
Revert plane sorting changes
See merge request STJr/SRB2!1353
2021-01-07 16:20:30 -05:00
Steel Titanium
c8627464c9
Check if GME_VERSION is defined.
...
I made the assumption it would always be defined, which won't always be the case.
2021-01-06 19:40:30 -05:00
GoldenTails
70eb3228f8
Pressing A Key Combination In The Console Crashes SRB2
...
get stryder7x in on this
2021-01-05 13:20:02 -06:00
Tatsuru
1752f6efc1
Allow water running in reverse gravity
2021-01-04 18:10:41 -03:00
GoldenTails
3b4a52b8b8
Allows Lua to transport you to a different map in place of a Special Stage.
2021-01-04 00:03:18 -06:00
katsy
c19539248a
add sprung flag to steam
2020-12-31 04:38:26 -06:00
katsy
54d79415d5
add carry type to fans
2020-12-31 02:21:14 -06:00
Hannu Hanhi
ed82b94e64
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg
2020-12-29 23:29:00 +02:00
LJ Sonic
0de3a64b59
Let Lua toggle the crosshair
2020-12-29 21:36:15 +01:00
GoldenTails
50d46e1fa6
Set the target of a spawned ghost to where it came from.
2020-12-27 00:21:09 -06:00
GoldenTails
9327e96e4d
Pause the console refresh while startup wads are loading.
2020-12-26 17:19:14 -06:00
James R
4d6b677765
Revert "Merge branch 'plane-sorting-fix-part-3' into 'next'"
...
This reverts merge request !1235
2020-12-23 03:02:31 +00:00
James R
0d1050f360
Merge branch 'next' into 'next'
...
Return nil on skincolor invalid field access
See merge request STJr/SRB2!1351
2020-12-22 20:13:45 -05:00
SwitchKaze
ad8abcef09
Return nil on skincolor invalid field access
2020-12-21 15:48:49 -06:00
Jaime Ita Passos
abf0ca6690
Fix "missing initializer" warnings/errors in CVAR_INIT macros
2020-12-21 17:19:07 -03:00
GoldenTails
147c38c5ce
Make sliding against objects actually work
2020-12-21 02:03:44 -06:00
GoldenTails
971518d22e
Have Lua_OnChange restore the stack to what it was before it was called.
...
So we don't get Luas with access to LUA_GetErrorMessage.
2020-12-20 21:43:14 -06:00
Hannu Hanhi
6c330bbf16
Fix video mode 0 not getting centered
2020-12-21 00:03:20 +02:00
GoldenTails
08146c9cad
Have A_ThrownRing check for a player too
2020-12-19 21:30:13 -06:00
GoldenTails
60564197af
Have A_DetonChase check for a player too
2020-12-19 21:12:09 -06:00
GoldenTails
f9e5681a6b
Actually check for a player smh
2020-12-19 20:33:29 -06:00
Jaime Ita Passos
1254f691ee
Fix unused variable warning when USE_APNG is not defined
2020-12-19 17:40:18 -03:00
Jaime Ita Passos
4717261459
Optimize Picture_GetPatchPixel
2020-12-19 17:32:45 -03:00
GoldenTails
81ee4a75e3
Copy colormaps so Lua cannot modify cached colormaps! (And Z_Free them on garbage collection.)
2020-12-18 02:24:20 -06:00
GoldenTails
f91489bcb6
Make the colormap returned by v.getColormap() writable.
...
I mean it was already readable anyway...
2020-12-18 02:24:20 -06:00
James R
4713b25837
Bit array conflicts
2020-12-16 08:44:03 -08:00
James R
353692fa79
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2020-12-16 08:43:49 -08:00
LJ Sonic
b82cee780a
Fix TICCMD_RECEIVED being overridden by gamelogic
2020-12-16 17:35:39 +01:00
Nev3r
b642682dde
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-tag-iterator
...
# Conflicts:
# src/doomtype.h
2020-12-16 17:27:44 +01:00
Nev3r
98e67871f5
Merge branch 'fix-vibing-slopes' into 'next'
...
Fix vibing slope planes
See merge request STJr/SRB2!1335
2020-12-16 11:15:41 -05:00
Nev3r
ce89eb64ba
Merge branch 'plane-viewangle-fix' into 'next'
...
Restore the viewpoint's angle in R_DrawPlanes instead (related to #404 )
See merge request STJr/SRB2!1326
2020-12-16 11:15:27 -05:00
Nev3r
5b1732baa3
Merge branch 'binarymap-slopevertices-fix' into 'next'
...
Replace the first entry in slope vertex thing taglists, instead of adding into them (related to #404 )
See merge request STJr/SRB2!1333
2020-12-16 10:55:21 -05:00
Nev3r
c97056f9ce
Merge branch 'spritestuff2-archiving-fix' into 'next'
...
Fix archived mobjs having no default blend mode and sprite scales
See merge request STJr/SRB2!1300
2020-12-16 08:57:36 -05:00
Nev3r
60b3465002
Merge branch 'text-color' into 'next'
...
Improved text colormaps (Closes #222 and #359 )
Closes #222 and #359
See merge request STJr/SRB2!1202
2020-12-16 08:50:30 -05:00
Zippy_Zolton
45976d2304
magenta and green sonicx
2020-12-15 22:19:57 -06:00
Jaime Ita Passos
fa9db2d644
Fix vibing slope planes
...
I messed up the multiplication order for texture scaling: it multiplied a floating point number with a fixed point number, instead of multiplying two floats and then converting the result into a fixed point number.
2020-12-16 00:26:08 -03:00
James R
84e9020eed
Merge branch 'shieldless' into 'next'
...
Add new skin flag SF_NOSHIELDABILITY
See merge request STJr/SRB2!1331
2020-12-15 21:00:53 -05:00
James R
a36908a5ce
Merge branch 'amys' into 'next'
...
fix amy meeting herself in mario mode
See merge request STJr/SRB2!1330
2020-12-15 20:57:16 -05:00
James R
f9ce70a6b3
Merge branch 'picfmt-fixes' into 'next'
...
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats
See merge request STJr/SRB2!1324
2020-12-15 20:55:52 -05:00
James R
019082cf7a
Merge branch 'dusty' into 'next'
...
Make fiery spindust fullbright
See merge request STJr/SRB2!1317
2020-12-15 20:53:29 -05:00
Zippy_Zolton
29495ad436
Merge branch 'next' of https://github.com/STJr/SRB2 into text-color
2020-12-15 19:51:40 -06:00
James R
00c5d70bfc
Merge branch 'drain-antiri' into 'next'
...
Make Ring Drain sectors play the depletion sound instead of the ring sound
See merge request STJr/SRB2!1315
2020-12-15 20:51:39 -05:00
James R
cab089c5b1
Merge branch 'gl-colormap-update' into 'next'
...
Fix animated skincolors in OpenGL (resolves #187 , #247 , #301 , #370 )
Closes #187 , #247 , #301 , and #370
See merge request STJr/SRB2!1301
2020-12-15 20:50:45 -05:00
James R
14c6d93c0c
Merge branch 'team-elementalfire' into 'next'
...
Player-Colored Elemental Fire for competitive gametypes
See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
James R
804e049579
Merge branch 'intermission-double-free-fix' into 'next'
...
Fix double free occuring when unloading the intermission patches
See merge request STJr/SRB2!1304
2020-12-15 20:44:57 -05:00
James R
73a7365798
Merge branch 'circuit-finallap' into 'next'
...
Final lap text for circuit
See merge request STJr/SRB2!1303
2020-12-15 20:42:59 -05:00
James R
503364f5f8
Merge branch 'gme-spc-fix' into 'next'
...
Fix SPC looping on libgme versions >= 0.6.3
See merge request STJr/SRB2!1302
2020-12-15 20:40:10 -05:00
katsy
d999e436f1
GETFLAG
2020-12-14 20:23:24 -05:00
Zippy_Zolton
07034cf441
fixes spaces
2020-12-14 16:14:20 -06:00
Zippy_Zolton
9b8bacd088
Redone colormaps by SonicX8000
2020-12-14 12:52:24 -06:00
Jaime Ita Passos
3b36005ceb
Replace the first entry in the taglist, instead of adding into it
2020-12-14 14:13:24 -03:00
James R
d0f3a6d737
Better check for tag list userdata
2020-12-14 08:08:01 -08:00
James R
00dff6d283
Push "valid" only once
2020-12-14 05:53:57 -08:00
katsy
f09198788d
Merge remote-tracking branch 'stjr/next' into dusty
2020-12-14 05:39:35 -06:00
katsy
721170f5a0
lol
2020-12-14 05:32:51 -06:00
katsy
da7cdd92ff
Merge remote-tracking branch 'stjr/next' into dashaction
2020-12-14 05:10:01 -06:00
katsy
4521827e2c
you too
2020-12-14 04:06:28 -05:00
katsy
200e444016
go away whitespace
2020-12-14 04:05:14 -05:00
katsy
2bebaf12d0
add checks for new flag, make emergency jump call shieldspecial
2020-12-14 04:03:14 -05:00
katsy
dfbb1825f4
ditto
2020-12-14 04:02:17 -05:00
katsy
0ce9d9127a
add SF_NOSHIELDABILITY
2020-12-14 04:01:50 -05:00
katsy
2b23468359
remove amy
2020-12-14 02:36:00 -05:00
Zippy_Zolton
c247b94be7
Merge branch 'next' of https://github.com/STJr/SRB2 into text-color
2020-12-14 00:16:38 -06:00
Roberto Ierusalimschy
69e0240978
tables and strings respect __len metamethod
2020-12-13 21:25:11 -08:00
Jaime Ita Passos
6160a2d0fe
Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port)
2020-12-14 02:07:12 -03:00
Jaime Ita Passos
ca78fc69ca
Restore the viewpoint's angle in R_DrawPlanes instead
2020-12-14 01:14:55 -03:00
Jaime Ita Passos
7e0a1709de
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats
2020-12-14 00:53:42 -03:00
James R
760e083c30
Merge branch 'fix-playintro-crash' into 'next'
...
Fix intro crash
See merge request STJr/SRB2!1310
2020-12-13 22:17:25 -05:00
Steel Titanium
83e80eef9b
Add deprecation warning when using the level header parameter
2020-12-12 18:54:47 -05:00
James R
5bb221b3bf
Yeah Fuck You SEENAMES
2020-12-12 15:39:13 -08:00
James R
a86a7822d1
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2020-12-12 15:38:46 -08:00
James R
75633bde50
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
Sally Coolatta
e19196a86e
Use R_PointToDist2 instead
...
Apparently overflows less often
Actually, lets just fix FixedHypot instead.
Now FixedHypot uses the code from R_PointToDist2, and R_PointToDist2 just calls FixedHypot.
Ultimately, this branch was intended to get rid of a redundant way to retrieve distance and replace it with the one that was actually good at its job. So consolidating FixedHypot and R_PointToDist2 together is just an extension of that.
2020-12-12 14:49:26 -08:00
Sally Coolatta
c5474436af
Use FixedHypot over P_AproxDistance
...
Not convinced that the small speed benefit from P_AproxDistance is worth the "aproximate"[sic] results it gives. Let's instead try a define to replace it with FixedHypot. In Lua, the function gives a deprecated warning.
Inspired by the hyperwall fix for vanilla, except for everything. From little testing, actively improves waypoint checks, bumping, speed checks, wall collisions, Jawz targetting, Lightning Shield attacks, so on.
The only way I see this as a potential downgrade is A_Look (and related functions) getting slower, which are barely used in Kart.
2020-12-12 14:49:25 -08:00
James R
e94bccc503
Merge branch 'apng-downscale' into 'next'
...
Add aPNG downscaling
See merge request STJr/SRB2!1197
2020-12-12 17:39:56 -05:00
James R
9649a9fbae
Merge branch 'player-speed' into 'next'
...
Make player->speed and other things use R_PointToDist2
See merge request STJr/SRB2!1309
2020-12-12 17:38:02 -05:00
James R
69ea84db80
Merge branch 'credits-229' into 'next'
...
Add Zolton and Ors to the credits
See merge request STJr/SRB2!1308
2020-12-12 17:35:29 -05:00
James R
7b6675178e
Merge branch 'oldguards' into 'next'
...
Kill remaining HAVE_BLUA and SEENAMES
See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
93e4f43e4b
Hooklib macros names -> uppercase + documentation
2020-12-12 03:16:30 -08:00
James R
c8cc9c7a6f
Remove trailing whitespace
2020-12-12 02:40:46 -08:00
James R
143ec3e40b
Merge branch 'master' into next
2020-12-12 02:38:51 -08:00
James R
b31c4db89d
Remove trailing whitespace
2020-12-12 02:37:03 -08:00
James R
e55d842d7f
Kill SEENAMES
2020-12-12 02:11:23 -08:00
James R
9ddeb5f589
Resolve GameQuit hook conflicts
2020-12-12 02:05:21 -08:00
James R
2778cc3ce9
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2020-12-12 02:02:38 -08:00
katsy
2971156ba7
Update info.c
2020-12-11 23:39:42 -05:00
Steel Titanium
ab156e1709
Remove music slot compatibility
2020-12-11 23:11:15 -05:00
katsy
ddf743d521
make fire spindust dust fullbright
2020-12-11 20:59:14 -05:00
Zwip-Zwap Zapony
029e79024b
V_DrawCroppedPatch Lua exposure and improvements
...
Separated X and Y scale, and added colormap argument
Added V_*SCALEPATCH and V_PERPLAYER flags support
Made sx,sy,w,h into fixed-point values
Exposed to Lua as "v.drawCropped(...)"
(Also fix HWR_DrawStretchyFixedPatch ignoring vscale without pscale)
2020-12-11 23:43:38 +01:00
Zippy_Zolton
68de9f4bbe
Make Ring Drain sectors play the depletion sound instead of the ring sound
2020-12-11 12:34:30 -06:00
Zippy_Zolton
f2095b57fd
Player-Colored Elemental Fire for competitive gametypes
2020-12-10 20:37:50 -06:00
katsy
f79ded7c0b
scale minimum dashmode thok on actionspd, not normalspeed
2020-12-10 20:52:06 -05:00
Jaime Ita Passos
440f46144a
Fix intro crash
2020-12-10 22:01:53 -03:00
Zippy_Zolton
916cacb38f
snailer
2020-12-10 19:01:09 -06:00
Jaime Ita Passos
3472b3ece3
Fix ERZ3 mode
2020-12-10 21:55:22 -03:00
Zippy_Zolton
317c107064
Make player->speed use R_PointToDist2
2020-12-10 16:09:43 -06:00
James R
69d98b22ad
Credits: add Zolton and Ors to the programming section
2020-12-10 13:40:47 -08:00
James R
29745f80dc
Merge branch 'lua-skinsprites' into 'next'
...
Lua: Allow access to skin.sprites[]
See merge request STJr/SRB2!1238
2020-12-10 15:49:48 -05:00
James R
e05433f282
Merge branch 'fix-gl-draw-cropped' into 'next'
...
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.
See merge request STJr/SRB2!1297
2020-12-10 15:44:51 -05:00
James R
6d3442a5d7
Merge branch 'saloondoor-revengeance' into 'next'
...
Saloon door fixes (closes #394 )
Closes #394
See merge request STJr/SRB2!1296
2020-12-10 15:43:31 -05:00
James R
d8bf015467
Merge branch 'caret-color-letter' into 'next'
...
Make caret coloring support letters.
See merge request STJr/SRB2!1295
2020-12-10 15:41:02 -05:00
James R
7e8fc66654
Merge branch 'brak' into 'next'
...
Fix brak barrier size (Closes #139 )
Closes #139
See merge request STJr/SRB2!1294
2020-12-10 15:39:42 -05:00
James R
fc5708b2f2
Merge branch 'firemelt' into 'next'
...
Fix objects with MF_FIRE disappearing in lava (Closes #366 )
Closes #366
See merge request STJr/SRB2!1287
2020-12-10 15:37:57 -05:00
James R
c6dd218e2b
Merge branch 'dehacked-hell-bruh' into 'next'
...
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops
See merge request STJr/SRB2!1286
2020-12-10 15:36:01 -05:00
James R
8c74dd26a9
Merge branch 'ffloorclip-fixes' into 'next'
...
ffloorclip fixes (resolves #385 and #391 )
Closes #385 and #391
See merge request STJr/SRB2!1284
2020-12-10 15:35:39 -05:00
James R
e46c6e75f3
Merge branch 'metal-sigfpe' into 'next'
...
Fix a division by zero in BCZ2 Metal Sonic's routine
See merge request STJr/SRB2!1283
2020-12-10 15:35:03 -05:00
James R
413fa89555
Merge branch 'fixargstr' into 'next'
...
Fixargstr
See merge request STJr/SRB2!1280
2020-12-10 15:31:05 -05:00
James R
0b2e60ba1d
Merge branch 'my-junk' into 'next'
...
Initialize dummy linedef tag lists
See merge request STJr/SRB2!1279
2020-12-10 15:29:10 -05:00
James R
5a0d3981f1
Merge branch 'super-giverings' into 'next'
...
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50
See merge request STJr/SRB2!1278
2020-12-10 15:27:01 -05:00
James R
9ea969b62d
Merge branch 'gamequit-argument' into 'next'
...
Send a `quitting` argument to the GameQuit Lua hook.
See merge request STJr/SRB2!1276
2020-12-10 15:25:52 -05:00
James R
f180a1fc3c
Merge branch 'holy-zip' into 'next'
...
Disallow pk3s with extra bytes
See merge request STJr/SRB2!1275
2020-12-10 15:21:20 -05:00
James R
ef6f69ee22
Merge branch 'CR_BRUH' into 'next'
...
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
See merge request STJr/SRB2!1274
2020-12-10 15:20:11 -05:00
James R
703631956b
Merge branch 'dumb-stuff' into 'next'
...
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags
See merge request STJr/SRB2!1273
2020-12-10 15:17:28 -05:00
James R
ee48fa2de3
Merge branch 'mario1up' into 'next'
...
Fix normal one-up sound playing in Mario mode
See merge request STJr/SRB2!1272
2020-12-10 15:15:08 -05:00
James R
9a77cf6306
Merge branch 'lastlineshit' into 'next'
...
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability
See merge request STJr/SRB2!1271
2020-12-10 15:14:16 -05:00
James R
1d31fe3759
Merge branch 'exposed!!!' into 'next'
...
Expose player.skin and player.availabilities to Lua as Read-only
See merge request STJr/SRB2!1269
2020-12-10 15:09:55 -05:00
James R
77c51c62c2
Merge branch 'expose-selectheading' into 'next'
...
Expose mapheader_t's selectheading option to Lua
See merge request STJr/SRB2!1268
2020-12-10 15:07:23 -05:00
James R
857113b60e
Merge branch 'crunchyroll' into 'next'
...
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
See merge request STJr/SRB2!1267
2020-12-10 15:07:01 -05:00
James R
8701caa110
Merge branch 'blua-urite' into 'next'
...
Fix crash when trying to use bitwise NOT on true/false/nil
See merge request STJr/SRB2!1262
2020-12-10 15:03:39 -05:00
James R
c841750868
Merge branch 'no-spin-jump' into 'next'
...
Fix a Few Spin Related Bugs (Closes #286 and #360 )
Closes #286 and #360
See merge request STJr/SRB2!1256
2020-12-10 15:02:29 -05:00
James R
4275d52267
Merge branch 'marathon-mode-tokens' into 'next'
...
Fix emeralds, tokens, etc not resetting when restarting marathon mode in first level
See merge request STJr/SRB2!1252
2020-12-10 14:57:23 -05:00
Louis-Antoine
3aecc22764
Add a shorthand alias for FRACUNIT
2020-12-10 11:49:29 -08:00
Louis-Antoine
39a320734d
Add shorthand aliases for fixed-point functions
2020-12-10 11:48:40 -08:00
James R
a5d228773d
Merge branch 'reload-bans' into 'next'
...
Fix reloadbans clearing ban.txt and clearbans not actually saving the changes
See merge request STJr/SRB2!1215
2020-12-10 14:28:13 -05:00
James R
e4cf8ebcf5
Merge branch 'what-is-a-standard'
2020-12-10 11:23:53 -08:00
James R
dbd8903a53
Use ref for pushing error handler
2020-12-10 08:50:23 -08:00
James R
3f7c2ae0b0
Avoid using multiple tables to fetch hook
...
String hooks still use a table to fetch the id, but the id indexes a C array.
Also I fixed a missing call in the MusicChange hook.
2020-12-10 05:42:53 -08:00
James R
e0a307da15
Merge branch 'next' into hooklib-refactor
2020-12-10 03:09:24 -08:00
James R
0df5d8ff58
Oops!
2020-12-10 03:06:41 -08:00
James R
2ab71571aa
Merge branch 'high-resolution-timer-2' into next
2020-12-10 02:55:02 -08:00
James R
8d382e49fb
Big Large Lua Hooklib Refactor
...
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
and name array.
2020-12-10 00:36:41 -08:00
James R
e7883f3f8e
That moment when you see HAVE_BLUA crawl back from the grave
...
This would mean MapChange hasn't been firing for demos ...since 2.2.5.
2020-12-10 00:36:14 -08:00
Zippy_Zolton
7082db485b
CTF text 2, branch is finished
2020-12-08 16:09:51 -06:00
Zippy_Zolton
1b888c689c
CTF text 1
2020-12-08 15:56:45 -06:00
Zippy_Zolton
45a4b728b3
zwip suggestion
2020-12-08 12:05:06 -06:00
Steel Titanium
c2de684150
Fix double free occuring when unloading the intermission patches due to the same patch being cached twice
2020-12-07 17:54:08 -05:00
Zippy_Zolton
2721725962
Final lap text for circuit
2020-12-07 16:46:05 -06:00
Steel Titanium
11bbad9be8
Tab fix
2020-12-06 22:58:17 -05:00
Steel Titanium
c3a560f51d
Let's check for looping first
2020-12-06 22:30:50 -05:00
Steel Titanium
284205baac
Fix SPC looping on libgme versions >= 0.6.3
2020-12-06 22:20:06 -05:00
Jaime Ita Passos
18ee97c583
Fix animated skincolors in OpenGL
2020-12-06 20:17:14 -03:00
Jaime Ita Passos
6f9c48a305
Move a few mobj spawn defaults to its own function
2020-12-06 17:46:35 -03:00
Jaime Ita Passos
24ba782144
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 17:29:20 -03:00
GoldenTails
6546fc8ce7
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.
2020-12-06 12:01:31 -06:00
Tatsuru
3b85abdee7
Kill saloon doors without a tracer, add height check for non-blocking doors
2020-12-06 14:11:08 -03:00
GoldenTails
233990099d
Make caret coloring support letters.
2020-12-06 04:28:12 -06:00
katsy
8f4d23197c
space
2020-12-06 04:32:30 -05:00
katsy
5853a0b4d8
Revert "add noclipheight on chaingrab"
...
This reverts commit 8541409329
2020-12-06 07:44:59 +00:00
katsy
ffd20ee753
Revert "ensure the new flag is cleared properly"
...
This reverts commit 3dbb44e7b1
2020-12-06 07:44:49 +00:00
katsy
2fcf613a31
brak barrier is scaled up by 2x in gameplay, the actual object's parameters should be halved
2020-12-06 00:13:10 -05:00
katsy
fd4674971a
Replace p_inter.c
2020-12-06 00:10:45 -05:00
katsy
768ee57057
Replace p_user.c
2020-12-06 00:10:28 -05:00
katsy
3dbb44e7b1
ensure the new flag is cleared properly
2020-12-05 23:17:01 -05:00
katsy
8541409329
add noclipheight on chaingrab
2020-12-05 23:13:47 -05:00
GoldenTails
f6af04ecbb
Fix weird spelling mistake
2020-12-05 05:00:59 -06:00
James R
0b0f2e1e35
Invalidate taglist userdata
2020-12-05 02:26:00 -08:00
James R
5d1040c924
Reset taggroup iterator on successive calls
2020-12-05 02:08:00 -08:00
James R
8dd964e3a7
Lua: taglist.add and taglist.remove for sector tag lists
2020-12-05 02:02:06 -08:00
James R
e5a3e6a845
Fix removing a tag unsetting the bit array even if more elements with that tag exist
2020-12-05 01:14:52 -08:00
James R
ae663e7247
Don't realloc twice when adding to the taggroup
2020-12-05 00:46:51 -08:00
James R
828d7e71ce
Fix uninitialized last element when using Taggroup_Remove
2020-12-05 00:36:54 -08:00
James R
314fd2783a
Lua tag lists
...
Index and take length of tag lists like a table, 1-indexed. There are three
methods which may be used on tag lists:
list:iterate() - returns an iterator over the tags in the list
list:has(tag) - returns a boolean whether the tag is in the list
list.shares(list2) - returns whether two lists share a tag
"find" is also an alias to "has". Each method may be accessed from the global
taglist library too, e.g. taglist.iterate(list)
Tag lists may be compared with an equality operator too. This will tell you if
the two lists are composed of identical tags.
Accessible from sector.taglist, line.taglist and mapthing.taglist.
2020-12-04 13:53:27 -08:00
James R
c2217bb426
Mkae Lua taggroups indexable
...
They are 1-indexed.
2020-12-04 04:54:12 -08:00
James R
96851e52a1
hehehehehe what if I forgot to git add?
2020-12-04 02:27:46 -08:00
James R
621efbfa15
Lua taglib for accessing taggroups
...
The global "tags" can be iterated upon for every unique tag which is set in the
level. If a tag is set on a sector/line/thing, it will be included. Taking the
length of "tags" will give you the number of these unique tags. (If a tag is
set on multiple sectors/lines/things, it will only be counted once though.)
For sectors, lines and mapthings, call the field "tagged". This function takes
one argument, which is the tag. The return value can be iterated over for all
the sectors/lines/things with that tag. The length can also be taken for the
number of such objects. If no argument is given, the global tag is default.
2020-12-04 00:30:08 -08:00
Jaime Ita Passos
2017eb4d9e
Fix polyobject segs messing with 3D floors they shouldn't be
2020-12-04 00:03:54 -03:00
Steel Titanium
4c53eabc59
Reword the error to be more consistent with other errors
2020-12-03 21:14:27 -05:00
Steel Titanium
7d45a7c91a
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-skinsprites
2020-12-03 17:29:08 -05:00
Tatsuru
fae845f935
Initialize in p_spec.c too + magic number replacement
2020-12-03 17:50:10 -03:00
Zippy_Zolton
29f56fb2d8
g
2020-12-03 02:05:10 -06:00
Zippy_Zolton
c28bd8005e
Fix fire objects disappearing in lava
2020-12-03 01:28:54 -06:00
GoldenTails
b5526312e7
Fix missing stuff
2020-12-02 19:47:00 -06:00
Radicalicious
c98108df27
Revert "Update hw_light.c"
...
This reverts commit b254439592
2020-12-03 00:46:28 +00:00
Jaime Ita Passos
47b8c0648b
Don't clip if the 3D floor is fog
2020-12-02 15:34:11 -03:00
Jaime Ita Passos
0ffb241c0a
Fix 3D floor culling with polyobject segs
2020-12-02 15:31:11 -03:00
Tatsuru
a67862665a
Don't spawn the projectile if you're just gonna delete it
2020-12-02 12:05:40 -03:00
Radicalicious
b254439592
Update hw_light.c
2020-12-02 00:17:57 -05:00
Nev3r
4d716cb170
Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway).
2020-12-01 19:44:58 +01:00
Nev3r
30ab512c3c
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii
...
# Conflicts:
# src/dehacked.c
2020-12-01 18:56:42 +01:00
Nev3r
c8ae28bbaf
Follow GZDoom's convention for stringargs.
2020-12-01 18:35:24 +01:00
Zachary McAlpin
7fde15d066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-30 23:48:49 -06:00
James R
d004515d6a
Fix double define
2020-11-30 19:04:23 -08:00
Zippy_Zolton
69248cc684
thanks zap
2020-11-30 16:39:24 -06:00
Tatsuru
9770368ee9
Initialize junk line tag lists
2020-11-30 18:21:06 -03:00
Zippy_Zolton
20d1811983
oops
2020-11-30 12:05:45 -06:00
Zippy_Zolton
da1a3029a9
overhaul
2020-11-30 12:04:35 -06:00
Zippy_Zolton
412f3fc42b
P_GivePlayerRings
2020-11-29 17:39:54 -06:00
Zippy_Zolton
f913d60a9f
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
2020-11-29 17:16:57 -06:00
GoldenTails
119d2e9e37
Remove the rest of the Playing() checks for GameQuit hook
2020-11-29 16:53:29 -06:00
LJ Sonic
eef3028110
Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
...
# Conflicts:
# src/dehacked.c
# src/dehacked.h
2020-11-29 21:54:15 +01:00
Zachary McAlpin
51d52f7327
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-29 13:59:10 -06:00
GoldenTails
b389700de3
Always call GameQuit when quitting via the Quit menu option on the title screen.
2020-11-29 08:32:04 -06:00
GoldenTails
59d2646593
Send a quitting
argument to the GameQuit Lua hook
2020-11-29 08:30:50 -06:00
Nev3r
ecb333511b
Merge branch 'fix-playercmd' into 'next'
...
Fix PlayerCmd not handling angle and aiming correctly
See merge request STJr/SRB2!1265
2020-11-29 05:30:01 -05:00
Nev3r
bcf6823cbf
Merge branch 'dehacked-hell' into 'next'
...
Split dehacked.c into multiple files.
See merge request STJr/SRB2!1222
2020-11-29 05:18:45 -05:00
James R
445d040795
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
SMS Alfredo
95dfb93a11
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
2020-11-28 22:03:02 -06:00
James R
6b4d422664
Don't add pk3 if there are holes
...
ZIP tools often read the final central directory, but SRB2 may not if there are
multiple central directories. It's just easier to not allow "holes", or
unaccounted for bytes in the file.
2020-11-28 20:00:01 -08:00
James R
75c5c8ba6a
Add missing *individual* skin flags
2020-11-28 02:22:08 -08:00
James R
b9f6069cd0
Replace TC macros with an enum that automatically counts up
...
Also fixes TC_DASHMODE not being accessible to Lua.
2020-11-28 02:19:52 -08:00
Zachary McAlpin
0280721f08
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-26 10:39:41 -06:00
Zippy_Zolton
db6b0c6aa0
Fix normal one-up sound playing in Mario mode
2020-11-25 21:46:45 -06:00
James R
4ab667c6a0
Merge branch 'spritestuff2-fixes' into 'next'
...
Some fixes for spritestuff2
See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
SMS Alfredo
5c71fe0710
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
2020-11-25 14:31:24 -06:00
SMS Alfredo
b2d6d4f83f
Expose player.skin
and player.availabilities
to Lua as Read-only
2020-11-25 12:35:36 -06:00
Zachary McAlpin
d095517999
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-24 20:42:08 -06:00
Zachary McAlpin
76822cef2b
Expose the selectheading option from mapheader_t in Lua
2020-11-24 20:41:11 -06:00
lachwright
87968c946b
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
GoldenTails
930b5ea442
Replace credits with original authors
2020-11-23 21:42:33 -06:00
GoldenTails
8fef61aa29
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
GoldenTails
d806655769
Fix a dumb typo of luaL_checklstring i made whoops
2020-11-23 21:20:17 -06:00
Jaime Ita Passos
5bdee63117
Fix a crash
2020-11-23 12:53:59 -03:00
SMS Alfredo
fe066b3ef2
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit ad9bf6085f
.
2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
LJ Sonic
7ff6443659
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 01:23:34 +01:00
James R
8d71559afe
Merge branch 'make-some-lua-globals-rw' into 'next'
...
Make several Lua global variables writable.
See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
James R
8a30576d81
Merge branch 'plane-sorting-fix-part-3' into 'next'
...
Improved sprite sorting against 3d floors
See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
f39300ac74
Merge branch 'master' into no-dd-make
2020-11-22 15:29:37 -08:00
James R
6d9e036c7f
Merge branch 'master' into next
2020-11-22 15:23:12 -08:00
James R
b059ed40c6
Merge remote-tracking branch 'origin/what-is-a-standard-2'
2020-11-22 15:19:39 -08:00
James R
40e954779e
Resolve one last conflict in splat sorting
...
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
Jaime Ita Passos
5293c52bca
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
James R
54da9552de
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
2020-11-22 14:41:42 -08:00
James R
30792e7820
Merge branch 'flame-orb' into 'next'
...
Flame Shield & Thunder Shield Adjustment (Closes #363 )
Closes #363
See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
James R
92625483a4
Merge branch 'replay-height-fix' into 'next'
...
Made height/spinheight and height change values in replays more accurate
See merge request STJr/SRB2!1241
2020-11-22 17:25:41 -05:00
James R
bec85c033a
Merge branch 'replay-camera-update' into 'next'
...
Make the replay camera follow the player
See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
James R
eb28532244
Merge branch 'remove-unused-music-types' into 'next'
...
Remove unused music type enums
See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -05:00
James R
6d6eb79226
Merge branch 'uncap-palettes' into 'next'
...
Uncap palette lump palettes & allow flashpal palettes to display during pause
See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
James R
b2a84a9376
Merge remote-tracking branch 'origin/master' into no-dd-make
2020-11-22 14:14:43 -08:00
Jaime Ita Passos
2e21168395
Free GPU textures when adding a file
2020-11-22 18:23:35 -03:00
Riku Salminen
b9fa50f7ef
No need to reset tokens twice
2020-11-22 23:23:32 +02:00
Riku Salminen
f51be77aa2
Now the fix actually does what the MR says... +lua banks
2020-11-22 23:19:24 +02:00
Jaime Ita Passos
0645c642d2
Improve GPU texture management.
2020-11-22 18:18:26 -03:00
Jaime Ita Passos
abe35fd008
Some interface fixes
2020-11-22 17:22:18 -03:00
Jaime Ita Passos
152c540c1e
Fix sprite textures in models
2020-11-22 17:10:10 -03:00
Jaime Ita Passos
9ab3acae2d
Change how texture deletion works in OpenGL
2020-11-22 17:03:04 -03:00
Jaime Ita Passos
071ec73389
Some fixes for spritestuff2
2020-11-22 03:47:15 -03:00
GoldenTails
e3c6d1cef3
Add NOECHOFILENAMES, if people don't want logspam.
2020-11-21 22:21:18 -06:00
James R
79bbb3fe46
Remove Direct Draw from the Makefiles
...
MINGW/MINGW64 implies SDL.
2020-11-21 15:19:54 -08:00
James R
5a8e653cd5
More concise
2020-11-21 13:43:32 -08:00
James R
377a9c10f0
Lua: disallow bitwise not on anything but number values
...
This fixes a crash.
2020-11-21 13:37:45 -08:00
GoldenTails
8cfa21fb20
Echo filenames when compiling without ECHO=1
2020-11-19 15:17:56 -06:00
GoldenTails
55f169f3c9
Move the GIF downscaling menu option up one to create some parity.
2020-11-19 13:45:04 -06:00
GoldenTails
12ac096a95
Add a menu option for aPNG downscaling.
2020-11-19 13:45:04 -06:00
GoldenTails
949c0c181d
Add aPNG downscaling, and its associated consvar.
2020-11-19 13:45:04 -06:00
Jaime Ita Passos
389763a550
Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations
2020-11-19 00:59:37 -03:00
Jaime Ita Passos
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
SMS Alfredo
9163e73092
Allow no spin characters to water skip while spinning
2020-11-18 12:35:40 -06:00
SMS Alfredo
7ad8aa1477
Allow the Forcespin sector type to be used with intangible fofs
...
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
2020-11-18 12:27:09 -06:00
SMS Alfredo
01a03a4daa
lmao formatting
2020-11-18 12:03:48 -06:00
SMS Alfredo
09644d69c0
Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags
2020-11-18 12:01:06 -06:00
SMS Alfredo
16fd754a39
Allow forcespin sectors to work on no spin characters
2020-11-18 11:49:17 -06:00
SMS Alfredo
ad9bf6085f
Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING
2020-11-18 11:28:31 -06:00
James R
85c5fa9527
Merge branch 'unfuck-icon-mac' into 'next'
...
Use SDL version of executable icon at runtime on macOS
See merge request STJr/SRB2!1250
2020-11-17 20:24:42 -05:00
SMS Alfredo
fb40a28365
Do deh thing
2020-11-17 11:47:33 -06:00
lachwright
5454068843
Uncap palette lump palettes & allow flashpal palettes to display during pause
2020-11-16 17:37:12 +11:00
lachwright
26b6b33220
Add parentheses
2020-11-15 15:52:55 +11:00
Louis-Antoine
b03d2b16ed
Delete unneeded check
2020-11-15 01:24:12 +01:00
James R
50e15840fb
Merge branch 'udmf-multitag' into 'next'
...
UDMF: Multitag support
See merge request STJr/SRB2!1097
2020-11-14 19:18:14 -05:00
James R
d3199ac779
Fix one last instance of printing address diff
2020-11-14 16:18:54 -08:00
Louis-Antoine
13ba25f4fe
Only call the Lua API for overridden actions
2020-11-15 01:15:58 +01:00
James R
33193db146
Remove unused music type enums
2020-11-14 15:56:40 -08:00
Louis-Antoine
7e7de16e6b
Fix typo
2020-11-15 00:53:46 +01:00
Louis-Antoine
f0fdcfb92b
Delete outdated comment
2020-11-15 00:52:51 +01:00
James R
2a35e0d59f
Merge branch 'lua-musicfuncs' into 'next'
...
Expose more music functions to Lua
See merge request STJr/SRB2!1230
2020-11-14 18:51:22 -05:00
James R
dfeddafc03
Merge branch 'nolua2' into 'next'
...
Don't let Lua set cvars that have CV_NOLUA
See merge request STJr/SRB2!1245
2020-11-14 18:37:21 -05:00
James R
11bb835a45
Merge branch 'precip-bad-access' into 'next'
...
Fix potential crash with precipitation in OpenGL
See merge request STJr/SRB2!1249
2020-11-14 18:33:58 -05:00
Nev3r
3a8b2a6fb7
Better documentation.
2020-11-14 20:50:34 +01:00
Nev3r
cc98be4d23
Add documentation for the iterator macros.
2020-11-14 20:25:00 +01:00
Riku Salminen
0a1beab8c8
Reset a couple of other variables while we're at it
2020-11-14 20:17:35 +02:00
Riku Salminen
8814980a06
Emeralds and tokens now reset when restarting marathon mode in first level
2020-11-14 19:18:36 +02:00
lachwright
a65fc9f622
Reallow P_MobjSpawn to change the scale of objects spawned from mapthings
2020-11-15 02:53:10 +11:00
lachwright
8f570eaa97
Use SDL version of executable icon at runtime on macOS
2020-11-15 01:13:41 +11:00
Monster Iestyn
a38a6a9dc0
Split off actual skin-setting code from SetPlayerSkinByNum so that both SetPlayerSkin and SetPlayerSkinByNum can call it, rather than to each other
2020-11-13 20:49:18 +00:00
Louis-Antoine
01124f2076
Fix Lua stacktrace not showing in various situations
2020-11-13 19:12:25 +01:00
Louis-Antoine
de70934552
Add missing lua_pop call
2020-11-13 18:19:13 +01:00
Louis-Antoine
04826d2615
Replace lua_pop(-1) with lua_settop(0)
2020-11-13 15:31:11 +01:00
Nev3r
70512f11ff
Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray
...
# Conflicts:
# src/p_floor.c
# src/p_spec.c
2020-11-13 13:23:14 +01:00
Nev3r
1a8ec39f6c
Remove direct definition for D__USE_MINGW_ANSI_STDIO, as the latest standards consider this to be deprecated.
2020-11-13 11:33:27 +01:00
James R
e3c8415627
OpenGL: don't access field that doesn't exist in precipmobj_t
2020-11-13 00:46:03 -08:00
Nev3r
7dd83285b8
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii
2020-11-12 14:30:24 +01:00
Nev3r
072e1889e2
Fix size_t/INT32 compare.
2020-11-12 13:59:21 +01:00
Nev3r
2c8a99f25a
Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing.
2020-11-12 13:48:14 +01:00
Nev3r
a8f554075f
Extern the global tag groups properly.
2020-11-12 12:25:02 +01:00
Nev3r
a931d09e7d
Forgot to change %d to %s for sizeu1().
2020-11-10 13:11:42 +01:00
Nev3r
56c3e93d3a
Remove unused tag parameter.
2020-11-10 13:10:01 +01:00
Nev3r
a405f17d0b
Missing prototype.
2020-11-10 13:09:30 +01:00
Riku Salminen
91a34575a7
Declared the cvar in netcmd to get rid of warnings
2020-11-10 13:53:31 +02:00
Nev3r
676f7f5dbf
Use memmove()
2020-11-10 12:45:30 +01:00
Nev3r
b65211d148
Use sizeu1()
2020-11-10 12:34:08 +01:00
Nev3r
d5355a11b0
Indent
2020-11-10 12:23:30 +01:00
Nev3r
95a61a226b
rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro.
2020-11-10 12:22:55 +01:00
Riku Salminen
3dff612f3c
Try to add cvars for old camera
2020-11-10 13:21:34 +02:00
Riku Salminen
33725a58b4
Update p_tick.c, Replacing mobj angle with cmd angleturn
2020-11-10 13:21:34 +02:00
Riku Salminen
aea35171c2
Update p_tick.c, got rid of an useless angle change function
2020-11-10 13:21:34 +02:00
Riku Salminen
2832586274
Make the replay camera follow the player
2020-11-10 13:21:33 +02:00
Nev3r
1d542d3676
Add copyright notices.
2020-11-10 12:12:16 +01:00
Nev3r
fb9432ae57
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
James R
b62a3b623a
Don't let Lua cvar setting functions work on CV_NOLUA vars
2020-11-09 18:54:00 -08:00
James R
4fcca22343
Merge branch 'step-up-goofs-2' into 'next'
...
Fix disabling step up/down not working
See merge request STJr/SRB2!1219
2020-11-09 17:52:41 -05:00
Riku Salminen
3daee0ebf8
Made height/spinheight and height change values in replays more accurate
2020-11-09 17:01:20 +02:00
GoldenTails
fae4709f4b
Fix stupid divide-by-zero error
2020-11-08 23:28:20 -06:00
GoldenTails
9e6c0c31be
Add skincolor vars to the NetSave
2020-11-08 20:43:16 -06:00
Steel Titanium
bcaed4b95b
Remove unused music types
2020-11-08 21:33:12 -05:00
Steel Titanium
050a22f1ce
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs
2020-11-08 21:20:07 -05:00
James R
876aeb6a31
Merge branch 'allowshaders' into 'next'
...
Let the server or an admin toggle clients' custom shaders
See merge request STJr/SRB2!1181
2020-11-08 21:09:56 -05:00
Jaime Passos
b8f668b2e0
rename
2020-11-08 23:02:05 -03:00
James R
16f08d28e2
Merge branch 'hyperwalls-fix' into 'next'
...
Fix hyperwalls
See merge request STJr/SRB2!1232
2020-11-08 20:59:28 -05:00
James R
9e6f64ea22
Merge branch 'x' into 'next'
...
Whitelist missing graphics
See merge request STJr/SRB2!1189
2020-11-08 20:48:25 -05:00
James R
b2dc35864e
Merge branch 'pngpal-compare' into 'next'
...
Compare PNG palettes with the game's palette, instead of assuming they are the same
See merge request STJr/SRB2!1185
2020-11-08 20:46:07 -05:00
James R
bbd003976b
Merge branch 'write-thingies' into 'next'
...
The lump is not needed for P_WriteThings
See merge request STJr/SRB2!1231
2020-11-08 20:35:51 -05:00
James R
049237e50f
Merge branch 'gif-dynamic-delay-v2' into 'next'
...
EMERGENCY: By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option.
See merge request STJr/SRB2!1236
2020-11-08 19:33:03 -05:00
James R
097f204ceb
Merge branch 'register-metatables' into 'next'
...
Improve support for metatables in netgames
See merge request STJr/SRB2!1224
2020-11-08 19:30:51 -05:00
Louis-Antoine
9f851dc285
Return explicitly when failing to register a metatable
2020-11-09 00:16:40 +01:00
Steel Titanium
d26172661d
Remove spritedef field
2020-11-08 13:31:59 -05:00
Steel Titanium
83a87042f1
Push skin->sprites as light userdata
2020-11-08 13:25:56 -05:00
Louis-Antoine
87206a8c21
Show a console error if the gamestate contains too many tables
2020-11-08 17:33:49 +01:00
Louis-Antoine
e52cb7f6fa
Throw an error if too many metatables are registered
2020-11-08 17:20:25 +01:00
Steel Titanium
1320f10839
Allow access to skin.sprites[]
...
Only numframes so far though, as there's already a function for what spriteframe provides.
2020-11-07 23:55:37 -05:00
James R
c0dbc562bb
Fix floating point math
2020-11-07 13:48:37 -08:00
LJ Sonic
9b151ca45c
Merge branch 'resend-gamestate' into 'next'
...
Resend gamestate when resynching
See merge request STJr/SRB2!829
2020-11-07 13:14:32 -05:00
James R
515d7eeb9e
Let's try an experiment: move the epoch forward as I_GetTime is called
...
This will make it even longer until time wraps around. Have you ever run a
srb2 server for 4 years straight?
2020-11-07 01:57:09 -08:00
GoldenTails
9d11d8eec9
Remove 3 wasteful bytes of guaranteed blank memory from some place where it's not gonna matter that much
2020-11-07 03:49:21 -06:00
GoldenTails
d031bb5357
fix dumb memcpy
2020-11-07 03:43:55 -06:00
James R
b72789b0c9
Huge perfstats refactor
...
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
2020-11-07 01:32:59 -08:00
James R
e5f37523b8
Use precise time for gif timing
2020-11-07 01:32:25 -08:00
James R
84ce53db60
Use high precision timer, replace I_GetTimeMicros with I_GetPreciseTime and I_PreciseToMicros
2020-11-07 01:31:24 -08:00
GoldenTails
e473bfd4cd
By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option.
2020-11-07 03:02:21 -06:00
Hannu Hanhi
cc8bd7ef59
Clarify license file mention in libdivide.h
2020-11-07 00:19:43 +02:00
James R
425b56c288
Remove win32 specific timer
2020-11-06 14:14:12 -08:00
James R
4ca994a05b
Merge branch 'gif-dynamic-delay-v2' into 'next'
...
Give the GIF recorder some memory so frame delays are a little more accurate
See merge request STJr/SRB2!1198
2020-11-06 17:10:45 -05:00
James R
0d97903573
Do not factor height into sprite thickseg sorting
2020-11-05 18:45:52 -08:00
James R
8d63a994f0
Remove unused stuff
2020-11-05 18:45:51 -08:00
James R
81cbf35560
Check that top of sprite is above plane or bottom is below
...
This fixes slightly raised fofs drawing on top of sprites that should be in
front of them. Previously would check that the bottom of the object was above
the plane. Now also uses sprite offsets like the fof seg sorting does.
2020-11-05 18:45:43 -08:00
GoldenTails
c70d5a9773
Make mapmusflags
and mapmusname
writable.
2020-11-05 18:12:35 -06:00
GoldenTails
365e02bb32
Make skincolor_*
CTF color variables writable.
2020-11-05 17:38:32 -06:00
GoldenTails
2b39a971ac
Make stoppedclock
writable.
2020-11-05 15:22:45 -06:00
GoldenTails
f42dee1871
Make displayplayer
writable.
2020-11-05 13:43:33 -06:00
GoldenTails
8a0f55e4ad
Make gravity
writable.
2020-11-05 12:39:03 -06:00
GoldenTails
113e6b6585
Make token
writable.
2020-11-05 12:38:47 -06:00
GoldenTails
a502b09929
Make emeralds
writable.
2020-11-05 12:37:49 -06:00
Jaime Passos
a655257f4b
Remove RF_VOXELSPRITE
2020-11-05 00:44:10 -03:00
Jaime Passos
36550725f3
P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope
2020-11-05 00:42:14 -03:00
Jaime Passos
8f65b98c24
Remove NOWATER define
2020-11-05 00:00:08 -03:00
Jaime Passos
c07c80fd9e
Plane optimization and cleanup
2020-11-04 23:46:34 -03:00
Jaime Passos
805818d48e
R_DrawSplatSprite -> R_DrawFloorSprite
2020-11-04 21:43:16 -03:00
GoldenTails
1f7df8a790
Fix hyperwalls
2020-11-03 20:11:39 -06:00
Steel Titanium
d9bc621d17
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs
...
# Conflicts:
# src/dehacked.c
2020-11-01 23:22:03 -05:00
James R
998a10e8ad
Merge remote-tracking branch 'origin/master' into next
2020-11-01 20:01:22 -08:00
James R
a653406e7a
Merge branch 'lua_expose-gamestate' into 'next'
...
Expose gamestate to Lua
See merge request STJr/SRB2!1229
2020-11-01 22:57:52 -05:00
James R
56d2290778
Merge branch 'cmake-fullscreen-fix' into 'master'
...
Cmake: fullscreen fix
See merge request STJr/SRB2!1226
2020-11-01 22:57:27 -05:00
James R
f2e15fc4f1
Merge branch 'cmake-curl-internal-fix' into 'master'
...
Fix compiling using cmake if internal libs is used
See merge request STJr/SRB2!1225
2020-11-01 22:57:12 -05:00
James R
4fc0e44c23
Merge branch 'copyright-fixes' into 'next'
...
Fix some copyright statements in new files
See merge request STJr/SRB2!1223
2020-11-01 22:56:58 -05:00
James R
18365f3820
Merge branch 'udmf-seg-length-crash-fix' into 'next'
...
UDMF Seg length crash fix
See merge request STJr/SRB2!1221
2020-11-01 22:55:13 -05:00
James R
f4b82f27db
Merge branch 'fix-objectplace-silent' into 'next'
...
Fix objectplace -silent
See merge request STJr/SRB2!1214
2020-11-01 22:52:46 -05:00
James R
33cfd2c72a
Merge branch 'mobjghost-rollangle' into 'next'
...
Ghost mobj matches rollangle (Closes #362 )
Closes #362
See merge request STJr/SRB2!1211
2020-11-01 22:49:50 -05:00
James R
fdbeafca42
Merge branch 'tailsoverlay-dash' into 'next'
...
Dash state for Tails overlay (Closes #325 )
Closes #325
See merge request STJr/SRB2!1210
2020-11-01 22:49:12 -05:00
James R
37931fc253
The lump is not needed for P_WriteThings
2020-11-01 19:31:10 -08:00
Steel Titanium
ac7781a3b3
Expose more music functions to Lua
2020-10-31 21:15:41 -04:00
Steel Titanium
41d8210fd5
Expose gamestate to Lua
2020-10-31 16:36:15 -04:00
Hannu Hanhi
54cc9db7a5
Fix CMake SSE3 flag
2020-10-31 18:04:44 +02:00
Hannu Hanhi
724d126015
Clarify licensing-related text in libdivide.h
2020-10-31 16:39:05 +02:00
lachwright
bfbcc69108
Draw save files from outwards in
2020-10-31 18:21:14 +11:00
Steel Titanium
62b5b86ed4
CMake: Fix fullscreen toggle not working
...
All because of a typo
2020-10-31 00:59:51 -04:00
Steel Titanium
d406340b5d
Fix compiling using cmake if internal libs is used
2020-10-30 23:37:34 -04:00
Louis-Antoine
1155d875d5
Use the same names as userdataType() for userdataMetatable()
2020-10-30 15:00:13 +01:00
Louis-Antoine
f943f247af
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into register-metatables
2020-10-30 14:46:04 +01:00
Zippy_Zolton
6c00a96755
thunder shield :D
2020-10-29 12:32:42 -05:00
Hannu Hanhi
c44120eb87
Fix some copyright statements in new files
2020-10-29 16:04:25 +02:00
Monster Iestyn
5241b83f97
Fix seg->length and flength not being set at all for UDMF maps
2020-10-28 19:36:03 +00:00
Zippy_Zolton
4e56caa196
Flame Shield Changes
2020-10-28 01:23:05 -05:00
Jaime Passos
0f9d85694d
Implement an "ignore colormaps" sprite rendering flag
2020-10-27 19:54:50 -03:00
Nev3r
3d2d44bfff
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii
...
# Conflicts:
# src/p_user.c
2020-10-27 22:23:30 +01:00
Nev3r
ad9e3411a1
Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next.
2020-10-27 22:13:10 +01:00
Jaime Passos
b03d95c5c6
Bug fixes
2020-10-27 17:02:35 -03:00
Nev3r
c62ef355ef
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Louis-Antoine
e178966367
Remove useless condition
2020-10-27 20:28:54 +01:00
Louis-Antoine
395d1f1b8f
Do not pause the client while redownloading the gamestate
2020-10-27 20:23:32 +01:00
Louis-Antoine
804ad44e89
Fix music resetting after reloading the gamestate
2020-10-27 20:22:15 +01:00
Louis-Antoine
5c48b92b2c
Fix camera going wild after reloading the gamestate
2020-10-27 20:21:56 +01:00
Jaime Passos
b872222b50
Implement blend modes
2020-10-27 00:03:41 -03:00
Louis-Antoine
499bb56436
Only resend the gamestate to one client at a time
2020-10-27 01:22:31 +01:00
Louis-Antoine
7ae53364f2
Add a 15 seconds cooldown between successive gamestate resends
2020-10-27 01:20:05 +01:00
Louis-Antoine
9f5686ef48
Fix underflow in consistancy checking code
2020-10-26 23:15:22 +01:00
James R
18a2e87093
Check maxstep is not disabled before stepping up
...
Fixes infinite step up when it should be no step up.
2020-10-26 14:00:54 -07:00
Hannu Hanhi
86ad187f05
NPO2 slope span optimization
2020-10-26 00:26:15 +02:00
James R
afb8e6e181
Whoops
2020-10-24 20:44:42 -07:00
James R
713b965a85
Merge branch 'playah' into 'next'
...
Credits Changes
See merge request STJr/SRB2!1200
2020-10-24 21:54:40 -04:00
Zolton Auburn
9a0d65a0f1
Update f_finale.c
2020-10-24 20:17:20 -04:00
Zolton Auburn
24596bd8d5
Update f_finale.c
2020-10-24 20:16:21 -04:00
James R
9278f04fbf
Delete ban.txt if no bans to save
2020-10-24 15:59:11 -07:00
James R
288ffebea7
Do not save cleared ban list when reloading bans
2020-10-24 15:52:02 -07:00
James R
305f58077d
Fix objectplace -silent
2020-10-24 15:29:31 -07:00
Hannu Hanhi
244c76250f
Use SSE3 in 32-bit x86 binaries
2020-10-25 00:08:24 +03:00
Zippy_Zolton
5d4032fd00
Ghost mobj matches rollangle
2020-10-24 12:38:30 -05:00
Louis-Antoine
50d2c95470
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate
2020-10-24 16:21:44 +02:00
James R
e9fce20071
Merge remote-tracking branch 'origin/master' into next
2020-10-23 14:57:13 -07:00
James R
86c38e6d9a
Merge branch 'reverse-offsetof-macro' into 'next'
...
Turn the lua sector lines hack into a macro
See merge request STJr/SRB2!1187
2020-10-23 16:44:29 -04:00
James R
687e2d89cc
Merge branch 'set-cvars' into 'next'
...
Set cvars directly from Lua
See merge request STJr/SRB2!1205
2020-10-23 16:42:42 -04:00
James R
503e83653e
Merge branch 'skip-unused-mobj-hooks' into 'next'
...
Only invoke the Lua API for mobj hooks that need it
See merge request STJr/SRB2!1209
2020-10-23 16:40:07 -04:00
James R
fd63b50f44
Merge branch 'insert-wait' into 'next'
...
Do not let previous wait commands affect COM_BufInsertText
See merge request STJr/SRB2!1207
2020-10-23 16:38:46 -04:00
James R
5f772c1850
Merge branch 'fix-ghost-netvar-crash' into 'next'
...
Fix G_GhostTicker crashing trying to read netvars as ghost data
See merge request STJr/SRB2!1203
2020-10-23 16:37:49 -04:00
James R
135d0f91b0
Merge branch 'sw-npo2-span-opt' into 'next'
...
NPO2 span function optimization
See merge request STJr/SRB2!1201
2020-10-23 16:36:18 -04:00
Zolton Auburn
85692ac409
Update info.c
2020-10-23 14:04:02 -04:00
Zippy_Zolton
c0571b5fbf
g
2020-10-23 01:09:12 -05:00
Zippy_Zolton
a4459b6693
Dash state for Tails overlay
2020-10-23 00:47:47 -05:00
Louis-Antoine
37c11e0f2e
Fix unfortunate typos
2020-10-22 00:08:06 +02:00
Louis-Antoine
d349e9bf83
Only invoke the Lua API for mobj hooks that need it
2020-10-21 22:48:00 +02:00
James R
ba4b6ec400
Reset wait period for COM_BufInsertText
2020-10-21 12:34:26 -07:00
Louis-Antoine
5091c19abf
Kick clients that fail to catch up with server gamelogic
2020-10-21 20:25:29 +02:00
Zippy_Zolton
88c882fa9c
81
2020-10-20 19:59:33 -05:00
James R
39ccd12f04
Add CV_Set, CV_SetValue, CV_StealthSet, CV_StealthSetValue and CV_AddValue to Lua
...
CV_SetValue merged with CV_Set (same with CV_StealthSetValue and CV_StealthSet).
2020-10-20 16:08:34 -07:00
GoldenTails
1e0beab254
Add i_threads.h too
2020-10-20 15:58:34 -05:00
GoldenTails
31c410656c
Add multithreading option for CMake
2020-10-20 15:44:01 -05:00
Zippy_Zolton
0f771edfd5
SonicX orange
2020-10-20 15:11:00 -05:00
Zippy_Zolton
03198ab31d
SonicX aqua
2020-10-20 14:59:30 -05:00
Zolton Auburn
d1f16e0f77
Continue
2020-10-20 15:56:41 -04:00
Zippy_Zolton
45dd26476a
SonicX8000 purple, peridot, rosy
2020-10-20 14:52:25 -05:00
Zippy_Zolton
b65ac1df30
sonicx azure
2020-10-20 14:40:10 -05:00
Zippy_Zolton
0b48f1052a
pencilvoid aqua
2020-10-20 14:03:27 -05:00
Zippy_Zolton
4e985d7145
blue & red really seem like a hassle don't they
2020-10-19 20:36:59 -05:00
Zippy_Zolton
04eae86d0a
t
2020-10-19 19:58:50 -05:00
Steel Titanium
d6c0e0cf30
Fix G_GhostTicker crashing trying to read netvars as ghost data
...
Also fixed possible issue with incorrectly reading the demo pointer due to the wrong type being passed to sizeof in G_ConsGhostTic
2020-10-19 20:20:08 -04:00
Zippy_Zolton
81c9d2eae9
forgot to send this like 3 hours ago
2020-10-19 18:41:23 -05:00
Jaime Passos
dfc85ec21a
Include p_local.h
2020-10-19 17:38:02 -03:00
Jaime Passos
a21685812f
Rename R_DrawVisSplat to R_DrawSplatSprite, move into r_splats.c
2020-10-19 17:36:29 -03:00
Jaime Passos
dbc149f85a
Remove FLOORSPLATS define
2020-10-19 17:33:16 -03:00
Zippy_Zolton
d633f2495a
red abd bkyue sikbucx
2020-10-19 14:12:28 -05:00
Zippy_Zolton
e5c891932a
improvement
2020-10-18 23:47:14 -05:00
Zippy_Zolton
fed2fffaa1
better colors
2020-10-18 22:52:40 -05:00
Zippy_Zolton
5dc90289dc
thanks goldie
2020-10-18 21:59:34 -05:00
Zippy_Zolton
e2d686ba42
update
2020-10-18 17:45:46 -05:00
Zippy_Zolton
2403cbd57b
possibly final
2020-10-18 17:01:31 -05:00
Zippy_Zolton
94cee68d41
Calloc
2020-10-18 16:41:14 -05:00
Zippy_Zolton
14aec09d13
possibly fixed
2020-10-18 16:21:06 -05:00
Zippy_Zolton
3b79ca4fae
Improved text colormaps
2020-10-18 16:00:01 -05:00
James R
1cd73315f1
Merge branch 'model-fallback' into 'next'
...
Model fallback
See merge request STJr/SRB2!1167
2020-10-18 16:52:42 -04:00
James R
7f65023891
Merge branch 'bustflags' into 'next'
...
Bustable Wall and Floor flags.
See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
Hannu Hanhi
382ed1c31e
Remove leftover commented code from previous commit
2020-10-18 23:04:01 +03:00
James R
d279489753
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
Hannu Hanhi
23e02d17c0
NPO2 span function optimization
2020-10-18 21:27:22 +03:00
Jaime Passos
3ac175660c
Don't render sprites with negative xscale or yscale in OpenGL
2020-10-17 22:40:49 -03:00
Zippy_Zolton
e8419ea876
Credits Changes
2020-10-17 20:13:29 -05:00
Hannu Hanhi
7941a5fb63
R_FindPlane optimization
2020-10-18 01:27:01 +03:00
Zippy_Zolton
f602944efd
titlecard
2020-10-17 15:51:22 -05:00
GoldenTails
00f38d41e5
Give the GIF dynamic delay memory to base future delays off of, instead of calculating for the current frame and being jank
2020-10-17 07:10:24 -05:00
James R
4b0725f36f
Use FIELDFROM in lua polyobject code
2020-10-15 16:17:51 -07:00
James R
374c19f915
Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro
2020-10-15 16:15:20 -07:00
James R
d6b314951e
Merge branch 'step-down-ceiling' into 'next'
...
Apply step up/down to opposite plane too
See merge request STJr/SRB2!1192
2020-10-15 19:11:13 -04:00
James R
bd9fda8ceb
Merge branch 'lua-polyobjects' into 'next'
...
Lua polyobjects
Closes #19
See merge request STJr/SRB2!1140
2020-10-15 19:08:54 -04:00
James R
31977878e1
Merge branch 'raretry-fix' into 'next'
...
Make record attack's quick retry more consistent.
Closes #80
See merge request STJr/SRB2!1193
2020-10-15 19:02:34 -04:00
Jaime Passos
70ada935ec
Don't free PU_HWRCACHE and PU_HWRCACHE_UNLOCKED memory tags in HWR_ClearAllTextures.
...
Probably fixes a random annoying crash around that function.
(I was also suspecting renderer switching was doing other slightly weird stuff.)
2020-10-15 14:31:16 -03:00
Jaime Passos
060c25c14d
[Software floor sprites] Set the colormap and translation outside of the loop
2020-10-15 14:12:19 -03:00