| .. |
|
android
|
Rename stuff around
|
2020-02-17 21:11:56 -03:00 |
|
blua
|
Merge branch 'dofile' into 'next'
|
2020-06-12 02:32:16 -04:00 |
|
djgppdos
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
dummy
|
Dummy I_GetTimeMicros
|
2020-05-02 23:24:49 +03:00 |
|
hardware
|
Merge branch 'ogl-drawnode-fix' into 'next'
|
2020-06-24 21:42:01 -04:00 |
|
locale
|
|
|
|
sdl
|
Merge branch 'gme-cleanup-fixes' into 'next'
|
2020-06-24 21:41:49 -04:00 |
|
win32
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
.gitignore
|
|
|
|
am_map.c
|
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
|
2020-05-18 15:23:56 +02:00 |
|
am_map.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Android.mk
|
|
|
|
apng.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
apng.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
asm_defs.inc
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
b_bot.c
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
b_bot.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
byteptr.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
CMakeLists.txt
|
OpenGL draw call batching system
|
2020-06-07 21:20:52 +03:00 |
|
command.c
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-18 17:20:33 -07:00 |
|
command.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
comptime.c
|
|
|
|
config.h.in
|
Update patch.pk3 asset hash
|
2020-05-11 14:41:36 -07:00 |
|
console.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
console.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
d_clisrv.c
|
Merge branch 'next' into 'better-download'
|
2020-06-10 07:57:49 -04:00 |
|
d_clisrv.h
|
Merge branch 'next' into 'better-download'
|
2020-06-10 07:57:49 -04:00 |
|
d_event.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
d_main.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
d_main.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
d_net.c
|
Merge branch 'next' into 'better-download'
|
2020-06-01 08:16:53 -04:00 |
|
d_net.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
d_netcmd.c
|
Merge branch 'next' into 'better-download'
|
2020-06-01 08:16:53 -04:00 |
|
d_netcmd.h
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
d_netfil.c
|
Fix "downloads" command reporting incorrect progress
|
2020-06-01 10:37:05 +02:00 |
|
d_netfil.h
|
Wait for acks before resending file fragments
|
2020-05-20 16:21:18 +02:00 |
|
d_player.h
|
Merge branch 'next' into 'fix-spawn-desynch'
|
2020-06-01 08:15:02 -04:00 |
|
d_think.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
d_ticcmd.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
dehacked.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
dehacked.h
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
doomdata.h
|
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
|
2020-02-23 11:50:13 -05:00 |
|
doomdef.h
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
doomstat.h
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
doomtype.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
endian.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
f_finale.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
f_finale.h
|
Add NOWIPE behavaior for colormap fades
|
2020-05-25 00:19:41 -04:00 |
|
f_wipe.c
|
Fix NOWIPE bugs with colormap fade and title card
|
2020-05-25 00:20:23 -04:00 |
|
fastcmp.h
|
|
|
|
filesrch.c
|
|
|
|
filesrch.h
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
g_demo.c
|
Merge branch 'fix-spawn-desynch' into 'next'
|
2020-06-08 05:25:41 -04:00 |
|
g_demo.h
|
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all)
|
2020-03-19 20:42:51 +00:00 |
|
g_game.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
g_game.h
|
Fix potential desynch when a player spawns
|
2020-05-28 11:03:35 +02:00 |
|
g_input.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
g_input.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
g_state.h
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
hu_stuff.c
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
hu_stuff.h
|
Support act numbers up to 99 and draw both digits individually.
|
2020-05-12 17:17:24 +02:00 |
|
i_addrinfo.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
i_addrinfo.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
i_joy.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
i_net.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
i_sound.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
i_system.h
|
Render stats
|
2020-05-02 23:13:08 +03:00 |
|
i_tcp.c
|
Rename some file transfer functions
|
2020-05-12 19:06:40 +02:00 |
|
i_tcp.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
i_video.h
|
Merge branch 'sdlglcontext' into 'master'
|
2020-04-09 19:51:20 -04:00 |
|
info.c
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
info.h
|
Update new GFZ3 laser
|
2020-05-06 09:03:03 +08:00 |
|
keys.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
lua_baselib.c
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
lua_blockmaplib.c
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
lua_consolelib.c
|
Merge branch 'lightmemedata' into 'next'
|
2020-04-09 19:48:39 -04:00 |
|
lua_hook.h
|
Merge branch 'bot-respawn-hook' into 'next'
|
2020-04-09 19:52:25 -04:00 |
|
lua_hooklib.c
|
Refactor hook library a little
|
2020-05-30 20:28:45 +02:00 |
|
lua_hud.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
lua_hudlib.c
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
lua_infolib.c
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
lua_libs.h
|
Fix typo SKINCOLOT
|
2020-05-24 12:36:20 -05:00 |
|
lua_maplib.c
|
Merge branch 'lua-side-enum-bruh' into 'next'
|
2020-06-22 15:23:34 -04:00 |
|
lua_mathlib.c
|
Merge branch 'deprecate-fixedrem' into 'next'
|
2020-06-01 08:30:44 -04:00 |
|
lua_mobjlib.c
|
Merge branch 'next' into 'fix-spawn-desynch'
|
2020-06-01 08:15:02 -04:00 |
|
lua_playerlib.c
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
lua_script.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
lua_script.h
|
Merge branch 'next' into 'dofile'
|
2020-06-01 09:28:56 -04:00 |
|
lua_skinlib.c
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
lua_thinkerlib.c
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
lzf.c
|
|
|
|
lzf.h
|
|
|
|
m_aatree.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_aatree.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_anigif.c
|
Fix OpenGL only recording the first frame of unoptimized GIFs
|
2020-05-09 16:59:09 -03:00 |
|
m_anigif.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_argv.c
|
Define SERVER_URL_PROTOCOL const for easy reconfiguration
|
2020-03-21 07:47:29 -05:00 |
|
m_argv.h
|
Add support for srb2:// URL handler (server links)
|
2020-03-21 01:36:39 -05:00 |
|
m_bbox.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_bbox.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_cheat.c
|
Merge branch 'next' into 'fix-spawn-desynch'
|
2020-06-01 08:15:02 -04:00 |
|
m_cheat.h
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
m_cond.c
|
Update to 2.2.4
|
2020-05-22 16:47:51 -05:00 |
|
m_cond.h
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
m_dllist.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_fixed.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_fixed.h
|
Deprecate FixedRem.
|
2020-05-18 11:29:56 -05:00 |
|
m_menu.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
m_menu.h
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
m_misc.c
|
Create FIL_ConvertTextFileToBinary
|
2020-05-19 20:00:58 +02:00 |
|
m_misc.h
|
Create FIL_ConvertTextFileToBinary
|
2020-05-19 20:00:58 +02:00 |
|
m_queue.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_queue.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_random.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_random.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
m_swap.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
Makefile
|
OpenGL draw call batching system
|
2020-06-07 21:20:52 +03:00 |
|
Makefile.cfg
|
|
|
|
md5.c
|
|
|
|
md5.h
|
|
|
|
mserv.c
|
Merge branch 'nomd5-crash' into 'master'
|
2020-02-23 18:15:04 -05:00 |
|
mserv.h
|
added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)
|
2020-05-12 18:42:16 +01:00 |
|
p5prof.h
|
|
|
|
p_ceilng.c
|
Remove P_FindSectorFromLineTag
|
2020-04-27 14:31:37 +02:00 |
|
p_enemy.c
|
Fix facecolor may be used uninitialized.
|
2020-06-17 14:09:49 -04:00 |
|
p_floor.c
|
T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result)
|
2020-05-24 21:15:31 +01:00 |
|
p_inter.c
|
Fix potential desynch when a player spawns
|
2020-05-28 11:03:35 +02:00 |
|
p_lights.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
p_local.h
|
Fix potential desynch when a player spawns
|
2020-05-28 11:03:35 +02:00 |
|
p_map.c
|
Merge branch 'next' into 'fix-spawn-desynch'
|
2020-06-01 08:15:02 -04:00 |
|
p_maputl.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
|
2020-05-18 16:14:05 +02:00 |
|
p_maputl.h
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
p_mobj.c
|
Merge branch 'fix-spawn-desynch' into 'next'
|
2020-06-08 05:25:41 -04:00 |
|
p_mobj.h
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
p_polyobj.c
|
Merge branch 'fix-spawn-desynch' into 'next'
|
2020-06-08 05:25:41 -04:00 |
|
p_polyobj.h
|
Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent)
|
2020-06-03 19:41:47 +02:00 |
|
p_pspr.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
p_saveg.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
p_saveg.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
p_setup.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
p_setup.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
p_sight.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
|
2020-05-18 16:14:05 +02:00 |
|
p_slopes.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
|
2020-05-18 16:14:05 +02:00 |
|
p_slopes.h
|
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
|
2020-05-18 15:23:56 +02:00 |
|
p_spec.c
|
Merge branch 'next' into 'fix-spawn-desynch'
|
2020-06-01 08:15:02 -04:00 |
|
p_spec.h
|
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
|
2020-05-02 10:03:16 +02:00 |
|
p_telept.c
|
Fix potential desynch when a player spawns
|
2020-05-28 11:03:35 +02:00 |
|
p_tick.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
p_tick.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
p_user.c
|
Merge branch 'next' into sal-oglshaderport
|
2020-06-08 19:36:23 -04:00 |
|
r_bsp.c
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
r_bsp.h
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
r_data.c
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
r_data.h
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
r_defs.h
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
r_draw.c
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
r_draw.h
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
r_draw8.c
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
r_draw8_npo2.c
|
Make SRB2 flat like Earth
|
2020-03-20 18:55:29 +01:00 |
|
r_draw16.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_local.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_main.c
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
r_main.h
|
More render stats for software mode, renamed and relocated some render stats variables
|
2020-05-02 23:13:53 +03:00 |
|
r_patch.c
|
Fix drop shadow and rotsprite code to use SHORT()
|
2020-05-02 17:13:16 +01:00 |
|
r_patch.h
|
:)
|
2020-02-19 14:44:22 -08:00 |
|
r_plane.c
|
Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent)
|
2020-06-03 19:41:47 +02:00 |
|
r_plane.h
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
r_portal.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_portal.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_segs.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
|
2020-05-18 16:14:05 +02:00 |
|
r_segs.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_skins.c
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
r_skins.h
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
r_sky.c
|
Merge branch 'master' into next
|
2020-02-21 21:01:29 -05:00 |
|
r_sky.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_splats.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_splats.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_state.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
r_things.c
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
r_things.h
|
Minor optimisations surrounding R_DrawFlippedMaskedColumn.
|
2020-03-26 16:09:19 +00:00 |
|
s_sound.c
|
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
|
2020-05-12 18:40:51 +01:00 |
|
s_sound.h
|
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
|
2020-05-12 18:40:51 +01:00 |
|
screen.c
|
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default.
|
2020-05-15 16:33:20 +01:00 |
|
screen.h
|
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.)
|
2020-05-14 23:10:00 +01:00 |
|
sounds.c
|
Update new GFZ3 laser
|
2020-05-06 09:03:03 +08:00 |
|
sounds.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
st_stuff.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
st_stuff.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
strcasestr.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
string.c
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
t_facon.c
|
|
|
|
t_fsin.c
|
|
|
|
t_ftan.c
|
|
|
|
t_tan2a.c
|
|
|
|
tables.c
|
Deprecate FixedRem.
|
2020-05-18 11:29:56 -05:00 |
|
tables.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
tmap.nas
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
tmap.s
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
tmap_asm.s
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
tmap_mmx.nas
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
tmap_vc.nas
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
v_video.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
v_video.h
|
Make colors UINT16, increase color freeslots to 1024
|
2020-05-23 19:35:36 -05:00 |
|
vid_copy.s
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
w_wad.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
|
2020-06-17 18:15:07 -04:00 |
|
w_wad.h
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
y_inter.c
|
Merge branch 'marathonmode' into 'next'
|
2020-06-17 19:36:10 -04:00 |
|
y_inter.h
|
Update copyright year to 2020
|
2020-02-19 14:08:45 -08:00 |
|
z_zone.c
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
z_zone.h
|
Merge branch 'update-copyright-year' into 'master'
|
2020-02-21 20:59:56 -05:00 |
