sphere
553240f7c2
Merge branch 'showinput' into 'next'
...
Allow input view outside of record attack
See merge request STJr/SRB2!2020
2024-02-25 14:16:44 +00:00
sphere
1cc9e17efa
Merge branch 'nonightsever' into 'next'
...
Make NiGHTS super consistent with regular super (Closes #520 for real this time)
Closes #520
See merge request STJr/SRB2!1666
2024-02-25 13:55:44 +00:00
sphere
50bdc5f1a5
Merge branch 'whirlybird' into 'next'
...
Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags (resolves #771 )
Closes #771
See merge request STJr/SRB2!1740
2024-02-25 13:39:17 +00:00
katsy
6604f47931
Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags ( resolves #771 )
2024-02-25 13:39:17 +00:00
Logan Aerl Arias
f07a7618eb
Merge branch SRB2:next into fix-mixerx-1144
2024-02-25 05:23:59 +00:00
Logan Aerl Arias
7d66f5cdfc
Merge branch SRB2:next into instant-setscale
2024-02-25 05:13:45 +00:00
Logan Aerl Arias
a73f9476f3
fixed call to P_SetScale() within A_MinusDigging() that I missed
2024-02-24 23:57:09 -05:00
Logan Aerl Arias
2ca791a2ad
disable libgme by default
2024-02-24 20:13:13 -05:00
MIDIMan
de8464cd2f
Add alpha support for mobjs
2024-02-24 20:13:13 -05:00
spherallic
94db9ddf12
Make chat word wrapping consistent with how it was before
2024-02-25 01:48:42 +01:00
Logan Aerl Arias
235afdff72
disable libgme by default
2024-02-24 19:37:38 -05:00
spherallic
73b90d13eb
Merge branch 'next' into font_drawer
2024-02-25 00:58:04 +01:00
Eidolon
2c0622cd4d
Include poll.h on UNIXCOMMON in dedicated
2024-02-24 13:23:27 -06:00
Eidolon
5008d866b9
Include poll.h on UNIXCOMMON
...
Apple was not including poll.h despite needing it.
2024-02-24 13:21:55 -06:00
Eidolon
4c7b2f16e7
Move MIN_SLEEP_DURATION_MS macros for Apple
...
These were not defined for macOS despite being necessary.
2024-02-24 13:19:22 -06:00
Lactozilla
04ac253acf
Merge branch 'next' into remove-opengl-chromakey
2024-02-24 14:45:22 -03:00
Lactozilla
f16836bd81
Changes:
...
- Renamed renderwalls, renderfloors and renderthings
- Removed CV_NOTINNET|CV_CHEAT from renderwalls, renderfloors and renderthings
- Moved some cvars to proper places
2024-02-24 14:43:21 -03:00
Lactozilla
2d3dd624f5
Merge branch 'next' into texture-scaling-fixes
2024-02-24 14:22:41 -03:00
Lactozilla
4c9f4e966c
Delete pic_mode_t
2024-02-24 14:03:11 -03:00
Lactozilla
0664671c57
Merge branch 'next' into delete-unused-render-code
2024-02-24 14:02:33 -03:00
Lactozilla
a2355fc01e
Always use R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn
2024-02-24 13:56:47 -03:00
Logan Aerl Arias
52f53f03b7
Merge branch 'next' into instant-setscale
2024-02-24 11:42:27 -05:00
Logan Aerl Arias
9014e911d3
Merge branch SRB2:next into improve-backtrace
2024-02-24 16:20:26 +00:00
Logan Aerl Arias
d7086168b8
Merge branch 'next' into fruits-clipper
2024-02-24 11:18:12 -05:00
Zwip-Zwap Zapony
34afebfc06
Revert P_SuperReady to a boolean transform type
2024-02-24 15:41:51 +01:00
Zwip-Zwap Zapony
90958614f3
Shield button touchups
2024-02-24 15:41:36 +01:00
Lactozilla
66234d093c
Fix a regression where 3D floor sides could not render properly
...
Normally, when rendering a 'masked column', the variables sprtopscreen (and sometimes sprbotscreen) are used to define the screen space bounds of the column. R_DrawMaskedColumn and R_DrawFlippedMaskedColumn use these variables to determine where to start rendering the column's posts.
Rendering a 3D floor side when a light list is involved requires cutting it vertically. Part of this process involves setting windowtop and windowbottom, which are what R_DrawMaskedColumn and R_DrawFlippedMaskedColumn use instead to define the bounds in screen space of the column. To draw the columns between the 3D floor's vertical boundaries, the functions R_DrawRepeatMaskedColumn or R_DrawRepeatFlippedMaskedColumn are used to repeatedly call R_DrawMaskedColumn or R_DrawFlippedMaskedColumn respectively.
The problem is that R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn assume that sprtopscreen and sprbotscreen are what define the vertical positions of the column, and the consequence is, after the first time R_DrawRepeatMaskedColumn or R_DrawRepeatFlippedMaskedColumn are called for a column, no more columns are rendered, since sprtopscreen is not reset.
This issue was fixed by making R_RenderThickSideRange use R_DrawMaskedColumn and R_DrawFlippedMaskedColumn if there is a lightlist, or R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn if there is no lightlist.
2024-02-24 00:43:46 -03:00
Logan Aerl Arias
4d5ed85784
Merge branch 'fix-missing-mobjwasremoved-checks' into 'next'
...
Fix various segfaults caused by missing P_MobjWasRemoved checks
See merge request STJr/SRB2!2052
2024-02-24 03:37:57 +00:00
Logan Aerl Arias
5be61987ca
Merge branch 'rendercvars' into 'next'
...
Rendering cvars that control rendering walls, floors, and things.
See merge request STJr/SRB2!1526
2024-02-24 03:02:48 +00:00
Logan Aerl Arias
6337a7611c
Merge branch 'load-trnslate-in-folders' into 'next'
...
Load TRNSLATE files from folders
Closes #1206
See merge request STJr/SRB2!2370
2024-02-24 01:11:06 +00:00
sphere
f804ae42c1
Merge branch 'fix-credit-text-disappear' into 'next'
...
Fix credit sequence not compensating for non-green resolutions
Closes #1184
See merge request STJr/SRB2!2320
2024-02-24 00:28:28 +00:00
sphere
aa5383e7e0
Merge branch 'fix-insane-tty-latency' into 'next'
...
Fix insane TTY input latency
See merge request STJr/SRB2!2360
2024-02-24 00:27:38 +00:00
sphere
29580282b0
Merge branch 'maxskins-255' into 'next'
...
Change MAXSKINS from 256 to 255
See merge request STJr/SRB2!2365
2024-02-24 00:27:14 +00:00
SSNTails
d43d5fb9e1
Don't change drawangle while riding on a fan
2024-02-23 15:23:39 -05:00
Lactozilla
37ce5b669b
Load TRNSLATE files from folders
2024-02-23 15:52:18 -03:00
Zwip-Zwap Zapony
56c61a80ff
Change MAXSKINS from 256 to 255
...
A value of -1 is sometimes reserved for "no skin", leaving 255 other values for skin numbers
2024-02-22 12:34:51 +01:00
Alam Ed Arias
b8023aeef9
Tokenizer: pad with 2 NULL bytes
2024-02-21 22:32:32 -05:00
Alam Ed Arias
da1b579cee
Tokenizer_Open: pad the string with an NULL byte
2024-02-21 21:53:12 -05:00
Alam Ed Arias
8c7fe2ae95
Make tokenizer keep a copy of string in normal memory
2024-02-21 21:41:16 -05:00
SSNTails
ea218c2e68
Can't have a radius of 0 here!
2024-02-21 19:25:57 -05:00
Arthur
a407ff8899
Zwip Zwap Zapony's suggestion to use a consvar
2024-02-21 16:22:00 -05:00
Arthur
716b9527bf
Add a -allowdesync parameter that will allow individual demos to desync. Warning is still shown, but player position will not be modified.
2024-02-21 14:38:11 -05:00
Hanicef
0d598150b3
Fix insane TTY input latency
2024-02-21 20:22:23 +01:00
bitten2up
db95f940b4
That should fix the warnings
2024-02-21 16:14:35 +00:00
Arthur
de13b600bf
R_IsPointInSector is fine, it was the clang issue screwing up
2024-02-20 21:42:23 -05:00
Lactozilla
978a6b2717
Fix typos in R_RenderPortalHorizonLine
2024-02-20 23:22:43 -03:00
Arthur
9296d6b496
This should do it.
2024-02-20 19:20:09 -05:00
Arthur
9e50f08fc3
So far so good...
2024-02-20 19:14:11 -05:00
Arthur
d166a1509d
Starting over, beginning with cleaning up floorz/ceilingz functions
2024-02-20 18:57:37 -05:00
Alam Ed Arias
703ee972e6
Clean up stringop-truncation warnings
2024-02-20 16:30:15 -05:00
Alam Ed Arias
53d74e7f89
Clean up stringop-overflow=4 warnings
2024-02-20 13:17:50 -05:00
bitten2up
f61497eaa6
fix crash
2024-02-20 10:45:04 -06:00
256nil
18e7f0ee2d
Fix #1188
2024-02-20 18:12:51 +02:00
spherallic
3165f8b792
Merge branch 'next' into quick-intro
2024-02-20 14:12:19 +01:00
Lactozilla
0292e0e1f6
Fix build error
2024-02-19 23:02:49 -03:00
Lactozilla
467cc59c64
Only I_Error in HWR_GetTexture with PARANOIA
2024-02-19 22:55:45 -03:00
Lactozilla
6cdaf24a27
Delete the last remnants of Doom Legacy's pic_t format
2024-02-19 21:57:10 -03:00
Lactozilla
fe2daf907b
Make the display of palette index 255 consistent between renderers
2024-02-19 21:49:22 -03:00
Logan Aerl Arias
a8a92a57a7
Merge branch '1200-next-cannot-load-game-when-using-srb2-launcher' into 'next'
...
Do not alllow error codepaths of UPnP to leave the mutex locked
Closes #1200
See merge request STJr/SRB2!2349
2024-02-20 00:36:39 +00:00
Arthur
cf0834d917
Fix it the right way!
2024-02-19 19:16:38 -05:00
sphere
fed08744ba
Revert "Merge branch 'issue1150' into 'next'"
...
This reverts merge request !2334
2024-02-19 23:50:56 +00:00
Alam Ed Arias
15b1842a6d
Merge remote-tracking branch 'origin/1200-next-cannot-load-game-when-using-srb2-launcher' into 1200-next-cannot-load-game-when-using-srb2-launcher
2024-02-19 18:19:58 -05:00
Alam Ed Arias
11edc020ce
i_tcp.c: do not alllow error codepaths of UPnP to leave the mutex locked
2024-02-19 18:19:28 -05:00
sphere
69757fb956
Merge branch 'fix-gl-shaders-colormap' into 'next'
...
Fix tint equation shader
See merge request STJr/SRB2!2348
2024-02-19 23:14:03 +00:00
sphere
00d057c1c2
Merge branch 'upnp-status-log-only' into 'next'
...
Print UPnP status to log file/external console only
See merge request STJr/SRB2!2347
2024-02-19 23:13:58 +00:00
sphere
2065cc1191
Merge branch 'issue1034' into 'next'
...
Cutscene timing fixed
See merge request STJr/SRB2!2344
2024-02-19 23:13:35 +00:00
Alam Ed Arias
9c5d470bef
Merge branch 'master' into next
2024-02-19 18:07:54 -05:00
Lactozilla
7433137e98
Fix tint equation shader
2024-02-19 19:23:40 -03:00
Lactozilla
5a46f12c62
Merge branch 'next' into delete-unused-render-code
2024-02-19 19:20:48 -03:00
SteelT
802a1de11b
Print UPnP status to log file/external console only
...
I don't think It's not really important enough that it's worth always notifying the user about it.
2024-02-19 17:11:05 -05:00
SSNTails
d4074e5d4e
Merge branch SRB2:next into issue1034
2024-02-19 21:59:46 +00:00
Arthur
a9b003d35c
If somebody's gonna watch the intro 50+ times, it's gonna be me. :)
2024-02-19 16:59:20 -05:00
SteelT
91980907b9
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into ogl-palette-rendering
2024-02-19 16:04:47 -05:00
sphere
7a3d88fcc6
Merge branch 'fix-translucent-pixels-on-transparent-pixels' into 'next'
...
Fix translucent pixels being visible on empty pixels
See merge request STJr/SRB2!2335
2024-02-19 13:35:13 +00:00
sphere
af08930232
Merge branch 'issue1150' into 'next'
...
Issue1150
See merge request STJr/SRB2!2334
2024-02-19 13:32:44 +00:00
SSNTails
372cbbc544
missing 'break'
2024-02-19 08:08:12 -05:00
SSNTails
34817d9776
Rollout rock handling with gravity boots
2024-02-18 22:38:34 -05:00
Lactozilla
07656de1d2
Delete old and unused rendering-related code
...
- Deleted view border code
- Deleted highcolor code
- Deleted pre-NEWCLIP code
- Deleted ylookup and columnofs
- Deleted the last remnants of con_clipviewtop and dc_hires
2024-02-18 22:11:22 -03:00
Logan Aerl Arias
9cf6432be2
Update p_map.c
2024-02-18 23:16:24 +00:00
Logan Aerl Arias
b3c3a45a6c
Merge branch SRB2:next into fix-missing-mobjwasremoved-checks
2024-02-18 22:56:44 +00:00
Logan Aerl Arias
ae88c01f6e
Merge branch SRB2:next into nonightsever
2024-02-18 19:58:36 +00:00
Arthur
8a823de013
Missed a few project settings previously for visual studio release mode.
2024-02-18 11:54:20 -05:00
spherallic
03c138b782
Merge branch 'next' into font_drawer
2024-02-18 17:43:39 +01:00
Arthur
73d354b956
Bring back WRITETHINGS, with custom filename and UDMF support!
2024-02-18 11:29:00 -05:00
sphere
6d645acbc8
Merge branch 'fix-1193' into 'next'
...
Fix #1193
Closes #1193
See merge request STJr/SRB2!2330
2024-02-18 14:42:42 +00:00
sphere
ada6c43c52
Merge branch 'issue1181' into 'next'
...
This was nothing more crazy than a buffer wraparound.
See merge request STJr/SRB2!2327
2024-02-18 14:40:25 +00:00
Zwip-Zwap Zapony
beb4bceff9
Even if they may not be used to "wallhack" per se, I agree that it'd be best to not allow them online.
2024-02-18 04:32:52 +00:00
Logan Aerl Arias
08f1349985
Merge branch 'next' into rendercvars
2024-02-17 23:21:23 -05:00
Arthur
f51f9f63f0
Update objectplace to ignore float argument and handle ZABSOLUTE
2024-02-17 22:48:31 -05:00
Logan Aerl Arias
a7d1d53778
Merge branch 'next' into playersetup-and-continue-lua
2024-02-17 22:17:50 -05:00
Logan Aerl Arias
e44d85a536
Merge branch SRB2:next into shield-gamepad-defaults
2024-02-18 02:43:46 +00:00
Logan Aerl Arias
ea4ad871b6
Merge branch 'fix-upnp-add' into 'next'
...
Fix UPnP port mapping not working
See merge request STJr/SRB2!2333
2024-02-18 01:22:25 +00:00
Logan Aerl Arias
cd04c90a8a
Merge branch 'fix_softlock' into 'next'
...
dc_texheight must be (INT64) to prevent overflow and rendering softlock
See merge request STJr/SRB2!2323
2024-02-18 01:21:04 +00:00
Logan Aerl Arias
9fb7b9026e
Merge branch 'rename-gr_allowclientshaders' into 'next'
...
Rename gr_allowclientshaders to gr_allowcustomshaders
See merge request STJr/SRB2!2319
2024-02-18 01:19:35 +00:00
Logan Aerl Arias
4109f7168b
Merge branch 'fix-motd-not-being-sent' into 'next'
...
Fix MOTD not being sent to players on first join
Closes #1194
See merge request STJr/SRB2!2317
2024-02-18 01:14:13 +00:00
Logan Aerl Arias
585ec0752e
Merge branch 'propercheats' into 'next'
...
Make the Cheats Command Reflect UsedCheats
See merge request STJr/SRB2!2160
2024-02-18 01:09:42 +00:00
Logan Aerl Arias
8bffe3e3a7
Merge branch 'fix-mobj-thinker-reference-corruption' into 'next'
...
Fix faulty references when spawning mobjs
See merge request STJr/SRB2!2126
2024-02-18 01:02:42 +00:00
Logan Aerl Arias
d895ff88f9
Update hw_batching.c
...
HWR_ProcessPolygon()'s shader parameter was renamed to shader_target
2024-02-17 19:53:25 -05:00
Logan Aerl Arias
9c85ccc820
Update hw_main.c
...
cv_fovchange was moved from hw_main.c to r_main.c
cv_glallowshaders was moved from hw_main.c to d_netcmd.c
2024-02-17 19:52:22 -05:00
Logan Aerl Arias
2d17c75165
Update r_defs.h
...
add back pic_t
2024-02-17 19:50:52 -05:00
Logan Aerl Arias
6763aaefff
Merge branch 'next' into ogl-palette-rendering
2024-02-17 19:06:18 -05:00
Lactozilla
719169a625
R_GenerateTexture: Fix translucent pixels being visible on empty pixels
2024-02-17 16:51:16 -03:00
Arthur
d3d210b3ca
Merge branch 'issue1150' of https://git.do.srb2.org/SSNTails/SRB2 into issue1150
2024-02-17 14:12:54 -05:00
Arthur
94c1ab7de2
Use floorz/ceilingz
2024-02-17 14:12:39 -05:00
SteelT
8962355d6c
Fix UPnP port mapping not working
...
Despite UPNP_AddPortMapping returning sucess status, no port mapping would actually be added at all. And that's due to a memset call in the middle of the function.
Wiping the IGDdatas struct, moving the memset to the start of the function fixes it and a port mapping is actually created/removed when a server is started/stopped.
2024-02-17 13:04:29 -05:00
sphere
a5bf4a5b8f
Merge branch 'fix-user-agent-string' into 'next'
...
Fix version text in UA string
See merge request STJr/SRB2!2324
2024-02-17 16:30:21 +00:00
Arthur
9a75ef18c3
Sometimes simple is better..?
2024-02-17 10:04:34 -05:00
Hanicef
487f4ef49f
Fix addon loading issues with symlinks on Linux/*BSD
2024-02-17 11:07:38 +01:00
Lactozilla
6e109be076
Fix #1193
2024-02-17 04:00:27 -03:00
Logan Aerl Arias
cf5520b275
Merge branch SRB2:next into instant-setscale
2024-02-17 03:25:41 +00:00
Arthur
7c257dc765
This was nothing more crazy than a buffer wraparound.
2024-02-16 19:47:15 -05:00
SSNTails
a94a0b9a47
Don't forget to check for dead dontdrawforviewmobjs!!
2024-02-16 16:24:39 -05:00
Lactozilla
98ba396dbc
Fix issues related to texture scaling
2024-02-16 17:28:55 -03:00
Lactozilla
3bcd19476c
Fix version text in UA string
2024-02-16 16:46:42 -03:00
Arthur
532abf9279
dc_texheight must be (INT64) to prevent overflow and rendering softlock
2024-02-16 12:48:28 -05:00
Arthur
dc625496d8
re-introduce the thing == tmthing->target check, so it applies to non-players
2024-02-16 12:27:25 -05:00
Arthur
5e29cd84a2
Stash changes
2024-02-16 11:46:37 -05:00
Arthur
398b5a1840
P_PlayerCanHurtPlayer()
2024-02-15 23:00:35 -05:00
Hanicef
e74a819b68
Fix overshoot on credit text rendering
2024-02-15 23:05:03 +01:00
Hanicef
71ce173a0d
Fix credit sequence not compensating for non-green resolutions
2024-02-15 22:03:28 +01:00
SteelT
8f9b57df0a
Rename gr_allowclientshaders to gr_allowcustomshaders
2024-02-15 15:53:42 -05:00
SSNTails
7e880d7698
A little more elegance.
2024-02-15 15:22:33 -05:00
SSNTails
d8723c4b7f
Don't forget about pushables!
2024-02-15 15:18:26 -05:00
SSNTails
f5829451a3
saving for later
2024-02-15 13:27:54 -05:00
Hanicef
de66e055a7
Fix keyboard input via console
2024-02-15 18:56:25 +01:00
Hanicef
6218f85658
Add I_GetSysName to dedicated build
2024-02-15 18:54:24 +01:00
Hanicef
27cf39dd54
Prevent recursion into quit functions
2024-02-15 18:54:24 +01:00
Alam Ed Arias
00d1cbfd2a
Revert "Update dedicated.mk
"
...
This reverts commit a5ef42476fa8b9d96509739be9b16528fce038f5.
Also, undo the DOS EOL
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
a44cb494a7
Update dedicated.mk
...
remove the need for libPNG in dedicated server build
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
ea66bffc6b
made "Alpine 3 GCC Dedicated" build
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
e5637e2946
change name of binary in dedicated server build to lsrb2d
2024-02-15 18:54:24 +01:00
Hanicef
c4b076ea1b
Fix compiler warning on Windows
2024-02-15 18:54:24 +01:00
Hanicef
97abc19182
Pass -mconsole on MinGW build
2024-02-15 18:54:24 +01:00
Hanicef
41975f4f40
Force NOGME=1 on dedicated build
2024-02-15 18:54:24 +01:00
Hanicef
3ca9ce2842
Avoid needing SDL=0 when building dedicated
2024-02-15 18:54:24 +01:00
Hanicef
f2a9a81786
Fix Windows build
2024-02-15 18:54:24 +01:00
Gustaf Alhäll
28f196ad3e
Fix potential deadlock when using cond
2024-02-15 18:54:24 +01:00
Gustaf Alhäll
77e83ddebb
Add dedicated server build
2024-02-15 18:54:24 +01:00
SSNTails
fdb94b15ea
Issue #1195 - Standing at a corner under steam, but far away enough to not be impacted by it, causes the player animation to reset for a tic
2024-02-15 12:42:31 -05:00
Hanicef
88bdc3e433
Fix MOTD not being sent to players on first join
2024-02-15 18:36:28 +01:00
spherallic
8bbdf1037f
Merge branch 'next' into fruits-clipper
2024-02-15 16:36:35 +01:00
spherallic
b312377800
Clean up overzealous time check
2024-02-15 16:36:05 +01:00
Arthur
2db0dc3ad9
Zwip-Zwap's suggestion of checking for coop and types of bots
2024-02-15 10:32:21 -05:00
SSNTails
07678311d1
Missiles fired by player will not hit bots
2024-02-15 08:39:23 -05:00
Logan Aerl Arias
5a16fd138f
fix path to x64 curl in VS project file
...
(edited by hand via WebIDE)
2024-02-14 23:53:13 +00:00
Arthur
0cb4a1397d
Remove absolute paths
2024-02-14 18:04:58 -05:00
Arthur
99c91d4bb3
Visual Studio compiles again
2024-02-14 16:36:36 -05:00
Hanicef
493a7db1ee
Fix thinker being added twice to mobj
2024-02-14 21:54:28 +01:00
Gustaf Alhäll
b808fde260
Fix broken titlescreen for MT_ALTVIEWMAN mobjs
2024-02-14 21:45:53 +01:00
Gustaf Alhäll
5c2821fb10
Fix faulty references when spawning mobjs
2024-02-14 21:45:52 +01:00
Alam Ed Arias
3a5c5410bf
Merge branch SRB2:next into fix-command-line-input
2024-02-14 17:12:05 +00:00
SteelT
a9a1a4bf65
Fix FreeBSD memory reporting if built with cmake
2024-02-14 02:59:26 -05:00
SteelT
97afd18e96
Fix G_SaveGameData crash if quit early
...
Fixes a crash that can occur if data struct is passed to G_SaveGameData before it is allocated.
2024-02-14 02:27:58 -05:00
spherallic
f4588d50b0
Merge branch 'next' into fruits-clipper
2024-02-13 19:14:26 +01:00
sphere
ff851dcb44
Merge branch 'get-sys-name' into 'next'
...
Add common I_GetSysName function
See merge request STJr/SRB2!2308
2024-02-13 15:42:30 +00:00
sphere
2675441f74
Merge branch 'freeslot-double' into 'next'
...
Match mobj freeslot count with SRB2Kart
See merge request STJr/SRB2!2298
2024-02-13 15:34:44 +00:00
sphere
245a53b423
Merge branch 'fix-1190' into 'next'
...
Fix #1190
Closes #1190
See merge request STJr/SRB2!2310
2024-02-13 15:33:59 +00:00
sphere
eaab39bbaf
Merge branch 'fix-searchblockmap' into 'next'
...
Fix Lua 'searchBlockmap' (resolves #1191 )
Closes #1191
See merge request STJr/SRB2!2309
2024-02-13 15:32:41 +00:00
Logan Aerl Arias
ae8bfbe763
Merge branch '1168-accessing-an-invalid-variable-in-ticcmd_t-crashes-the-game' into 'next'
...
check if LUA field exists before accessing it
Closes #1168
See merge request STJr/SRB2!2261
2024-02-12 19:58:56 +00:00
Lactozilla
356e455335
Fix #1190
2024-02-12 16:58:00 -03:00
Lactozilla
a709ff9ecd
Fix Lua 'searchBlockmap'
2024-02-12 16:28:32 -03:00
Logan Aerl Arias
3087107175
Merge branch 'shieldrespawn' into 'next'
...
Respawn Certain Monitors in Co-op
See merge request STJr/SRB2!2152
2024-02-12 05:46:25 +00:00
SMS Alfredo
2e7fa1990a
Respawn Certain Monitors in Co-op
2024-02-12 05:46:25 +00:00
Logan Aerl Arias
2df90ec96b
Merge branch SRB2:next into emblemexitfix
2024-02-12 05:09:04 +00:00
Logan Aerl Arias
bf9904cfc2
Merge branch 'fireflower-icon' into 'next'
...
Display power-up icon for Fire Flower
See merge request STJr/SRB2!2097
2024-02-12 05:04:57 +00:00
Logan Aerl Arias
6d0fef8726
Merge branch SRB2:next into nonightsever
2024-02-12 04:53:51 +00:00
Logan Aerl Arias
bf4efe968f
Merge branch 'patch-refactor' into 'next'
...
Patch and texture refactor
See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
SteelT
ddfb59d185
Add common I_GetSysName function
...
Replaces the OS defines in Command_Version_f() with a common function to fetch the system name the game is currently running on.
2024-02-11 23:31:34 -05:00
Zwip-Zwap Zapony
bdeec56270
Substitute MT_NULL with MT_RAY in Lua
2024-02-11 13:30:15 +01:00
Hanicef
634c972f6c
Fix console not being blocked by IT_CV_STRING
2024-02-11 12:08:42 +01:00
Alam Ed Arias
ae25209cd1
r_draw.c: fix compiling with clang
2024-02-10 19:25:27 -05:00
sphere
58cf8293e3
Merge branch 'fix-nil-mo-spawnmobj-hook' into 'next'
...
Fix segfault when trying to access mo->player->mo from SpawnMobj hook
Closes #1189
See merge request STJr/SRB2!2300
2024-02-10 23:39:37 +00:00
Logan Aerl Arias
5e175a3438
add Visual Studio 2022 support (via CMAKE)
2024-02-10 14:34:03 -05:00
Logan Aerl Arias
da394a87dd
add Visual Studio 2022 support (via CMAKE)
2024-02-10 19:29:48 +00:00
Hanicef
d0277b1799
fixup! Fix segfault when trying to access mo->player->mo from SpawnMobj hook
2024-02-10 20:19:45 +01:00
Hanicef
fe75a21bef
Fix segfault when trying to access mo->player->mo from SpawnMobj hook
2024-02-10 19:40:27 +01:00
Hanicef
75c270d546
Expose PF_SHIELDDOWN to Lua
2024-02-10 18:55:10 +01:00
sphere
279820cd6c
Merge branch 'slash-n' into 'next'
...
add checks for \n in chat messages
See merge request STJr/SRB2!2170
2024-02-10 15:22:33 +00:00
Sally Coolatta
d5c8fcac2b
Match freeslot count with SRB2Kart
2024-02-10 08:52:32 -05:00
Gustaf Alhäll
1a53971c39
Fix various segfaults caused by missing P_MobjWasRemoved checks
2024-02-09 19:39:20 +01:00
Hanicef
8155313344
Fix input via command line/terminal not working
2024-02-09 18:49:32 +01:00
sphere
0c59a46d5a
Merge branch 'fix-segfault-remove-thinglist' into 'next'
...
Fix segfault when removing mobjs while iterating thinglist
See merge request STJr/SRB2!2293
2024-02-08 23:17:54 +00:00
sphere
41613d89a1
Merge branch 'blockmap-links' into 'next'
...
Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592 )
Closes #592
See merge request STJr/SRB2!2267
2024-02-08 23:16:59 +00:00
sphere
2cfbcf7fbf
Merge branch 'allow-banip-mask' into 'next'
...
Allow ban masks to be specified for banip
See merge request STJr/SRB2!2272
2024-02-08 23:16:47 +00:00
spherallic
7fc554bd4e
Merge branch 'showinput' of git.do.srb2.org:STJr/SRB2 into showinput
2024-02-08 23:12:03 +01:00
spherallic
16b28d177e
Merge branch 'next' into showinput
2024-02-08 23:09:09 +01:00
sphere
51f0758c47
Merge branch 'fix-console-double-mapping' into 'next'
...
Fix console binds incorrectly respecting keyboard layout
See merge request STJr/SRB2!2295
2024-02-08 21:35:05 +00:00
sphere
26c057f6e5
Merge branch 'fix-unlist-request' into 'next'
...
Fix /unlist request
See merge request STJr/SRB2!2294
2024-02-08 21:34:55 +00:00
sphere
0d526c0ff5
Merge branch 'http-download-port' into 'next'
...
HTTP downloader port
See merge request STJr/SRB2!2290
2024-02-08 21:34:36 +00:00
Hanicef
914cb167a4
Fix console binds incorrectly respecting layout keys
2024-02-08 21:50:43 +01:00
Felice D'Angelo
bdf13b6957
Fix /unlist request
2024-02-08 17:09:26 +00:00
Zwip-Zwap Zapony
21b8acf75d
Change P_MobjWasRemoved to P_RemoveMobj in the error message (thanks Zwip-Zwap Zapony)
2024-02-07 20:30:20 +00:00
Hanicef
e1d15b5ed5
Fix segfault when removing mobjs while iterating thinglist
2024-02-07 18:42:24 +01:00
sphere
1b2b7658a8
Merge branch 'fix-table-key-archiving' into 'next'
...
Fix archiving with tables that contain tables as keys
See merge request STJr/SRB2!2245
2024-02-07 15:09:38 +00:00
Lactozilla
7724fafa0b
Merge branch 'fix-1183' into 'next'
...
Fix #1183
Closes #1183
See merge request STJr/SRB2!2282
2024-02-06 21:54:27 +00:00
spherallic
af4e64d1a5
Make Extra Time powerup work in old-style special stages
2024-02-05 01:28:35 +01:00
spherallic
edec1088b9
Support LF_MIXNIGHTSCOUNTDOWN for old-style special stages
2024-02-05 00:59:31 +01:00
Lactozilla
9b33d5c808
Fix build warnings
2024-02-04 20:22:27 -03:00
Lactozilla
e7e54ef28c
Merge remote-tracking branch 'stjr/next' into http-download-port
2024-02-04 20:08:52 -03:00
Lactozilla
321415fd19
Rephrase
2024-02-04 20:08:49 -03:00
Lactozilla
b4beaa9f43
HTTP downloader port
2024-02-04 20:00:51 -03:00
spherallic
243fdd1a82
Merge branch 'next' into fruits-clipper
2024-02-04 22:43:48 +01:00
spherallic
8f2f70aeec
Merge branch 'next' into maretimers
2024-02-04 22:39:25 +01:00
sphere
c91fc082f9
Merge branch 'oldspecnightsrecordsfix' into 'next'
...
Fix hud_nightsrecords in old (multiplayer) special stages
See merge request STJr/SRB2!2191
2024-02-04 21:35:36 +00:00
sphere
fd92193f7e
Merge branch 'fix-slope-plane-distortion' into 'next'
...
Fix equation plane distortion
See merge request STJr/SRB2!2283
2024-02-04 21:33:17 +00:00
Sally Coolatta
c6a68f69ce
Update unlockables before level load executors
...
Another issue that seems related to #1122
2024-02-04 01:22:11 -05:00
Lactozilla
053a9fc2e2
Fix netgame joining
...
Regression introduced by !2279 .
2024-02-04 02:43:28 -03:00
Lactozilla
235bf724f0
Merge branch 'fix-sw-polyobject-interpolation' into 'next'
...
Interpolate polyobjects properly for the software renderer (resolves #950 )
Closes #950
See merge request STJr/SRB2!2284
2024-02-02 00:08:06 +00:00
Alug
afa9b32408
compiler complains
2024-02-01 19:13:13 +01:00
Alug
e892cc1d4b
Fix FOFs with transferline flag and many linedefs randomly crashing
...
linenum could go out of bounds if you use more than 4 linedefs for such setup, hence making the game unable to retrieve textures and therefore crashing the games sometimes
many thanks to indev for helping me figuring this one out c:
2024-02-01 18:57:55 +01:00
MIDIMan
5bbc1e323a
Merge branch SRB2:next into disable-powerup-hud
2024-01-31 19:34:05 +00:00
sphere
bae687a1b9
Merge branch 'fix-slope-convex-sectors' into 'next'
...
Fix physics quirkiness on slopes with convex sectors
See merge request STJr/SRB2!2250
2024-01-30 22:38:56 +00:00
Lactozilla
41d9601018
Interpolate polyobjects properly for the software renderer
2024-01-30 18:57:24 -03:00
Lactozilla
c7c13e3372
Recalculate slope vectors at render time
2024-01-30 14:29:38 -03:00
Lactozilla
b15fca4d66
Fix line slopes
2024-01-30 14:05:01 -03:00
Lactozilla
1088310ae8
Replace FIXED_TO_DOUBLE and DOUBLE_TO_FIXED with FixedToDouble and DoubleToFixed
2024-01-30 00:00:35 -03:00
Lactozilla
8847cf77b4
Minor changes
2024-01-29 23:55:12 -03:00
Lactozilla
6180ddde32
Fix slope plane distortion
2024-01-29 22:08:22 -03:00
sphere
4649f3a46b
Merge branch '1173-next-moved-upnp-to-it-s-own-thread' into 'next'
...
Resolve "[NEXT] moved UPnP to it's own thread"
Closes #1173
See merge request STJr/SRB2!2263
2024-01-29 13:59:00 +00:00
sphere
225f085937
Merge branch 'optimize-batch-sorting' into 'next'
...
Optimize polygon sorting on batch renderer
See merge request STJr/SRB2!2253
2024-01-29 13:58:13 +00:00
sphere
4407b70fbb
Merge branch 'fix-ban-corruption' into 'next'
...
Fix bans by remote admins corrupting banlist
See merge request STJr/SRB2!2266
2024-01-29 13:57:09 +00:00
sphere
770bc934b1
Merge branch 'visit-unlockables-fix' into 'next'
...
Update & save unlockables when visiting a new map
Closes #1122
See merge request STJr/SRB2!2279
2024-01-29 13:55:43 +00:00
sphere
9e8020276f
Merge branch 'fix-3d-floor-skewtd' into 'next'
...
Fix 3D floor texture skewing
See merge request STJr/SRB2!2281
2024-01-29 13:55:40 +00:00
sphere
5a00859baa
Merge branch 'bouncy-nights-fixes' into 'next'
...
General NiGHTS Fixes
See merge request STJr/SRB2!2199
2024-01-29 13:55:25 +00:00
sphere
f6cd5ab13e
Merge branch 'fix-removed-viewmobj-segfault' into 'next'
...
Fix segfault when setting up view frame for a removed mobj
See merge request STJr/SRB2!2270
2024-01-29 13:53:59 +00:00
Lactozilla
1a63e72f5c
Fix #1183
...
- Fixed an incorrect access of skincolor_remaps[] in R_GetTranslationRemap
- Fixed R_GetTranslationForThing not being able to apply a translation over TC_RAINBOW or TC_DASHMODE
- OpenGL: Fixed MF2_LINKDRAW sprites possibly not using the correct translation
2024-01-29 04:32:52 -03:00
Lactozilla
61701c3c53
Fix 3D floor texture skewing
2024-01-29 03:54:15 -03:00
MIDIMan
ccb2785c44
Merge branch SRB2:next into disable-powerup-hud
2024-01-28 17:27:32 +00:00
Sally Coolatta
1e04896d3f
Update & save unlockables when visiting a new map
...
Resolves #1122
2024-01-26 15:37:38 -05:00
Lactozilla
36e64cb683
Merge branch 'fix-1177' into 'next'
...
Fix #1177
Closes #1177
See merge request STJr/SRB2!2268
2024-01-21 23:57:33 +00:00
Lactozilla
0739c310b3
Merge branch 'fixes-for-2190' into 'next'
...
Fixes for !2190
See merge request STJr/SRB2!2273
2024-01-21 23:54:22 +00:00
Lactozilla
7cabf43e85
Merge branch 'lua-colorlib-get-sector-translation' into 'next'
...
Add v.getSectorColormap and P_GetSectorLightLevelAt
See merge request STJr/SRB2!2230
2024-01-21 23:54:08 +00:00
Lactozilla
5ef55cc6af
Merge branch 'improve-download-refuse-message' into 'next'
...
Improve addon download refusal messages
See merge request STJr/SRB2!2153
2024-01-21 23:53:57 +00:00
Lactozilla
8cff33e681
Changes:
...
Ported skincolor cache management from the secondcolor branch
Adjusted R_GetTranslationRemap to use a similar caching scheme
Made sure that if a skincolor was updated, then related translations would be rebuilt
2024-01-20 01:47:03 -03:00
Lactozilla
9851ec56cf
Correct comment
2024-01-19 21:16:20 -03:00
Lactozilla
712c274988
Add third argument to getColormap that accepts a translation name
...
Delete 'translations' Lua global
2024-01-19 20:50:36 -03:00
Lactozilla
4e818b87fd
Support combinations of skincolors and translations
2024-01-19 20:39:28 -03:00
Hanicef
092ae9bf4d
Allow ban masks to be specified for banip
2024-01-20 00:22:26 +01:00
Lactozilla
4b057f84ec
Support compound translations
2024-01-19 19:35:29 -03:00
Lactozilla
6d1908c93e
Changes:
...
Moved string conversion helpers into m_misc.c
Adapted parser to check for '"'
Check if tokenizer returned NULL
2024-01-19 17:01:27 -03:00
Lactozilla
8bbc512b14
Tokenizer changes:
...
Capture '"' characters
Capture ';' tokens
Implement tracking of the current line
2024-01-19 16:40:32 -03:00
Hanicef
820a70b854
Fix segfault when setting up view frame for a removed mobj
2024-01-19 00:00:53 +01:00
Lactozilla
1d2ea9b046
Fix #1177
2024-01-17 20:02:50 -03:00
Lactozilla
756e9d0d48
Link objects into multiple blockmap sectors
...
Ported from ZDoom
2024-01-17 19:10:19 -03:00
Logan Aerl Arias
3176abe2e4
Merge branch 'cv-can-change' into 'next'
...
Add can_change for console variables
See merge request STJr/SRB2!2196
2024-01-17 03:39:39 +00:00
Logan Aerl Arias
a3b79056e9
Merge branch 'translations' into 'next'
...
ZDoom translations
See merge request STJr/SRB2!2190
2024-01-17 03:24:54 +00:00
Lactozilla
9ac88031e1
Add 'Invert' translation
2024-01-16 20:36:31 -03:00
Lactozilla
f8d75ee077
Refactor
2024-01-16 20:35:30 -03:00
Lactozilla
2019e7df18
Throw warning on invalid translations
2024-01-16 20:17:01 -03:00
Lactozilla
76c7dccd00
Delete old pic_t format from Doom Legacy
2024-01-16 15:54:29 -03:00
Lactozilla
62db9f17d2
More refactoring
2024-01-16 15:17:58 -03:00
Lactozilla
e73f33a677
Fix build warnings
2024-01-16 14:34:38 -03:00
Lactozilla
70d8c66637
Use https URL in comment instead of http
2024-01-16 14:27:19 -03:00
Lactozilla
91a37b1018
Only read first 8 bytes of a PNG image for detection
2024-01-16 14:26:05 -03:00
Lactozilla
ee7198cb01
Update URL in Picture_IsLumpPNG
...
garethrees.org went down sometime December 2023 (or at least, it appears to have been wiped out.)
So I replaced the URL with an archived version of the same page
2024-01-16 14:14:08 -03:00
Lactozilla
e576aefb52
Change type from INT32 to unsigned
2024-01-16 14:05:43 -03:00
Lactozilla
4ee0960090
Refactor texture definition
2024-01-16 14:04:12 -03:00
Lactozilla
1ccc04c53f
Delete global lengthcol
2024-01-16 13:50:08 -03:00
Hanicef
4d589300f4
Fix bans by remote admins corrupting banlist
2024-01-15 21:01:36 +01:00
Lactozilla
feffdb373b
Load textures and flats from PK3 files more reliably
2024-01-15 14:44:19 -03:00
Lactozilla
dcf5c4d3bf
Cleanup R_GetFlatForTexture
2024-01-15 02:47:03 -03:00
Lactozilla
b901bc039d
Delete leftover animated flat handling
2024-01-15 02:40:43 -03:00
Lactozilla
4cf9d38fb6
Delete leftover composite texture handling
2024-01-15 02:05:25 -03:00
Lactozilla
861d22fd44
Always generate composite textures with post data
2024-01-15 00:29:21 -03:00
Lactozilla
72b63a1305
Merge branch 'next' into patch-refactor
2024-01-14 22:16:32 -03:00
Hanicef
dff390e197
Fix final edge cases in sector points
...
Co-authored-by: Zwip-Zwap Zapony <zwipzwapzapony@gmail.com>
2024-01-14 21:07:45 +01:00
Hanicef
4eb514ce71
Fix IPv6 bans incorrectly banning IPv4 address
2024-01-14 19:20:25 +01:00
Hanicef
e8706fa9e8
Check hash instead of each field when batching
2024-01-13 17:53:00 +01:00
Hanicef
ef4f2e71ad
Revert "Avoid batching skybox and horizon lines"
...
This reverts commit fc1e8fb52f88e56c6a32b3e7e643bc1356b507c8.
2024-01-13 17:53:00 +01:00
Gustaf Alhäll
71f326a152
Avoid batching skybox and horizon lines
2024-01-13 17:37:20 +01:00
Gustaf Alhäll
d5fe5586a0
Retain skybox and horizon line order
2024-01-13 17:37:20 +01:00
Gustaf Alhäll
636b3ab954
Optimize polygon sorting on batch renderer
2024-01-13 17:37:20 +01:00
Lactozilla
970a9d65dd
Merge branch 'next' into more-sprite2
2024-01-13 03:43:34 -03:00
spherallic
35b6b21562
Clean up NiGHTS attack character code, fix compile issues
2024-01-11 13:18:32 +01:00
sphere
4ae2482283
Merge branch 'character-nightsattack' into 'next'
...
Draw Character in NiGHTS Attack
See merge request STJr/SRB2!2175
2024-01-11 12:11:54 +00:00
Mari0shi
5a2a24b868
Draw Character in NiGHTS Attack
2024-01-11 12:11:54 +00:00
Logan Aerl Arias
8073ac6520
add mutex locks to UPnP Client code
...
add mutex locks to UPnP Client code
2024-01-10 16:44:27 -05:00
Zwip-Zwap Zapony
9d718bc639
Fix single-sided sloped midtextures in OpenGL
2024-01-10 21:26:04 +01:00
Logan Aerl Arias
c9232f4a07
Update i_tcp.c
...
set upnpc_started to 1 a the end
wrap upnpc_started into a struct
2024-01-10 13:10:39 -05:00
Logan Aerl Arias
ca0b899a54
Moved UPnP startup code to a thread
...
Moved UPnP startup code to a thread
2024-01-10 12:45:53 -05:00
Lactozilla
3e34c96165
Fix 3D floor sides not using the correct set of line flags
2024-01-09 14:14:49 -03:00
Lactozilla
28c30a9294
Optimize for when wall_scalex == 1.0
2024-01-08 22:08:50 -03:00
Lactozilla
159307c552
Fix 3D floor side texture scale when there are multiple on the same line
2024-01-08 22:03:31 -03:00
Logan Aerl Arias
1f0c9619dd
Merge branch SRB2:next into propercheats
2024-01-08 23:40:56 +00:00
Logan Aerl Arias
4edebbe67f
Merge branch 'blockedexposed' into 'next'
...
Expose P_LineIsBlocking to Lua
See merge request STJr/SRB2!2150
2024-01-08 23:38:11 +00:00
Logan Aerl Arias
f5c3c200b5
Merge branch 'lua-colorlib' into 'next'
...
Lua colorlib
See merge request STJr/SRB2!2094
2024-01-08 19:40:20 +00:00
Logan Aerl Arias
0781adc3ca
Merge branch 'pandoradev' into 'next'
...
Enable Pandora and Level Select with Devmode / Always allow Level Select if unlocked
See merge request STJr/SRB2!2066
2024-01-08 19:20:23 +00:00
Logan Aerl Arias
03e5edb6f0
Merge branch 'chat_on' into 'next'
...
Expose chat_on to Lua as chatactive
See merge request STJr/SRB2!2023
2024-01-08 19:13:30 +00:00
Jisk
efb1b491aa
Expose chat_on to Lua as chatactive
2024-01-08 19:13:30 +00:00
Lactozilla
0ffcf89c85
Merge branch 'next' into more-sprite2
2024-01-08 02:55:19 -03:00
Logan Aerl Arias
845df8f1df
Merge branch 'sector-portals' into 'next'
...
Sector portals
See merge request STJr/SRB2!2139
2024-01-08 03:28:43 +00:00
Logan Aerl Arias
154af01348
Merge branch 'theyseemerollingtheybraking' into 'next'
...
Fix roll braking assuming player angle is camera angle (resolves #1055 )
Closes #1055
See merge request STJr/SRB2!2053
2024-01-08 03:13:57 +00:00
Logan Aerl Arias
be5ca1a4fb
lua_infolib.c: replace lua_objlen with luaL_getn in setRamp()
2024-01-07 22:13:09 +00:00
Logan Aerl Arias
4ae7a0e093
LUA mapthing_t checks
...
add check that LUA can't access fields that don't exist in mapthing_t
2024-01-07 16:21:09 -05:00
Logan Aerl Arias
cb3deaaaac
Update lauxlib.h
...
lauxlib.h: mark luaL_error as a REPORT function
2024-01-07 15:20:32 -05:00
Alam Ed Arias
626ac069f2
Merge branch 'master' into next
2024-01-07 14:22:43 -05:00
Alam Ed Arias
caaeaef6cc
fixup Valgrind warning:
...
Conditional jump or move depends on uninitialised value(s)
strncpy (vg_replace_strmem.c:599)
MIT_SetCurBackground (m_menu.c:2650)
M_IterateMenuTree (m_menu.c:2581)
M_SetMenuCurBackground (m_menu.c:2790)
F_InitMenuPresValues (f_finale.c:2276)
D_StartTitle (d_main.c:998)
G_Responder (g_game.c:2117)
D_ProcessEvents (d_main.c:282)
Local_Maketic (d_clisrv.c:5297)
NetUpdate (d_clisrv.c:5701)
TryRunTics (d_clisrv.c:5371)
D_SRB2Loop (d_main.c:820)
2024-01-07 13:09:47 -05:00
Alam Ed Arias
5b6c24281d
Fixup DEBUGMODE builds
...
doomdef.h: check if the build system already define our DEBUG code
version.mk: do not fail on our inline functions in DEBUGMODE
features.mk: we do not need the VALGRIND libraies, just the headers
mserv.c: start registered with false in Update_parameters()
2024-01-07 13:07:28 -05:00
Gustaf Alhäll
0211492d96
Change point-in-polygon algorithm
2024-01-04 20:12:20 +01:00
Logan Aerl Arias
7cb2fcd058
Merge branch 'fix-inline-warning' into 'next'
...
Fix a -Winline warning
See merge request STJr/SRB2!2255
2024-01-04 16:40:34 +00:00
Zwip-Zwap Zapony
c46f861034
New gamepad defaults, with Shield on B
2024-01-04 08:29:30 +01:00
Gustaf Alhäll
bc5a0098ea
fixup! Use angle instead of range when checking identical points
2024-01-03 21:10:11 +01:00
Gustaf Alhäll
4cdd638a07
Use angle instead of range when checking identical points
2024-01-03 20:49:17 +01:00
Gustaf Alhäll
cf7c6585eb
Merge remote-tracking branch 'fork/fix-slope-convex-sectors' into fix-slope-convex-sectors
2024-01-03 18:49:58 +01:00
Gustaf Alhäll
5edc828aaf
Fix physical weirdness on concave sectors, too
2024-01-03 18:48:41 +01:00
Logan Aerl Arias
3de4547f74
Merge branch 'expos-camreset' into 'next'
...
Expose P_ResetCamera / camera->reset to Lua
See merge request STJr/SRB2!2009
2024-01-03 15:36:16 +00:00
Zwip-Zwap Zapony
a4cb3960ce
Set old sprite scales and offsets for ghost mobjs
2024-01-03 14:04:40 +01:00
Zwip-Zwap Zapony
564d18b1ea
Add and use an "instant" parameter for P_SetScale
2024-01-03 14:04:40 +01:00
Logan Aerl Arias
3992e83e8f
Revert "Merge branch 'thokking-hell' into 'next'"
...
This reverts merge request !1551
2024-01-03 03:46:26 +00:00
Logan Aerl Arias
4fddc8fec7
Update i_system.c
...
backtrace() doesn't exist in non-glibc systems
2024-01-02 22:27:20 -05:00
Logan Aerl Arias
eae89efbb9
Update i_system.c
...
remove unused size_t size
remove unused void *array[BT_SIZE];
2024-01-02 22:06:00 -05:00
Logan Aerl Arias
5e2311c48d
Update i_system.c
...
removed CRASHLOG_STDERR_WRITE
2024-01-02 22:03:51 -05:00
Logan Aerl Arias
17c62d2ca6
Merge branch 'next' into SRB2-improve-backtrace
2024-01-02 22:00:14 -05:00
Lactozilla
7fbd8f7025
Merge branch 'next' into more-sprite2
2024-01-02 22:09:17 -03:00
Lactozilla
b6e4771085
Merge branch 'next' into translations
2024-01-02 22:06:14 -03:00
Lactozilla
31f7616d3a
Fix #1166
2024-01-02 20:58:55 -03:00
Zwip-Zwap Zapony
29c7a0bfd8
Fix a -Winline warning
2024-01-02 20:38:18 +01:00
Zwip-Zwap Zapony
e717731ea3
Update player->quittime when a server idles, again
2024-01-02 19:00:18 +01:00
Logan Aerl Arias
4dd2415262
Merge branch 'exitfix' into 'next'
...
Only Consider ExitLevel a Cheat When Used to Cheat
See merge request STJr/SRB2!2159
2024-01-02 03:05:24 +00:00
Logan Aerl Arias
474d112ae4
Merge branch 'setflip' into 'next'
...
Add "allowflip" Parameter to P_DoJump
See merge request STJr/SRB2!2158
2024-01-02 02:38:19 +00:00
Logan Aerl Arias
920f375f4a
Update features.mk
...
fix miniupnpc typo in features.mk
2024-01-01 20:40:11 -05:00
Logan Aerl Arias
4853eded8e
Merge branch 'master' into next
2024-01-01 20:35:33 -05:00
Logan Aerl Arias
10b3c58a3d
Merge branch SRB2:next into ogl-palette-rendering
2024-01-02 00:00:11 +00:00
Logan Aerl Arias
4523364a40
Merge branch 'next' into ogl-palette-rendering
2024-01-01 18:22:35 -05:00
Logan Aerl Arias
3ea28d22b4
Merge branch 'master' into ogl-palette-rendering
2024-01-01 17:16:07 -05:00
Logan Aerl Arias
487b0d22ed
Merge branch 'next' into raise-skin-limit
2024-01-01 16:55:04 -05:00
ChaoLoveIceMDBoy
e29085580c
OpenGL: Fix linedef type 10 not culling FOFs ( Closes #438 )
2024-01-01 19:48:47 +00:00
Logan Aerl Arias
b55b91bc24
Merge branch 'pit-savior' into 'next'
...
Make Dead / NoClipHeight Objects Immune to Death Pits (Resolves #553 )
Closes #553
See merge request STJr/SRB2!2001
2024-01-01 16:28:37 +00:00
Logan Aerl Arias
0182973b4d
Merge branch 'interpolate-shield-spawning' into 'next'
...
Copy Interpolation to Shields and Overlays, Splitscreen Overlays
Closes #997
See merge request STJr/SRB2!1992
2024-01-01 15:10:24 +00:00
Logan Aerl Arias
484a9c5620
Merge branch 'expos-local' into 'next'
...
Expose P_IsLocalPlayer to Lua
See merge request STJr/SRB2!1997
2024-01-01 05:06:47 +00:00
Logan Aerl Arias
096efe422d
Merge branch 'static-void-drawstaticbox' into 'next'
...
Rewrite M_DrawStaticBox
Closes #1014
See merge request STJr/SRB2!1990
2024-01-01 05:00:36 +00:00
Logan Aerl Arias
9972dd0d5b
Merge branch 'devmode-hudlines' into 'next'
...
Always Allow con_hudlines when Using devmode
See merge request STJr/SRB2!1987
2024-01-01 04:55:43 +00:00
Logan Aerl Arias
520d1c16da
Merge branch 'custom-2.2.10' into 'next'
...
Made filesearch aware of symbolic links
See merge request STJr/SRB2!1976
2024-01-01 04:51:09 +00:00
Logan Aerl Arias
050da08c15
Merge branch 'bustablemobjzfix' into 'next'
...
Update mobj floorz/ceilingz after a bustable FOF is destroyed
See merge request STJr/SRB2!1945
2024-01-01 04:44:09 +00:00
Logan Aerl Arias
37a917df49
Merge branch 'perfstats-thinkframes' into 'next'
...
Implement perfstats options for LUAh_PreThinkFrame and LUAh_PostThinkFrame
See merge request STJr/SRB2!1932
2024-01-01 04:05:16 +00:00
Logan Aerl Arias
341159fdc9
Merge branch 'drawfill-transparency' into 'next'
...
Add transparency flag support to drawFill
See merge request STJr/SRB2!1881
2024-01-01 03:59:56 +00:00
Logan Aerl Arias
2223cdd756
Merge branch 'icefix' into 'next'
...
Move player friction reset after movement code for lua qol
See merge request STJr/SRB2!1824
2024-01-01 03:10:11 +00:00
katsy
b52836e5f1
Move player friction reset after movement code for lua qol
2024-01-01 03:10:09 +00:00
Monster Iestyn
1284ec6494
correct sidenum_get to use UINT32 instead of UINT16
2024-01-01 02:44:07 +00:00
Logan Aerl Arias
06b5c9d5f4
Merge branch 'menu-unresponsiveness-fix' into 'next'
...
Fix rare but possible menu/console unresponsiveness bug (Resolves #700 )
Closes #700
See merge request STJr/SRB2!1677
2023-12-31 23:36:30 +00:00
Logan Aerl Arias
8dcc609144
Merge branch SRB2:next into custom-2.2.10
2023-12-31 20:17:32 +00:00
Logan Aerl Arias
b438392d63
Merge branch SRB2:next into fix-slope-convex-sectors
2023-12-31 17:13:23 +00:00
Logan Aerl Arias
aa6faba24a
Merge branch 'next' into fix-table-key-archiving
2023-12-31 12:12:13 -05:00
Logan Aerl Arias
f6b201173f
Merge branch SRB2:next into disable-powerup-hud
2023-12-31 17:11:37 +00:00
Logan Aerl Arias
51bb5d41e0
Merge branch 'next' into lua-colorlib-get-sector-translation
2023-12-31 12:11:12 -05:00
Logan Aerl Arias
56325399cc
Merge branch SRB2:next into playersetup-and-continue-lua
2023-12-31 17:10:47 +00:00
Logan Aerl Arias
a0bd81d09a
Merge branch SRB2:next into bouncy-nights-fixes
2023-12-31 17:07:22 +00:00
Logan Aerl Arias
b700c3a8bf
Merge branch 'next' into cv-can-change
2023-12-31 12:06:27 -05:00
Logan Aerl Arias
b6ffd8ce01
Merge branch SRB2:next into oldspecnightsrecordsfix
2023-12-31 17:05:51 +00:00
Logan Aerl Arias
3331e073ea
Merge branch SRB2:next into slash-n
2023-12-31 17:05:06 +00:00
Logan Aerl Arias
057a3efe7f
Merge branch 'next' into fruits-clipper
2023-12-31 12:04:16 -05:00
Logan Aerl Arias
82f37ccadd
Merge branch SRB2:next into emblemexitfix
2023-12-31 17:03:43 +00:00
Logan Aerl Arias
fb5bf2555f
Merge branch SRB2:next into propercheats
2023-12-31 17:03:31 +00:00
Logan Aerl Arias
8c3d590730
Merge branch SRB2:next into exitfix
2023-12-31 17:03:12 +00:00
Logan Aerl Arias
530c93c1e7
Merge branch SRB2:next into setflip
2023-12-31 17:02:58 +00:00
Logan Aerl Arias
e24a9c2fe4
Merge branch 'next' into improve-download-refuse-message
2023-12-31 11:58:10 -05:00
Logan Aerl Arias
c159987a30
Merge branch SRB2:next into blockedexposed
2023-12-31 16:57:01 +00:00
Logan Aerl Arias
07b0df0fba
Merge branch 'next' into sector-portals
2023-12-31 11:56:34 -05:00
Logan Aerl Arias
c409b69dec
Merge branch SRB2:next into fireflower-icon
2023-12-31 16:53:11 +00:00
Logan Aerl Arias
28f982fdce
Merge branch SRB2:next into pandoradev
2023-12-31 16:48:54 +00:00
Logan Aerl Arias
987f6fbe2b
Merge branch SRB2:next into theyseemerollingtheybraking
2023-12-31 16:48:15 +00:00
Logan Aerl Arias
6d7549476b
Merge branch 'next' into showinput
2023-12-31 11:47:14 -05:00
Logan Aerl Arias
cd5bc8b6eb
Merge branch SRB2:next into expos-camreset
2023-12-31 16:45:58 +00:00
Logan Aerl Arias
5a7171a814
Merge branch SRB2:next into pit-savior
2023-12-31 16:45:01 +00:00
Logan Aerl Arias
25c24bb9d8
Merge branch SRB2:next into expos-local
2023-12-31 16:44:47 +00:00
Logan Aerl Arias
38dec322ba
Merge branch SRB2:next into interpolate-shield-spawning
2023-12-31 16:44:23 +00:00
Logan Aerl Arias
a343abed01
Merge branch SRB2:next into static-void-drawstaticbox
2023-12-31 16:44:10 +00:00
Logan Aerl Arias
456f7ef9a6
Merge branch SRB2:next into devmode-hudlines
2023-12-31 16:43:54 +00:00
Logan Aerl Arias
12418623a5
Merge branch SRB2:next into custom-2.2.10
2023-12-31 16:43:06 +00:00
Logan Aerl Arias
be6b7ca1b3
Merge branch 'next' into bustablemobjzfix
2023-12-31 11:40:36 -05:00
Logan Aerl Arias
b1f1889a07
Merge branch SRB2:next into perfstats-thinkframes
2023-12-31 16:32:54 +00:00
Logan Aerl Arias
48d06337be
Merge branch SRB2:next into drawfill-transparency
2023-12-31 16:28:26 +00:00
Logan Aerl Arias
b67b0d3ac2
Merge branch SRB2:next into menu-unresponsiveness-fix
2023-12-31 16:19:50 +00:00
Logan Aerl Arias
47b34b3454
Merge branch SRB2:next into constants-global
2023-12-31 16:18:48 +00:00
Logan Aerl Arias
e7d972757b
Revert "Merge branch 'update-quittime-while-idling' into 'next'"
...
This reverts merge request !2210
2023-12-31 14:32:06 +00:00
Logan Aerl Arias
9b39493b42
Merge branch 'ogl-wireframe' into 'next'
...
Wireframe mode for OpenGL
See merge request STJr/SRB2!1644
2023-12-31 14:30:04 +00:00
Logan Aerl Arias
f5ac585338
Merge branch 'bind-multi-arg' into 'next'
...
Allow `bind` to accept more arguments for a command.
See merge request STJr/SRB2!1596
2023-12-31 14:24:39 +00:00
Logan Aerl Arias
091a874514
Merge branch 'thokking-hell' into 'next'
...
New CA_THOK effect
See merge request STJr/SRB2!1551
2023-12-31 14:16:27 +00:00
Logan Aerl Arias
7c13f6e9fd
Merge branch 'update-quittime-while-idling' into 'next'
...
Update player->quittime while a Server is Idling
Closes #1143 and #1119
See merge request STJr/SRB2!2210
2023-12-31 13:58:29 +00:00
Logan-A
9dea09a7cc
Update features.mk
...
change HAVE_MINIUPNPC to NOUPNP
2023-12-31 00:13:13 -05:00
Logan-A
acc78d0ee5
Update i_tcp.c
...
made UPnP port mapping enabled by default
lowered UPnP Discover delay from 2000 ms to 500 ms
only look for first InternetGatewayDevice found
remove UPnP port mapping on shutdown
2023-12-30 23:41:34 -05:00
Alam Ed Arias
9c3ac6c86f
Fix compiling on Linux/GNU systems with miniupnpc
2023-12-30 18:46:20 -05:00
Logan-A
322dfac85f
update SRB2 to use miniUPnPc API version 17
...
update miniUPnPc function calls to API version 17
update include statements for miniUPnPcc
use PKGCONFIG to find lib and inc forminiUPnPc
2023-12-30 18:00:21 -05:00
Logan-A
95803eca16
Update win32.mk
...
remove miniupnc block
2023-12-30 13:29:22 -05:00
Gustaf Alhäll
2919133ea4
fixup! fixup! fixup! Fix physics quirkiness on slopes with convex sectors
2023-12-30 11:55:09 +01:00
Gustaf Alhäll
faaf379c37
fixup! fixup! Fix physics quirkiness on slopes with convex sectors
2023-12-29 21:42:01 +01:00
Gustaf Alhäll
76becac078
fixup! Fix physics quirkiness on slopes with convex sectors
2023-12-29 20:07:25 +01:00
Gustaf Alhäll
d6c53b0438
Fix physics quirkiness on slopes with convex sectors
2023-12-29 19:28:38 +01:00
Zwip-Zwap Zapony
c361b732db
General NiGHTS fixes
2023-12-29 16:04:03 +01:00
SMS Alfredo
e680277428
Merge branch 'next' into 'setflip'
...
# Conflicts:
# src/p_local.h
2023-12-29 03:30:15 +00:00
Gustaf Alhäll
849455bba7
Fix one too many player count on dedicated servers
2023-12-28 21:52:48 +01:00
LJ Sonic
c2a8d1f7ea
Merge branch 'loadfile' into 'next'
...
`loadfile` in Lua
See merge request STJr/SRB2!1615
2023-12-28 17:08:10 +00:00
LJ Sonic
b3ef2b3344
Support loadfile in folder add-ons too
2023-12-28 17:32:36 +01:00
LJ Sonic
cb26e55260
Fix archiving with tables that contain tables as keys
2023-12-28 16:43:33 +01:00
LJ Sonic
646d1b0ea6
Fix Lua taglists methods not working
2023-12-28 15:17:14 +01:00
Lactozilla
70e9e2bdb0
Merge branch 'next' into more-sprite2
2023-12-27 23:48:20 -03:00
Lactozilla
fd64fdfa34
Merge branch 'next' into sector-portals
2023-12-27 23:46:16 -03:00
Gustaf Alhäll
8329b21b81
Fix dummy build
2023-12-27 22:35:00 +01:00
Alam Ed Arias
933a96013d
Merge branch 'master' into next
2023-12-26 17:50:21 -05:00
Alam Ed Arias
5d7ee3974f
Build: error on array bounds
2023-12-26 17:49:34 -05:00
