LJSonik
0ff5b851cd
Merge branch 'master' into minor-net-command-fixes
2018-03-09 17:15:37 +01:00
MonsterIestyn
af46a076f2
Merge pull request #239 from LJSonik/net-archive-fix
...
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:13:12 +00:00
Louis-Antoine
aefe06e2ef
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:40:34 +01:00
Sryder
e4ed3a793b
Small hacky fix for MD2s and sprites until sorting for walls, floors, and sprites is done
...
Sorts all translucent sprites and MD2s so they're drawn after all the opaque ones. Fixes most of the observable issues between translucent MD2s and opaque sprites/MD2s.
2018-03-09 09:58:10 +00:00
Sryder
121fcd8369
Fix screenshot functionality in fullscreen in SDL2
2018-03-08 22:28:38 +00:00
Monster Iestyn
145616b152
Merge branch 'master' into next
2018-03-08 19:35:51 +00:00
Monster Iestyn
87b1246b58
Merge branch 'download-filename-trunc-fix' into 'master'
...
Download filename trunc fix
See merge request STJr/SRB2!230
2018-03-08 14:33:57 -05:00
Sryder
77af3a8f95
Optimise the screen texture setup for SDL2, Post-processor, and wipes.
...
Only use glCopyTexImage2D when first creating the screen texture, use glCopyTexSubImage2D anytime after that as it does not define a new texture each time.
Flushing of the screen textures has been implemented for when the screen size changes (so that the screen textures don't stay at a wrong size) and the game is closed, I believe they would leave a memory leak before.
2018-03-07 22:55:21 +00:00
Sryder
67ee1637c9
Decrease far clipping plane
...
The Far clipping plane did not need to be nearly as high as it was, the new value is 32768, which I suspect is about how far software can render before it completely falls apart.
It is desirable to increase the near clipping plane to between 6-10, but it can introduce more issues with close geometry not being drawn when the player or camera is scaled or viewheight is set to MIN in first person view. It would also stop sprites from being drawn ever so slightly too early, but this isn't too much of an issue and isn't too noticeable with those values. Might look into scaling near clipping plane in accordance to camera scale in the future.
The reason for wanting to increase the near clipping plane is because the small value can cause very noticeable Z-fighting where there shouldn't be on older GPU's, usually Intel ones, that don't support 24-bits for the depth buffer.
2018-03-07 00:39:33 +00:00
Monster Iestyn
aba4adfabc
shrunk buffer from 32 to 28 so that all of "Downloading "extremely...longname.wad"" can fit on screen at once.
2018-03-06 20:52:55 +00:00
Monster Iestyn
a66824d63f
replace the 3 strncpys with a snprintf
2018-03-06 20:20:27 +00:00
Sryder
538d0de949
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into openglquickfixes
2018-03-06 16:11:05 +00:00
Monster Iestyn
e3151f26dc
rewrite download file screen code:
...
* fix screen to properly truncate the filename to just the real name only
* if the real name itself is too long, use ellipsis and paste in parts of the start and end of the actual name
note: I haven't actually tested if this works or compiles yet, I haven't the time right now
2018-03-05 22:24:03 +00:00
Monster Iestyn
1fe79a0d71
Fix movies not recording the "extension" to special stage intro fades
2018-03-05 19:08:53 +00:00
Monster Iestyn
bfbe69c627
Merge branch 'master' into hardcoding-time-again
2018-03-04 19:22:08 +00:00
Monster Iestyn
b254acaa0d
Merge branch 'master' into texture-fixes
2018-03-04 19:20:54 +00:00
Monster Iestyn
01f1e7fc33
Merge branch 'zoning-out' into 'master'
...
Zoning out
See merge request STJr/SRB2Internal!133
2018-03-04 14:19:25 -05:00
Monster Iestyn
61923f3b1f
Merge branch 'public_next'
...
# Conflicts:
# src/sdl/i_system.c
2018-03-04 19:18:13 +00:00
Monster Iestyn
ad1801e7f1
Merge branch 'master' into next
2018-03-04 19:10:01 +00:00
Monster Iestyn
16e60aada9
Merge branch 'linux-limbo' into 'master'
...
Linux limbo
See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
Monster Iestyn
4fdb82c942
Merge branch 'soc-sanitizing' into 'next'
...
SOC sanitizing
See merge request STJr/SRB2!227
2018-03-04 14:07:30 -05:00
Monster Iestyn
9843d60e13
Merge branch 'console-key-breakfast' into 'master'
...
Console key breakfast
See merge request STJr/SRB2!226
2018-03-04 14:06:40 -05:00
toasterbabe
33d5baa2aa
* Add new console text colours - sky, purple, aqua, peridot, azure, brown, rosy, and invert.
...
* Remove redundant check from V_DrawFadeScreen().
* Clean up potential endless sound source in Race HUD.
2018-03-02 13:32:55 +00:00
Monster Iestyn
4a0305eec8
more I_GetFreeMem fixes: don't attempt to set *total to 0L if total itself is NULL
2018-02-23 20:40:19 +00:00
Monster Iestyn
1216c9da18
Use __linux__ instead of LINUX/LINUX64
...
Turns out compiling for Linux 32-bit using the Makefiles never actually defines LINUX! Apart from that, most of the existing Linux-specific code in SRB2's source code (except for tmap.s) actually uses __linux__ instead anyway
2018-02-23 20:21:16 +00:00
Monster Iestyn
6e21059713
Eat unprintable keys too, since there's no reason to feed them to G_Responder anyway when the console is open
2018-02-23 20:08:02 +00:00
Monster Iestyn
80e18ecb7e
Cache all the act number graphicss at game startup rather than at every start/end of a level
...
I also added a few helpful functions for drawing the act numbers themselves
2018-02-22 21:49:36 +00:00
Monster Iestyn
ad8c51ab8f
removing stupid dumb useless code fish
2018-02-21 22:45:51 +00:00
Monster Iestyn
fb3e78c020
Make CON_Responder eat Ctrl+key combos that have no effect, instead of passing the key on to G_Responder
2018-02-20 17:06:03 +00:00
Steel Titanium
36d1259ceb
Removed some redundant checks
2018-02-17 00:37:17 -05:00
Steel Titanium
d921f26e54
Don't init the sound system on dedicated servers
2018-02-17 00:01:42 -05:00
Monster Iestyn
1bc98da70b
Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX)
2018-02-16 20:32:43 +00:00
Monster Iestyn
81a9b7b070
Total reorganisation of z_zone.c/h, added doxygen-compatible comments to all functions and additional regular comments where appropriate, changed purge tag macros to an enum list
2018-02-15 22:09:24 +00:00
Monster Iestyn
4782cc89fa
updating comment for Z_TagsUsage in the .c file
2018-02-15 16:53:58 +00:00
Monster Iestyn
013d185d9e
Z_FreeTag and Z_TagUsage are now both macros of their respective two arg variants
2018-02-15 16:31:05 +00:00
Monster Iestyn
8f834d6784
added a quick Z_FreeTag function as a shortcut to Z_FreeTags(tag, tag) where both tags are the same
2018-02-14 23:16:16 +00:00
Monster Iestyn
836bf5e12f
Clean up z_zone.h's function protos to look more readable like m_random.h, don't name functions with "2" if not using PARANOIA or ZDEBUG
...
also, Z_Malloc/Calloc/Realloc are now macros of the "Align" versions, regardless of ZDEBUG or not
2018-02-14 22:52:25 +00:00
LJSonik
d1e3275c78
Merge branch 'master' into minor-net-command-fixes
2018-02-14 21:07:10 +01:00
Louis-Antoine
bd2334dd93
Fix SV_StopServer not calling D_Clearticcmd correctly
2018-02-14 21:00:55 +01:00
Monster Iestyn
bd7ced9363
Merge branch 'master' into hardcoding-time-again
2018-02-14 16:24:05 +00:00
Alam Ed Arias
306cbc43e2
Merge branch 'public_next' into private
2018-02-14 10:34:36 -05:00
Alam Ed Arias
99552c2ba2
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Alam Arias
4cbe2e1622
Merge pull request #231 from LJSonik/net-command-leak-fix
...
Fix net commands not always being freed
2018-02-14 10:28:32 -05:00
Louis-Antoine
c7320f9f82
Don't allocate memory for net commands already executed, as it would cause them to be never freed
2018-02-14 15:09:52 +01:00
Monster Iestyn
df95e2175f
Merge branch 'master' into hardcoding-time-again
2018-02-13 21:21:30 +00:00
Monster Iestyn
e98a11afd0
Merge branch 'file-loading-cleanup' into 'master'
...
File loading cleanup
See merge request STJr/SRB2Internal!129
2018-02-13 16:18:55 -05:00
Monster Iestyn
49b8fd6d67
Don't attempt to load the "Lua/" or "SOCs/" folder lumps themselves as Lua/SOC lumps
2018-02-13 21:12:42 +00:00
Louis-Antoine
490f5beb89
Do not prevent all net commands for the current tic from being executed because of an unkown net command ID
2018-02-13 17:53:18 +01:00
toasterbabe
7018ce925b
Fixed the strengths going in the wrong direction of transparency in GL!
2018-02-12 21:31:03 +00:00
toasterbabe
b69cbd85b9
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
2018-02-12 18:59:01 +00:00