SMS Alfredo
865c0a081d
Make Overlay objects account for player->drawangle
2021-10-29 10:40:25 +00:00
Hannu Hanhi
77ecfb9cdc
Perfstats averaging and refactor
2021-10-29 02:18:02 +03:00
sphere
2d8230cb27
Merge branch 'sunnywithcloudsandshowers' into 'next'
...
Fix broken rain to rain weather switching
See merge request STJr/SRB2!1626
2021-10-27 17:52:29 +00:00
katsy
e10eddd11d
Fix broken rain to rain weather switching
2021-10-27 17:52:29 +00:00
sphere
edaa955bcc
Merge branch 'dave-credits' into 'next'
...
Fix #672
Closes #672
See merge request STJr/SRB2!1623
2021-10-27 17:51:29 +00:00
GoldenTails
8110473643
Give userdata that needed names some names.
2021-10-22 18:31:37 -05:00
FlykeSpice
a8c6a65260
Fix visplanes getting allocated twice
...
I guess that is legacy remnant stuff
2021-10-11 00:20:11 -04:00
Vincent Robinson
f70491b2b5
Make linedef 96 apply to tags from 97-99, but not to itself
2021-10-04 14:23:56 -07:00
SteelT
0f4074f22d
Remove unused I_GetMouseGrab function
2021-09-23 13:46:26 -04: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
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
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
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
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
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
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
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
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
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
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
