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
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
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
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
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
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
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
Jaime Passos
bf9ed39ec3
Change vis->transmap statement
2020-10-15 14:05:18 -03:00
Jaime Passos
bc3ac7615f
Remove unnecessarily duplicated code in R_GetSpriteTranslation
2020-10-15 11:32:21 -03:00
Jaime Passos
8294479a5f
Merge branch 'next' into allowshaders
2020-10-15 01:25:11 -03:00
Jaime Passos
4c59f8c615
Fix OpenGL GIF recording crashing with gif_localcolortable disabled
2020-10-15 01:14:16 -03:00
Jaime Passos
50bd8abc78
Fix precipitation
2020-10-15 00:03:32 -03:00
Jaime Passos
3bace37a25
Don't project if rot_y is less than a single fracunit
2020-10-14 21:26:23 -03:00
Jaime Passos
bf8bb383ab
Simplify the floor splat clipping code a bit
2020-10-14 21:20:37 -03:00
Steel Titanium
b19764dc8e
Merge branch 'master' into next
2020-10-14 14:58:07 -04:00
Jaime Passos
b4294220e5
Fix a crash in R_CalculateSlopeVectors called from R_RenderFloorSplat
2020-10-14 14:08:25 -03:00
Jaime Passos
e63efdac13
Only create floor sprite slopes when needed, instead of always allocating them.
...
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
2020-10-14 13:07:02 -03:00
sphere
a2ff89f007
Make record attack's quick retry more consistent.
2020-10-14 17:39:23 +02:00
James R
b35633bb61
brug
2020-10-14 01:19:43 -07:00
James R
cce55ccf90
Merge branch 'ffloorclip-2' into 'next'
...
Software 3D floor rendering optimization (second attempt)
See merge request STJr/SRB2!1184
2020-10-14 03:10:44 -04:00
James R
f7e9772e10
Merge branch 'i-pity-you' into 'next'
...
Allow JumpSpin abilities to be used with non-ability shields
Closes #277
See merge request STJr/SRB2!1146
2020-10-14 03:08:20 -04:00
Jaime Passos
ab526e47cc
Implement object-defined floor sprite slopes.
2020-10-14 00:57:13 -03:00
Jaime Passos
a8a66f698a
[Software] Use the light at the bottom of the object for splats
2020-10-13 23:14:05 -03:00
James R
bc23f582fe
Don't need to set this actually
2020-10-13 19:11:18 -07:00
James R
5fca04c3dd
Apply step up/down to opposite plane too
2020-10-13 19:04:52 -07:00
Jaime Passos
4b7bfce95e
Implement sloped floor sprites
2020-10-13 22:42:07 -03:00
Jaime Passos
fccbc00cac
Fix the wrong freeing function call being used in Patch_FreeData
2020-10-13 19:18:01 -03:00
Jaime Passos
63e471d902
Correctly return the output patch's size in Picture_PatchConvert
2020-10-13 19:16:25 -03:00
Zippy_Zolton
6fd226eb29
Crosshair fix, no GAMEQUIT
2020-10-13 16:41:39 -05:00
Jaime Passos
0e62cb2ada
Fix infinitely long splat spans
2020-10-13 17:03:50 -03:00
Zippy_Zolton
5d699591c7
more!!!!! :3
2020-10-13 14:23:56 -05:00
Jaime Passos
4273896311
Implement relative and absolute sprite offsets for objects (mobjs)
...
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
Zippy_Zolton
45b52e3729
good night
2020-10-13 02:19:20 -05:00
Zippy_Zolton
2ba1017dab
More whitelists :D
2020-10-13 02:13:35 -05:00
Jaime Passos
87e5d63723
Improve sorting between sprites and floor sprites
2020-10-13 02:24:18 -03:00
Jaime Passos
95d0097df6
Improve splat sorting:
...
Adjust the sort scale of splats
Do splat sorting in R_CreateDrawNodes if either vissprite is a splat, instead of if both are
2020-10-13 01:45:18 -03:00
Jaime Passos
7dbd34345c
Fix splat sorting
2020-10-13 01:09:17 -03:00
Jaime Passos
f2aca01e2b
Fix other uninitialized variable warnings
2020-10-13 00:14:27 -03:00
Jaime Passos
1ea3bd8fff
Fix uninitialized variable warning
2020-10-12 22:08:45 -03:00
Jaime Passos
453f49cb77
Fix floorsprites not being rendered when viewed from the bottom
2020-10-12 22:07:11 -03:00
James R
cb8f6097cf
Merge branch 'save-netvars' into 'next'
...
Save netvars
See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
Jaime Passos
831ccccdd6
OpenGL support for splats, fix some shadow draw bugs in Software
2020-10-12 19:53:21 -03:00
James R
58464771a8
Merge branch 'addfile-vararg' into 'next'
...
Give the addfile command variable argument support.
See merge request STJr/SRB2!1176
2020-10-12 18:32:20 -04:00
lachwright
6a73e81227
Merge remote-tracking branch 'origin/next' into i-pity-you
2020-10-13 09:24:09 +11:00
James R
d73fbd8616
Merge branch 'slight-shader-cleanup' into 'next'
...
Shader code cleanup
See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
GoldenTails
87a5e1d30c
Futureproof against strict buildbots.
2020-10-12 17:14:32 -05:00
James R
d7b8d5d0f3
Merge branch 'penalty-of-death' into 'next'
...
I am going to die :D (closes #337 )
Closes #337
See merge request STJr/SRB2!1183
2020-10-12 18:11:09 -04:00
James R
5a5024faf4
Merge branch 'skip-credits-gone-wrong' into 'next'
...
Fix clients being able to skip credits AGAIN (closes #339 )
Closes #339
See merge request STJr/SRB2!1182
2020-10-12 18:09:48 -04:00
James R
d4bef36c19
Merge branch 'specialstagecheck' into 'next'
...
A special stage is a special stage, even outside of coop.
Closes #211
See merge request STJr/SRB2!1180
2020-10-12 18:08:02 -04:00
James R
d1c8d41f94
Merge branch 'no-demo-visit' into 'next'
...
Don't count demo playback as visiting a level.
Closes #327 and #340
See merge request STJr/SRB2!1177
2020-10-12 18:05:43 -04:00
GoldenTails
94f6d0b002
Fix gzip failing to compress SRB2's objdump on non-Windows.
2020-10-12 16:59:47 -05:00
James R
35c666514b
Merge branch 'splitscreen-parameter' into 'next'
...
Add `-splitscreen` commandline parameter
See merge request STJr/SRB2!1175
2020-10-12 17:46:55 -04:00
James R
9538ca696a
Merge branch 'ceilingz' into 'next'
...
Add P_CeilingzAtPos function
See merge request STJr/SRB2!1164
2020-10-12 17:44:51 -04:00
Jaime Passos
b620f4835a
Support spritexscale and spriteyscale in OpenGL
...
Fix papersprite scaling with spritexscale and spriteyscale in Software
2020-10-12 17:25:18 -03:00
Zippy_Zolton
da27f720da
Whitelist the "X" shown in the HUD
2020-10-11 23:22:16 -05:00
Jaime Passos
cc97e22e2f
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
b808b3ef41
Move calculation of rotated patch dimensions into its own function
...
Simplify rotation code when the pivot isn't in the center
2020-10-11 03:39:31 -03:00
James R
7f8ec74c27
Use the macro in sectorlines_num too
2020-10-10 17:40:01 -07:00
James R
8bc8946be8
Turn the lua sector lines hack into a macro
2020-10-10 16:43:09 -07:00
Jaime Passos
6145442a34
Fix rotated flipped patches
2020-10-10 19:06:29 -03:00
Jaime Passos
b2f45986ad
Add r_patchrotation.h
2020-10-10 18:53:05 -03:00
Jaime Passos
6e5f71dd45
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b15bbd505c
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
465693b242
Put newline to end of m_perfstats.h
2020-10-10 22:23:33 +03:00
Hannu Hanhi
4f20a20165
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
06c0932ab4
Only check the tRNS (trans) chunk if the image is still palettized
2020-10-10 14:17:53 -03:00
Jaime Passos
4d847f4223
Compare the PNG's palette with the game's palette instead of assuming they are the same
2020-10-10 14:17:42 -03:00
Jaime Passos
0021a9aeaf
Fix bug
2020-10-10 13:37:23 -03:00
Jaime Passos
c5a3a61b28
Make 3D floors cull areas below or above them to reduce overdraw (2)
2020-10-10 01:00:39 -03:00
James R
4b5cb8025b
Show revert value of cvar with help command
2020-10-09 16:28:03 -07:00
James R
b67807dd04
When save/loading config use revert value for netvars if you are not the server
2020-10-09 16:22:17 -07:00
James R
f5e4d076b9
Add CV_NETVAR to server affecting cvars
...
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
2020-10-09 15:23:16 -07:00
James R
aa102dcea0
Add CV_SAVE to netvars
...
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime
tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
2020-10-09 15:06:09 -07:00
Zippy_Zolton
1c751fdf0f
I am going to die :D
2020-10-09 15:42:55 -05:00
James R
a17446f905
Oops, go straight to evaluation if not in a netgame
...
serverrunning means that you are actually the server.
2020-10-09 13:16:56 -07:00
sphere
76d16473b9
how did this even happen
2020-10-09 05:55:10 -04:00
Jaime Passos
0811f60b2a
Let the server or an admin toggle clients' custom shaders
2020-10-09 02:06:13 -03:00
James R
15008f31a7
Merge branch 'sanity-meter-empty' into 'next'
...
Replace cvar initializers with a macro
See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
7c72eab58b
Merge branch 'manifest-stuff' into 'next'
...
Provide a default exe manifest
See merge request STJr/SRB2!1174
2020-10-08 22:01:17 -04:00
James R
ddb6823fe5
Merge branch 'fix-theoretical-lua-exposure-crashes' into 'next'
...
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions in Lua.
See merge request STJr/SRB2!1173
2020-10-08 22:01:02 -04:00
James R
45b9e23895
Merge branch 'ogl-driver-error' into 'next'
...
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
See merge request STJr/SRB2!1172
2020-10-08 22:00:43 -04:00
James R
933381fb8f
Merge branch 'expose-modversion-to-lua' into 'next'
...
Expose MODVERSION to Lua (because for some reason it wasn't).
See merge request STJr/SRB2!1158
2020-10-08 21:57:38 -04:00
James R
d83a112fc5
Merge branch 'next' into 'next'
...
Updated 16 bit momentum values to 32 bit in demos, changed demo version
See merge request STJr/SRB2!1157
2020-10-08 21:56:30 -04:00
Jaime Passos
63d4c1dffc
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
James R
c3c34c489b
Merge branch 'lua-sectorsounds' into 'next'
...
Support sectors as sound origins in Lua
See merge request STJr/SRB2!1144
2020-10-08 21:05:01 -04:00
James R
355cc1a697
Merge branch 'autocomplete-aliases' into 'next'
...
Autocomplete aliases in console
See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
88b3a3cd2e
Merge branch 'v-string-colormap-lua-exposure' into 'next'
...
Expose V_GetStringColormap to Lua via v.getStringColormap().
See merge request STJr/SRB2!1111
2020-10-08 20:28:25 -04:00
James R
95a5bb888a
Merge branch 'chain-attraction-homing' into 'next'
...
Chain Homing with Attraction Shield
See merge request STJr/SRB2!1109
2020-10-08 20:19:21 -04:00
sphere
b71c75d2ec
A special stage is a special stage, even outside of coop.
2020-10-08 18:45:20 +02:00
James R
b3d8ed7d43
Revert netvars after leaving a netgame
2020-10-06 23:32:11 -07:00
James R
dbd79a29a4
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Zachary McAlpin
0f3c87a705
Made states unmodifable in CMD building code
2020-10-06 16:54:23 -05:00
Zachary McAlpin
e393093e73
Update comment
2020-10-06 16:43:14 -05:00
sphere
f210316d8a
Only set MV_MP in multiplayer or a netgame.
2020-10-06 19:06:06 +02:00
sphere
48ca58f580
Don't count demo playback as visiting a level.
2020-10-06 16:49:53 +02:00
GoldenTails
d5848e78fc
Update help message to mention supported file extensions, and change the description to "Load add-ons"
2020-10-06 03:37:23 -05:00
Zachary McAlpin
1681371fbd
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port
2020-10-06 02:07:05 -05:00
GoldenTails
2d3a589167
Add warning when files are skipped due to being previously processed.
2020-10-04 21:03:29 -05:00
GoldenTails
0b74818771
Give the addfile command variable argument support.
2020-10-04 21:02:20 -05:00
gm3k4g
2cc8de2bdd
Added splitscreen command line parameter
2020-10-05 00:12:13 +03:00
Steel Titanium
0aa1b16fd1
Provide a default exe manifest
2020-10-03 19:53:59 -04:00
GoldenTails
2ae5c02050
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions.
2020-10-03 13:24:47 -05:00
Louis-Antoine
e49032eaf7
Let Lua scripts access userdata metatables
2020-10-03 18:40:37 +02:00
Hannu Hanhi
684b868524
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
2020-10-03 18:45:56 +03:00
Louis-Antoine
121c7da809
Let Lua scripts relink tables to their metatables when unarchiving
...
This is done through the new "registermetatable" function,
in a somewhat similar fashion to "freeslot" but for metatables:
it must be called at script load to tell SRB2 your metatable
can be automatically relinked during the unarchiving process.
2020-10-03 16:31:04 +02:00
James R
17ce7d57c3
Merge branch 'update-228' into 'next'
...
2.2.8 prep
See merge request STJr/SRB2!1170
2020-10-03 01:45:06 -04:00
James R
b1d59c6641
Merge branch 'picfmt-pngfix' into 'next'
...
Fix uninitialized variable issue in patches with missing grAb chunks
See merge request STJr/SRB2!1171
2020-10-02 20:24:10 -04:00
James R
27d96bb21c
Merge branch 'fartification' into 'next'
...
Prevent Canarivore gas from teleporting up walls
See merge request STJr/SRB2!1154
2020-10-02 20:23:36 -04:00
James R
8beee3761e
Merge branch 'windows-console-go-brrr' into 'next'
...
Fix #178
Closes #178
See merge request STJr/SRB2!1112
2020-10-02 20:23:20 -04:00
James R
c35c5ad568
Merge branch 'remove-renderer-notice' into 'next'
...
Remove "The OpenGL renderer is incomplete" notice (closes #281 )
Closes #281
See merge request STJr/SRB2!1169
2020-10-02 20:22:38 -04:00
Jaime Passos
ebf50aad44
Use leftoffset and topoffset, not loffs and toffs
2020-10-02 20:40:42 -03:00
James R
401508e9d4
Update Srb2win.rc
2020-10-02 16:11:39 -07:00
James R
c51a4c8fb1
Update version to 2.2.8
2020-10-02 16:10:21 -07:00
James R
1c6c51744c
Update patch.pk3
2020-10-02 16:07:15 -07:00
Jaime Passos
aaa9cff6ac
Fix PNG issue in OpenGL + optimize PNG sprite loading
2020-10-02 19:48:13 -03:00
James R
be4c5751f8
Revert "Warn when going to OpenGL from the menu"
...
This reverts commit 569453ee93
.
And one line from b6089ccdaf
.
2020-10-02 15:37:23 -07:00
Steel Titanium
386db4b7a1
Model fallback
2020-10-02 15:45:43 -04:00
James R
8a8e0ceda2
Move HU_LoadGraphics after startuppwads are loaded
...
This is needed for graphics replacements to take effect.
2020-10-02 11:54:58 -07:00
James R
61cae79bd4
Fix off by one
2020-10-01 16:55:17 -07:00
James R
1cfb1f673b
Add wads from the -file parameter after netvars are registered
...
This is so netvars registered by any lua scripts will load in the correct order.
2020-10-01 16:50:31 -07:00
sphere
a9a0137d22
Remove "RC3"
2020-09-30 20:25:55 +02:00
sphere
d45d5b4e20
Merge branch 'credits-changes' into 'next'
...
Credits changes
See merge request STJr/SRB2!1161
2020-09-30 13:25:39 -04:00
lachwright
e715b2f01a
Update ICNS icon for macOS
...
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
2020-10-01 02:47:24 +10:00
Snu
bfd8bd7564
comment typo
2020-09-30 08:44:43 +01:00
Snu
8a00b47b38
Make the function ACTUALLY work
2020-09-30 08:40:21 +01:00
Snu
82ceddb2be
god damnit
2020-09-30 08:10:28 +01:00
Snu
feb011ee52
Expose function to Lua
2020-09-30 07:58:41 +01:00
Snu
ca88db00cd
Create P_CeilingzAtPos function
2020-09-30 07:56:57 +01:00
Snu
afcadb3232
Remove all instances of PF_CANBUSTFLOORS
2020-09-29 20:16:06 +01:00
sphere
2642df4c98
Fix Arrietty's name being misspelled.
2020-09-29 18:06:50 +02:00
sphere
2ebe731bd4
Game design is a team effort.
2020-09-29 17:23:44 +02:00
Snu
cd4f755e53
Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively.
2020-09-29 13:52:35 +01:00
Snu
75042d781f
Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls.
2020-09-29 13:47:48 +01:00
Snu
90fbb752fa
Add functionality to PF_CANBREAKFLOORS
2020-09-29 12:58:36 +01:00
Snu
04b749f1f9
Remove SF_BUSTABLEBUSTER, change SF_CANBREAKFLOORS to a pflags; PF_CANBREAKFLOORS
2020-09-29 11:05:04 +01:00
Snu
d07422bda1
Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS.
2020-09-29 10:32:45 +01:00
Snu
07a57d0419
Add SF_CANBREAKWALLS, SF_CANBREAKFLOORS and SF_BUSTABLEBUSTER
2020-09-29 09:45:34 +01:00
sphere
2e172de6eb
Merge Programming and Programming Assistance, and some other tweaks.
2020-09-28 15:54:10 +02:00
sphere
a3d09ca625
These people deserve to be in the credits proper, also formatting fixes.
2020-09-28 14:48:55 +02:00
Lachlan
becc42920b
Bump RC version
2020-09-28 11:39:57 +08:00
Lachlan
5946b54a92
Fix compiler warning
2020-09-28 11:38:56 +08:00
Lachlan
7697553498
Update patch.pk3 checksum
2020-09-28 11:12:15 +08:00
Lachlan Wright
09c83b43b1
Merge branch 'fix-shoop-da-koop' into 'next'
...
Fix Eggmobile spawning Bowsers after hitting Fang with pinch phase laser
Closes #288
See merge request STJr/SRB2!1160
2020-09-27 22:42:28 -04:00
Lachlan Wright
ca2eb78055
Merge branch 'special-stage-respects-nextmapoverride' into 'next'
...
Make Special Stage map transitions respect nextmapoverride.
See merge request STJr/SRB2!1129
2020-09-27 22:42:07 -04:00
Lachlan Wright
27b7b5efce
Merge branch 'fix-noscalepatch-with-string-drawers' into 'next'
...
Fix string drawing functions so they account for V_NOSCALEPATCH effectively…
See merge request STJr/SRB2!1107
2020-09-27 22:41:39 -04:00
Monster Iestyn
ddd59a6e9d
A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser
2020-09-26 17:31:49 +01:00
SteelT
060f46653d
Merge branch 'ogl-model-uv-adjust' into 'next'
...
Re-adjust model UVs when sprite texture dimensions change
See merge request STJr/SRB2!1068
2020-09-25 21:19:59 -04:00
Steel Titanium
9e036e6291
Fix quotes appearing in product version string
2020-09-25 18:55:37 -04:00
Steel Titanium
375d09c734
Update patch.pk3 hash
2020-09-25 18:15:52 -04:00
Steel Titanium
5d54c70bfa
Change prerelease version suffix to RC2
2020-09-25 17:58:02 -04:00
James R
057d765821
Add Jeck to the credits
2020-09-25 11:47:24 -07:00
Lachlan Wright
b4f9767b7b
Merge branch 'sound-origin' into 'next'
...
Apply volume to sounds with origin too
See merge request STJr/SRB2!1156
2020-09-25 10:04:46 -04:00
Lachlan Wright
92b61aacd8
Merge branch 'name-change-spam' into 'next'
...
Don't let players change their name more than five times per minute
See merge request STJr/SRB2!1155
2020-09-25 09:36:39 -04:00
Lachlan Wright
86b7957b61
Merge branch 'clarity' into 'next'
...
Add-on clarity from Kart
See merge request STJr/SRB2!1153
2020-09-25 09:33:04 -04:00
Lachlan Wright
1caf92f0ae
Merge branch 'fix-236' into 'next'
...
Only allow explicitly living players to trigger sector specials
Closes #236
See merge request STJr/SRB2!1152
2020-09-25 09:31:06 -04:00
Lachlan Wright
8f5f248c87
Merge branch 'turret-seeing-ghosts' into 'next'
...
Fix P_SupermanLook4Players assigning spectators as targets
Closes #209
See merge request STJr/SRB2!1151
2020-09-25 09:30:38 -04:00
Lachlan Wright
9208f0bc33
Merge branch 'no-skincolor-space-warning' into 'next'
...
Remove "skincolor name contains spaces" console warning
Closes #280
See merge request STJr/SRB2!1148
2020-09-25 09:30:24 -04:00
Lachlan Wright
3117dfaf2b
Merge branch 'botsavestuff' into 'next'
...
Save changes made to the bot's skin, and display it properly in save select
See merge request STJr/SRB2!1147
2020-09-25 09:30:03 -04:00
Lachlan Wright
256fa9fa10
Merge branch 'more-helpful-lua-error' into 'next'
...
Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened
See merge request STJr/SRB2!1145
2020-09-25 09:28:49 -04:00
Lachlan Wright
c42f247ce5
Merge branch 'snake-fixes' into 'next'
...
Fix bonus items sometimes overriding apples in Snake minigame
See merge request STJr/SRB2!1134
2020-09-25 09:23:33 -04:00
Lachlan Wright
f1d2992f51
Merge branch 'dye-fix' into 'next'
...
Fix players not properly decolorizing via linedef action
See merge request STJr/SRB2!1127
2020-09-25 08:54:16 -04:00
Lachlan Wright
982435cf86
Merge branch 'more-stats' into 'next'
...
Add tic and UI times to render stats
See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04:00
Lachlan Wright
650635e780
Merge branch 'w-initfile-bruh' into 'next'
...
Fix a bug where adding the same mod multiple times counted towards the mod limit
See merge request STJr/SRB2!1124
2020-09-25 08:52:22 -04:00
Lachlan Wright
7fee293034
Merge branch 'gl-shearing-fix-2' into 'next'
...
Fix cv_glshearing 2 in first person
See merge request STJr/SRB2!1114
2020-09-25 08:51:57 -04:00
Lachlan Wright
dbc32ea9ea
Merge branch 'console-silly-characters' into 'next'
...
Get rid of some silly behavior with certain characters in console
See merge request STJr/SRB2!1110
2020-09-25 08:31:08 -04:00
Lachlan Wright
86252cbea7
Merge branch 'more-nodes' into 'next'
...
Increase MAXNETNODES, show more servers in the server browser
See merge request STJr/SRB2!1106
2020-09-25 08:24:16 -04:00
GoldenTails
021061d80b
Expose MODVERSION to Lua (because for some reason it wasn't).
...
The wiki even states its existence!
2020-09-23 22:28:29 -05:00
James R
30056157c2
Merge branch 'listserv' into 'next'
...
Percent decode listserv (closes #244 )
Closes #244
See merge request STJr/SRB2!1150
2020-09-23 18:43:41 -04:00
James R
aa4c1eeea8
Merge branch 'bird-pain' into 'next'
...
Fix playing back demos never working (closes #203 )
Closes #203
See merge request STJr/SRB2!1149
2020-09-23 18:37:56 -04:00
Riku Salminen
e947007920
Wrote 3 lines in 1, as Zwip-Zwap Zapony suggested
2020-09-23 22:37:06 +03:00
Riku Salminen
b261e17fdd
Update g_demo.c, Remove old comments of fractional loss of one byte
2020-09-23 15:29:03 -04:00
Riku Salminen
1447aba964
Updated 16 bit momentum values to 32 bit in demos, changed demo version
2020-09-23 21:26:51 +03:00
James R
de9d1d2b35
Forgot to commit s_sound.h
2020-09-22 20:51:01 -07:00
James R
b18d60c1d3
Apply volume to sounds with origin too
...
Previously sounds with an origin would always start at max volume. This is
because the distance calculation adjusts the volume, and that volume needs to
be updated every tic as distance changes. Storing the original volume works.
(cherry picked from commit 22177753d2f00d58d19d930f51dcd086097dfd0d)
2020-09-22 20:47:31 -07:00
James R
b655fa496e
Don't let players change their name more than five times per minute
...
(ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
2020-09-22 12:04:28 -07:00
lachwright
9ae2010880
Allow Canarivore gas to interact with players again (oops)
2020-09-22 13:11:56 +09:30
lachwright
5d1a95b9c6
Prevent Canarivore gas from teleporting up walls
2020-09-21 17:23:53 +09:30
Zippy_Zolton
62f379ec41
Add-on clarity from Kart
2020-09-20 13:07:28 -05:00
lachwright
7eb760afca
Only allow explicitly living players to trigger sector specials
2020-09-20 11:49:53 +09:30
Tatsuru
a52afc2baf
Ignore spectators
2020-09-19 23:10:03 -03:00
James R
5edcc72839
Shitty decode listserv
2020-09-19 18:54:04 -07:00
James R
9e31adf22c
Merge branch 'objectplace' into 'next'
...
Fix & improve objectplace
Closes #232
See merge request STJr/SRB2!1139
2020-09-19 21:40:55 -04:00
James R
9684149ba6
Merge branch 'start-netid-at-1' into 'next'
...
Avoid CV_FindNetVar returning a normal cvar (closes #251 )
Closes #251
See merge request STJr/SRB2!1137
2020-09-19 21:40:45 -04:00
James R
bdb44e6ce1
Don't ifdef CV_LoadDemoVars out if OLD22DEMOCOMPAT defined
2020-09-19 18:34:52 -07:00
kaysrishaq
c3430951be
Update lua_infolib.c
2020-09-18 17:47:38 -04:00
lachwright
a78a0071f2
Save changes made to the bot's skin, and display it properly in save select
2020-09-17 19:00:49 +09:30
lachwright
2bb5b42960
Allow JumpSpin abilities to be used with non-ability shields
2020-09-16 16:50:10 +09:30
Steel Titanium
16569b4e9a
Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened
...
Shouldn't break scripts as it stops execution as soon it happens, like it already does.
2020-09-14 22:54:07 -04:00
Tatsuru
013714a26f
Encapsulate userdata checks
2020-09-14 17:33:26 -03:00
Monster Iestyn
0f2e063de0
Added the ability to modify parent, flags, translucency in polyobj_t
...
(attempting to edit polyobj.angle just gives you an error message saying to use polyobj:rotate() instead)
2020-09-13 21:38:16 +01:00
Tatsuru
8d65ce81c7
Legacy moment
2020-09-13 14:30:02 -03:00
Tatsuru
454682df70
Use the sector's actual soundorg (how did it even work)
2020-09-13 13:54:43 -03:00
Tatsuru
782e559adf
Check for sector_t userdata as well
2020-09-13 12:33:18 -03:00
SteelT
90302330ed
Merge branch 'make-float-strings-great-again' into 'next'
...
Can we just do this please? Thanks.
See merge request STJr/SRB2!1142
2020-09-11 11:47:04 -04:00
SteelT
9f09e32520
Merge branch 'remove-bt_use-deprecation' into 'next'
...
Remove BT_USE and PF_USEDOWN warning
See merge request STJr/SRB2!1138
2020-09-10 16:06:20 -04:00
SteelT
a033f482be
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
0750d273a6
Attempt to use the PNG image's palette, if it is present
2020-09-10 03:16:21 -03:00
Jaime Passos
4e437076c1
Use color look-up table for PNG conversion
2020-09-10 02:10:31 -03:00
Jaime Passos
f24647dc4d
Change method of color look-up table generation
2020-09-10 01:43:46 -03:00
GoldenTails
c61eeb9238
Can we just do this please? Thanks.
2020-09-09 22:19:14 -05:00
Monster Iestyn
097986b1d9
added polyobj_t to userdataType list
...
(also added slope_t, vector2_t and vector3_t since they were all missing from here)
2020-09-09 21:24:07 +01:00
Monster Iestyn
78f7998618
Added polyobj.vertices and polyobj.lines to Lua
2020-09-09 21:15:02 +01:00
Monster Iestyn
4ce161f9c3
Added the functions Polyobj_moveXY and Polyobj_rotate to Lua as polyobj.moveXY and polyobj.rotate
2020-09-09 19:38:56 +01:00
Monster Iestyn
f86dad2979
Added new functions as variables of polyobj_t:
...
* po.pointInside(po, x, y) as a wrapper for P_PointInsidePolyobj
* po.mobjTouching(po, mo) as a wrapper for P_MobjTouchingPolyobj
* po.mobjInside(po, mo) as a wrapper for P_MobjInsidePolyobj
I can confirm that ":" syntax works with all the above, e.g. po:mobjInside(mo)
2020-09-09 18:09:32 +01:00
Monster Iestyn
5f91833701
lua_maplib.c changes now that polyobj_t is supported:
...
* added line.polyobj for line_t
* added subsector.polyList iteration function, for iterating polyobjs in a subsector
* added seg.polyseg for seg_t, in case we ever reenable support for segs/nodes
2020-09-09 17:31:44 +01:00
Monster Iestyn
89e989d6b1
added "sector" as a Lua-exclusive shortcut to polyobj->lines[0]->backsector in polyobj_t
2020-09-09 17:06:36 +01:00
Monster Iestyn
e6136eb113
lua_blockmaplib.c: added "polyobjs" option to searchBlockmap function
...
also updated my copyright years in this file B)
2020-09-09 16:56:48 +01:00
Monster Iestyn
625aeb1560
lua_script.c fixes:
...
* make sure polyobj_t userdata is invalidated at level load
* add support for syncing polyobj_t Lua variables in netgames
2020-09-09 16:09:08 +01:00
Monster Iestyn
5fc58de94f
* added access to translucency and triggertag in polyobj_t
...
* added POF_ flags to INT_CONST in dehacked.c
2020-09-08 22:10:11 +01:00
Monster Iestyn
33c96ab1aa
* added access to id, parent, angle, damage, thrust, flags in polyobj_t
...
* #polyobj now returns the index id for the polyobj in PolyObjects
* Polyobj_GetForNum is implemented in Lua as PolyObjects.GetForNum()
2020-09-08 21:42:51 +01:00
Monster Iestyn
60b49b5ecd
Fix STJr copyright years, this file was obviously only created today, not 4 years ago!
2020-09-08 18:56:00 +01:00
Monster Iestyn
0bc7eb32e9
make sure to include fastcmp.h, whoops
2020-09-08 18:55:16 +01:00
Monster Iestyn
05fe86ffdc
* started functions for accessing/editing META_POLYOBJ (bare minimum atm)
...
* added the "PolyObjects" array as a global var, with index and len functions, as well as its own iterate function
2020-09-08 18:29:10 +01:00
Monster Iestyn
d5beae9738
Begin work on adding access to polyobjects in Lua:
...
* create new file lua_polyobjlib.c
* made a stub LUA_PolyObjLib function
* added META_POLYOBJ to lua_libs.h
* updated makefile, CMake and MSVC project files for lua_polyobjlib.c
2020-09-08 18:08:08 +01:00
Bartu Ä°nce
7e9bc0d103
no message
2020-09-08 03:03:48 +03:00
Jaime Passos
dcaad758f4
Improved memory management for patches
2020-09-07 02:23:07 -03:00
lachwright
efc82ffa74
Set additional UDMF parameters on objectplaced mapthings to defaults
2020-09-07 13:08:22 +09:30
lachwright
b805e10058
Let analog control schemes control objectplace like standard control schemes
2020-09-06 19:03:17 +09:30
lachwright
d7ab41a90b
Objectplace improvements:
...
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
2020-09-06 17:28:34 +09:30
James R
ca9cf25423
Fix netid overflow check
2020-09-05 23:23:54 -07:00
GoldenTails
8ae5f3030f
Remove BT_USE and PF_USEDOWN warning
...
someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it
2020-09-06 00:30:05 -05:00
James R
30057e9268
Start netid at 1 to avoid CV_FindNetVar returning a regular cvar for netid 0
2020-09-05 22:03:14 -07:00
James R
9a1099ec17
Update SuperPhanto's name with real name per request
2020-09-02 17:59:53 -07:00
James R
7bec06856f
Add SuperPhanto to the art credits
2020-09-01 18:51:47 -07:00
James R
c7c9ae3847
Disable update alert if this is a prerelease
2020-09-01 16:22:29 -07:00
James R
4b7d16283d
Update version to 2.2.7 RC1
2020-09-01 15:38:51 -07:00
James R
72437ae357
Define BETAVERSION as a suffix to the version string
2020-09-01 15:38:27 -07:00
James R
045a5d3dd1
Update patch.pk3 asset hash
2020-09-01 15:26:13 -07:00
Steel Titanium
db6bd42eb1
Allow the game to continue even if the STARTUP
lump is somehow missing
2020-09-01 14:46:03 -04:00
Steel Titanium
4509cd3798
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat
2020-09-01 13:54:27 -04:00
GoldenTails
4173b15c8e
Expose V_GetStringColormap to Lua via v.getStringColormap().
2020-09-01 10:47:02 -05:00
James R
b2226e95d6
Merge branch 'master' into next
2020-08-31 16:10:05 -07:00
James R
e593610862
Fix NOHW compiling
2020-08-31 16:09:41 -07:00
James R
6c2370f894
Kill NOHS
...
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
2020-08-31 16:06:40 -07:00
James R
2aab765b36
Fix NOGME compiling
...
(cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)
2020-08-31 16:04:09 -07:00
James R
679bfa21ed
Fix stupid NONET
2020-08-29 17:51:59 -07:00
James R
a6e59cbb24
Do not do master server things when NOCURL
...
(cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)
2020-08-29 17:45:28 -07:00
James R
1f38db4629
C90?
2020-08-29 17:21:54 -07:00
Steel Titanium
b20352141e
Fix compile error
2020-08-29 20:04:11 -04:00
Steel Titanium
0bd71d9980
Attempts to make the intro a bit more shorter
...
Make the scene time be 5 seconds long max
Use the standard fade which is much shorter in length.
2020-08-29 19:28:16 -04:00
James R
37c647c00e
Merge remote-tracking branch 'origin/master' into next
2020-08-28 19:52:25 -07:00
James R
8d9b16df8c
Merge branch 'makefile-detect-system' into 'master'
...
Detect which system the Makefile is running on to compile for
See merge request STJr/SRB2!1123
2020-08-28 22:49:34 -04:00
Steel Titanium
3ef8024697
Make the intro shorter as I felt it was a bit too long
...
Change the code a bit so less magic numbers.
2020-08-28 20:08:46 -04:00
Steel Titanium
4eaa7e969f
Add new STARTUP
lump, for the splash screen
2020-08-28 17:11:38 -04:00
Steel Titanium
a3039a781a
New STJR Intro, replaces the old PURE FAT intro
2020-08-28 17:10:54 -04:00
GoldenTails
ca4ed3b7dd
Make Special Stage map transitions respect nextmapoverride.
...
In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars.
It's otherwise impossible to do so via Lua.
2020-08-26 23:22:53 -05:00
Tatsuru
48d6ae8e53
Decolorize players as intended
2020-08-24 23:53:21 -03:00
Louis-Antoine
cb06d05692
Fix bonus items sometimes overriding apples in Snake minigame
2020-08-24 00:34:44 +02:00
Hannu Hanhi
dd7d1e40b1
Add tic and ui times to render stats
2020-08-23 20:09:55 +03:00
GoldenTails
d15be1696a
Forgot to check if the file was important, whoops!
2020-08-21 04:00:54 -05:00
GoldenTails
2c5f23bacb
Fix a bug where adding the same mod multiple times counted to the mod limit
...
A one line fix. Seriously.
2020-08-21 03:30:22 -05:00
James R
6f51c68c72
Makefile: add WINDOWSHELL=1 for the Windows detect
2020-08-20 20:19:50 -07:00
James R
e340d74e4d
Merge branch 'ringslinger-penalty-snap' into 'next'
...
Fix Ringslinger weapon ring penalty missnapment
See merge request STJr/SRB2!1120
2020-08-19 18:18:15 -04:00
James R
38d094d3f6
Merge branch 'fix-file-downloading' into 'next'
...
Fix bug where SRB2 would check size of disk from current directory instead of srb2home
See merge request STJr/SRB2!1121
2020-08-19 18:16:22 -04:00
James R
809ff5c467
Merge branch 'oops-http-mserv' into 'next'
...
Fix lingering issues with the http-mserv merge
See merge request STJr/SRB2!1117
2020-08-19 18:12:38 -04:00
James R
f92026f98b
Makefile: automatically detect system to compile for, if no system was specified
...
This should work for mingw and linux so far.
2020-08-18 18:01:59 -07:00
James R
9495e6354f
Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
2020-08-18 16:45:00 -07:00
James R
f0bf06aee2
Is it GCC is it gcc, is it????
...
(cherry picked from commit ef2bff6383b16385f9874e1c9c6b66c9df794f5b)
2020-08-18 16:37:19 -07:00
James R
9147474a30
Merge branch 'showjoinaddress-menu' into 'next'
...
Add a menu option for showjoinaddress; disable it by default
See merge request STJr/SRB2!1115
2020-08-18 19:15:23 -04:00
GoldenTails
0a9c061fea
Fix bug where SRB2 would check size of current directory instead of srb2home
...
Hopefully that fixes that one bug with weird filesize issues too
2020-08-18 17:34:32 -05:00
Hannu Hanhi
bda1d1e725
Convince the compiler that I know what I'm doing, I think
2020-08-18 23:21:26 +03:00
James R
300436825d
Cast UINT16 for unlockable_t.height -> alphaKey
2020-08-18 11:19:16 -07:00
Zwip-Zwap Zapony
d87c0eeaf1
Fix Ringslinger weapon ring penalty missnapment
2020-08-18 11:42:35 +02:00
Nev3r
77e438d4bd
Some commenting tweaks.
2020-08-16 11:33:00 +02:00
Jaime Passos
92c4993d67
Introduce Doom patch format into picture formats
...
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Jaime Passos
9b426b474c
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Jaime Passos
8863e13fde
Rename R_CheckIfPatch
2020-08-15 20:14:36 -03:00
Nev3r
b15c760dc2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
James R
bcb0854db8
.
2020-08-14 22:38:15 -07:00
James R
0944b5ad6f
Strip a few more instances of SONIC ROBO BLAST 2 KART
2020-08-14 22:18:51 -07:00
James R
58971259ef
Is this SRB2Kart server?
2020-08-14 22:13:28 -07:00
James R
beba43cffc
Add a menu option for showjoinaddress
...
I also had to make the "alphaKey" UINT16. Hopefully nothing breaks!
2020-08-14 21:13:15 -07:00
James R
405639bc78
Disable showjoinaddress by default
2020-08-14 21:05:23 -07:00
James R
5ccafe0314
REMOVE THE LAST OF CV_ALLCAPS
2020-08-14 21:01:41 -07:00
Jaime Passos
78cc4a78d0
Refactor renderer switching
2020-08-14 22:27:16 -03:00
Jaime Passos
1751d7afed
Cache the console patch only once in CON_DrawBackpic
2020-08-14 20:48:15 -03:00
Jaime Passos
1950f1c7f7
Fix cv_glshearing 2 in first person
2020-08-14 20:31:30 -03:00
James R
be14b8a564
dumbass doesn't test changes before pushing directly to next
2020-08-14 08:25:12 -07:00
James R
aa19bce4a9
Autocomplete aliases in console
2020-08-14 00:00:45 -07:00
James R
f0a79df2b8
Use AsciiChar to get the input from windows console window
2020-08-13 21:57:36 -07:00
James R
4734b9d728
Stop treating apostrophes, parenthesis and curly braces as separate arguments
2020-08-13 21:11:45 -07:00
Louis-Antoine
9dd5c11322
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
...
# Conflicts:
# src/d_clisrv.c
# src/d_clisrv.h
# src/d_net.c
# src/p_saveg.c
# src/p_saveg.h
2020-08-13 13:53:10 +02:00
James R
3e02f5d0cb
Add http-mserv to fuck
...
(cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)
2020-08-09 23:34:16 -07:00
Steel Titanium
3d1110a0c2
Fix cmake using wrong libs if internal libs is turned on
...
Use '\0' instead, just in case
(cherry picked from commit 9293c6cb32109b5b003114ab441e312df76f263c)
2020-08-09 20:28:33 -07:00
James R
0af38bc5eb
Bump MAXNETNODES to 127
...
(cherry picked from commit 9d9f8fd8a337a1786efa0d348c89e05b26ce8571)
2020-08-09 18:32:05 -07:00
James R
e9748e5317
Merge branch 'clipboard-crash-fix-2' into 'next'
...
Fix buffer overrun in I_ClipboardPaste (resolves #205 )
Closes #205
See merge request STJr/SRB2!1105
2020-08-09 21:06:18 -04:00
James R
3e8cf5ab06
Merge branch 'bt_spin' into 'next'
...
Replace all occurances of BT_USE with BT_SPIN (2.2!)
See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
James R
85d0199661
Merge branch 'audio-cleanup' into 'next'
...
Audio cleanup
See merge request STJr/SRB2!1101
2020-08-09 20:49:28 -04:00
James R
a808294c0c
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
8301e4f93c
Merge branch 'word-delet' into 'next'
...
Word delete and backspace in console
See merge request STJr/SRB2!1092
2020-08-09 20:46:37 -04:00
James R
8394bf6055
Merge branch 'opengl-skydome-fixes' into 'next'
...
Move the sky dome code out of r_opengl.c, fix issues with shaders
See merge request STJr/SRB2!1071
2020-08-09 20:45:01 -04:00
James R
23f218117c
Merge branch 'http-mserv' into 'next'
...
HTTP Based Master Server + Multithreading
See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
James R
46a4bd2d08
Merge branch 'lmaogalog' into 'next'
...
Make old analog functional again
See merge request STJr/SRB2!1098
2020-08-09 20:13:04 -04:00
GoldenTails
23edfd6d09
Fix string drawing functions so they account for V_NOSCALEPATCH effectively multiplying the width of the screen
2020-08-09 11:03:02 -05:00
James R
5153338bf5
Merge branch 'kill-dos' into 'next'
...
Remove support for DOS
See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
James R
cd30f0e933
Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES
...
Each server in the server list requires a node. It's also MAXNETNODES-1 because
the first node is yourself.
(cherry picked from commit 1484f0484f6c22382b2cae955a93c01f83d54655)
2020-08-08 15:13:21 -07:00
James R
54e446199d
Merge remote-tracking branch 'origin/next' into http-mserv
2020-08-08 15:05:03 -07:00