Alam Ed Arias
1e76cb8a88
Merge branch 'master' into next
2018-03-14 14:29:42 -04:00
Alam Ed Arias
93e143e26f
Merge remote-tracking branch 'public/master'
2018-03-14 14:26:07 -04:00
colette
1151f4bba3
Merge branch 'credits_update' into 'master'
...
Credits update
See merge request STJr/SRB2!231
2018-03-14 12:56:27 -04:00
toasterbabe
5f4fa843c2
i suck at the alphabet!
2018-03-14 16:55:33 +00:00
toasterbabe
cb0511a912
oh yeah this guy's name needs changing too
2018-03-14 16:49:10 +00:00
toasterbabe
429a293a1b
down with cis
2018-03-14 16:47:19 +00:00
MonsterIestyn
632c7dd5ce
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
dc02ef886f
Fix Lua panic when archiving a table element with an userdata key
2018-03-09 16:40:34 +01:00
Sryder
4114464930
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
83d4f29367
Fix screenshot functionality in fullscreen in SDL2
2018-03-08 22:28:38 +00:00
Monster Iestyn
651e773c7e
Merge branch 'master' into next
2018-03-08 19:35:51 +00:00
Monster Iestyn
9a1a29508e
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
e6dff75aab
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
954850b221
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
3f61a1608d
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
b060d98c28
replace the 3 strncpys with a snprintf
2018-03-06 20:20:27 +00:00
Sryder
254c53cb3d
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into openglquickfixes
2018-03-06 16:11:05 +00:00
Monster Iestyn
426983ff11
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
3efdeb93a9
Merge branch 'master' into hardcoding-time-again
2018-03-04 19:22:08 +00:00
Monster Iestyn
795da3cb1d
Merge branch 'master' into texture-fixes
2018-03-04 19:20:54 +00:00
Monster Iestyn
aad441ff74
Merge branch 'zoning-out' into 'master'
...
Zoning out
See merge request STJr/SRB2Internal!133
2018-03-04 14:19:25 -05:00
Monster Iestyn
c11a2ad9b6
Merge branch 'public_next'
...
# Conflicts:
# src/sdl/i_system.c
2018-03-04 19:18:13 +00:00
Monster Iestyn
ced141d596
Merge branch 'master' into next
2018-03-04 19:10:01 +00:00
Monster Iestyn
f25eb1705a
Merge branch 'linux-limbo' into 'master'
...
Linux limbo
See merge request STJr/SRB2!228
2018-03-04 14:08:21 -05:00
Monster Iestyn
8b586690a8
Merge branch 'soc-sanitizing' into 'next'
...
SOC sanitizing
See merge request STJr/SRB2!227
2018-03-04 14:07:30 -05:00
Monster Iestyn
084e718414
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
5e42d1dfad
* 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
39949392ca
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
a4637a6dec
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
ce78df03d0
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
628f9921a8
removing stupid dumb useless code fish
2018-02-21 22:45:51 +00:00
Monster Iestyn
bef710aa8f
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
Monster Iestyn
64eba82692
Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX)
2018-02-16 20:32:43 +00:00
Monster Iestyn
5c6755df7f
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
afe4178fd7
updating comment for Z_TagsUsage in the .c file
2018-02-15 16:53:58 +00:00
Monster Iestyn
c5261c1133
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
4383d1fdd2
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
fa1173ed10
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
Monster Iestyn
1ab046de89
Merge branch 'master' into hardcoding-time-again
2018-02-14 16:24:05 +00:00
Alam Ed Arias
f1fa3855e5
Merge branch 'public_next' into private
2018-02-14 10:34:36 -05:00
Alam Ed Arias
8722b369a3
Merge branch 'master' into next
2018-02-14 10:29:24 -05:00
Alam Arias
d23d0e0e5b
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
64a108e24a
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
4885c3b719
Merge branch 'master' into hardcoding-time-again
2018-02-13 21:21:30 +00:00
Monster Iestyn
c44a1dc543
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
f5035e70ea
Don't attempt to load the "Lua/" or "SOCs/" folder lumps themselves as Lua/SOC lumps
2018-02-13 21:12:42 +00:00
toasterbabe
78bb534550
Fixed the strengths going in the wrong direction of transparency in GL!
2018-02-12 21:31:03 +00:00
toasterbabe
4d5dac0d03
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff
2018-02-12 18:59:01 +00:00
toasterbabe
a1d12429e4
* Move the non-mapping drawFill out of the source code function and into the Lua interface.
...
* Add a drawFill fallback for COLORMAP too.
* Correct a few index mishaps.
2018-02-12 18:23:57 +00:00
toasterbabe
b0888c44bd
* Total overhaul of V_DrawFadeScreen(color, strength!
...
- controllable strengths between 0-31 for COLORMAP lump like before
- arbitrary colour indices in the palette via TRANSMAP lumps, with strengths 0-9
- exposed to Lua as v.fadeScreen(color, strength)!
* Remove last vestiges of V_STATICPATCH.
2018-02-12 17:47:31 +00:00
