| .. |
|
android
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-01 10:41:40 -05:00 |
|
blua
|
Merge errors for compile
|
2019-01-07 17:05:20 -05:00 |
|
djgppdos
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
dummy
|
Some fixup
|
2019-07-22 22:01:05 -04:00 |
|
hardware
|
Fix FreeMipmapColormap crash
|
2019-11-24 17:37:11 -03:00 |
|
locale
|
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
|
2019-08-04 12:03:57 +01:00 |
|
sdl
|
No longer allow showhud to toggle FPS counter or ping bar
|
2019-11-23 16:09:02 -05:00 |
|
win32
|
remove unused levelwipes
|
2019-11-18 19:22:46 -03:00 |
|
.gitignore
|
|
|
|
am_map.c
|
INT32 -> boolean
|
2019-09-24 19:49:24 -03:00 |
|
am_map.h
|
remove unused macros
|
2019-09-24 19:54:16 -03:00 |
|
Android.mk
|
|
|
|
apng.c
|
Merge branch 'apng-oh-shit-fixes' into 'master'
|
2019-02-28 12:00:58 -08:00 |
|
apng.h
|
Remove references to old console ports that slipped in from the 2.1 source code a while back
|
2019-08-20 14:13:38 +01:00 |
|
asm_defs.inc
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
b_bot.c
|
Prevent Tailsbot from considering flight when Sonic is exiting.
|
2019-11-26 11:53:49 +00:00 |
|
b_bot.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
byteptr.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
CMakeLists.txt
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -03:00 |
|
command.c
|
Optimizations from LJ and generic functions
|
2019-11-13 14:26:28 -08:00 |
|
command.h
|
Optimizations from LJ and generic functions
|
2019-11-13 14:26:28 -08:00 |
|
comptime.c
|
Branch and revision information in builds
|
2016-03-14 12:43:08 -04:00 |
|
config.h.in
|
Use zones.pk3 instead of zones.dta.
|
2019-09-29 05:31:50 +02:00 |
|
console.c
|
Improved "HELP" command!
|
2019-10-15 13:36:04 +01:00 |
|
console.h
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
d_clisrv.c
|
Correct two instances where "Zone" is forced uppercase.
|
2019-11-25 16:04:03 +00:00 |
|
d_clisrv.h
|
Merge branch 'reset-rollangle' into 'master'
|
2019-11-18 14:11:32 -05:00 |
|
d_event.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
d_main.c
|
Fix stuck closed captioning
|
2019-11-25 20:16:17 -03:00 |
|
d_main.h
|
Revert "Render title map on connecting to server screen too"
|
2019-11-25 01:09:00 +01:00 |
|
d_net.c
|
Replace ping command with a condensed and sorted version
|
2019-10-22 19:40:05 -07:00 |
|
d_net.h
|
Remove double define
|
2019-02-27 16:05:43 -05:00 |
|
d_netcmd.c
|
Change the default value of cv_coopstarposts (as per #321), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.)
|
2019-11-26 12:37:57 +00:00 |
|
d_netcmd.h
|
Merge branch 'exit-move-lj' into 'master'
|
2019-11-18 15:10:15 -05:00 |
|
d_netfil.c
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
d_netfil.h
|
Merge branch 'addons_menu' into 'master'
|
2018-12-15 20:46:42 -05:00 |
|
d_player.h
|
Merge branch 'master' into exit-move-lj
|
2019-11-15 19:35:47 +01:00 |
|
d_think.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
d_ticcmd.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
dehacked.c
|
Merge branch 'minusflip' into 'master'
|
2019-11-25 16:43:49 -05:00 |
|
dehacked.h
|
Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD
|
2019-02-03 11:05:22 +01:00 |
|
doomdata.h
|
Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua
|
2019-08-12 14:00:26 +01:00 |
|
doomdef.h
|
remove unused levelwipes
|
2019-11-18 19:22:46 -03:00 |
|
doomstat.h
|
Do a whole bunch of cleanup for mapvisited and intermission related things.
|
2019-11-21 16:10:28 +00:00 |
|
doomtype.h
|
Merge branch 'map-by-name' into 'master'
|
2019-11-13 13:45:36 -05:00 |
|
endian.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
f_finale.c
|
Now we have mixed case level title font, and since we had a question mark graphic in that for a while, make the continue screen a tad nicer.
|
2019-11-26 18:25:36 +00:00 |
|
f_finale.h
|
Fix crossfades
|
2019-11-22 17:44:42 -03:00 |
|
f_wipe.c
|
clarify comment
|
2019-11-22 17:50:05 -03:00 |
|
fastcmp.h
|
|
|
|
filesrch.c
|
Mark new-style log names as loaded.
|
2019-09-20 17:43:41 +01:00 |
|
filesrch.h
|
Hide kart-specific addons behavior behind USE_KART
|
2018-12-16 16:07:47 -05:00 |
|
g_game.c
|
Instead of making conditions which check for death individually check for special stages to prevent lives loss, just set G_GametypeUsesLives to false in a special stage.
|
2019-11-26 12:30:32 +00:00 |
|
g_game.h
|
fix RA fade
|
2019-11-23 18:15:09 -03:00 |
|
g_input.c
|
Add scroll-wheel weapon changing to default controls
|
2019-10-13 15:19:31 +01:00 |
|
g_input.h
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
g_state.h
|
Merge branch 'ending' into 'master'
|
2019-08-03 16:23:51 -04:00 |
|
hu_stuff.c
|
Merge branch 'exit-move-lj' into 'master'
|
2019-11-18 15:10:15 -05:00 |
|
hu_stuff.h
|
Merge branch 'titlecard-lowercase-support' into 'master'
|
2019-11-18 15:05:02 -05:00 |
|
i_addrinfo.c
|
Merge branch 'public_next' into private
|
2019-08-08 23:41:19 -04:00 |
|
i_addrinfo.h
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
i_joy.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
i_net.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
i_sound.h
|
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
|
2019-08-04 12:03:57 +01:00 |
|
i_system.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
i_tcp.c
|
New -port command line paramater
|
2019-10-13 20:04:45 -04:00 |
|
i_tcp.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
i_video.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
info.c
|
Merge branch 'minusflip' into 'master'
|
2019-11-25 16:43:49 -05:00 |
|
info.h
|
Have Minus rotate in mid-air
|
2019-11-24 22:29:26 +08:00 |
|
keys.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
lua_baselib.c
|
Merge branch 'master' into exit-move-lj
|
2019-11-15 19:35:47 +01:00 |
|
lua_blockmaplib.c
|
Merge branch 'master' into newmenus
|
2019-08-01 18:36:42 -04:00 |
|
lua_consolelib.c
|
Merge branch 'public_next'
|
2019-08-25 18:18:59 +01:00 |
|
lua_hook.h
|
New intermission thinker hook
|
2019-10-13 20:50:46 -04:00 |
|
lua_hooklib.c
|
Change this for consistency.
|
2019-10-14 21:47:20 -04:00 |
|
lua_hud.h
|
lua
|
2019-11-18 13:50:44 -03:00 |
|
lua_hudlib.c
|
lua
|
2019-11-18 13:50:44 -03:00 |
|
lua_infolib.c
|
Optimise
|
2019-11-14 14:12:36 -03:00 |
|
lua_libs.h
|
finish lua spriteinfo :]
|
2019-11-07 23:42:14 -03:00 |
|
lua_maplib.c
|
Oh right, the keywords...
|
2019-10-27 14:26:29 -07:00 |
|
lua_mathlib.c
|
Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua
|
2019-08-12 14:00:26 +01:00 |
|
lua_mobjlib.c
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-10-28 14:29:10 -03:00 |
|
lua_playerlib.c
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
lua_script.c
|
Merge branch 'mi-tinkers-with-lua-again' into 'master'
|
2019-10-25 15:27:55 -04:00 |
|
lua_script.h
|
* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
|
2019-07-30 17:57:57 +01:00 |
|
lua_skinlib.c
|
Forgot to put these in Lua. (Not gonna make a fifth exe today just for this one change, though.)
|
2019-09-11 17:32:41 +01:00 |
|
lua_thinkerlib.c
|
* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases.
|
2019-07-30 17:57:57 +01:00 |
|
lzf.c
|
Incinerated WinCE
|
2017-09-29 23:25:34 +01:00 |
|
lzf.h
|
|
|
|
m_aatree.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_aatree.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_anigif.c
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
m_anigif.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_argv.c
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
m_argv.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_bbox.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_bbox.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_cheat.c
|
Secret stuff. (I intend to keep candid discussion of this outside of any commits; you'll see me write up a comment describing what's going on here soon.)
|
2019-11-01 15:48:50 +00:00 |
|
m_cheat.h
|
2D toggle command
|
2019-09-06 20:51:39 -04:00 |
|
m_cond.c
|
* Resolve #345.
|
2019-11-24 13:24:37 +00:00 |
|
m_cond.h
|
Lots of changes
|
2019-10-15 22:54:21 -04:00 |
|
m_dllist.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_fixed.c
|
bland
|
2018-12-20 18:52:51 -03:00 |
|
m_fixed.h
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
m_menu.c
|
Merge branch 'xtrafix' into 'master'
|
2019-11-25 17:02:32 -05:00 |
|
m_menu.h
|
Rename "secrets" to "extras".
|
2019-11-21 01:34:32 +01:00 |
|
m_misc.c
|
Correct two instances where "Zone" is forced uppercase.
|
2019-11-25 16:04:03 +00:00 |
|
m_misc.h
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
m_queue.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_queue.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_random.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_random.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
m_swap.h
|
()
|
2019-09-12 16:12:31 -03:00 |
|
Makefile
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -03:00 |
|
Makefile.cfg
|
Merge branch 'public_next'
|
2019-09-03 19:07:57 +01:00 |
|
md5.c
|
Incinerated WinCE
|
2017-09-29 23:25:34 +01:00 |
|
md5.h
|
copyright dates/statements updated and such
|
2016-05-17 17:42:11 -07:00 |
|
mserv.c
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
mserv.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
p5prof.h
|
|
|
|
p_ceilng.c
|
Basic multiple thinker list implementation
|
2019-04-20 22:39:22 +02:00 |
|
p_enemy.c
|
Resolve #374.
|
2019-11-26 17:06:30 +00:00 |
|
p_floor.c
|
There's some whitespace...
|
2019-11-07 14:56:42 -08:00 |
|
p_inter.c
|
Merge branch 'deadstuff' into 'master'
|
2019-11-26 17:24:17 -05:00 |
|
p_lights.c
|
Basic multiple thinker list implementation
|
2019-04-20 22:39:22 +02:00 |
|
p_local.h
|
Merge branch 'master' into exit-move-lj
|
2019-11-15 19:35:47 +01:00 |
|
p_map.c
|
Move the fireball despawn to later so its target/tracer isn't nulled until AFTER the enemy it touches is killed, allowing for correct point delivery (resolves #373).
|
2019-11-26 17:56:42 +00:00 |
|
p_maputl.c
|
lmao I forgot the backside FOF
|
2019-10-21 14:44:16 -07:00 |
|
p_maputl.h
|
Add openfloorrover and openceilingrover vars so that PIT_CheckLine can update tmfloorrover and tmceilingrover properly via P_LineOpening
|
2019-08-01 18:56:00 +01:00 |
|
p_mobj.c
|
Merge branch 'paperprojection' into 'master'
|
2019-11-25 16:53:48 -05:00 |
|
p_mobj.h
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-14 12:49:03 -03:00 |
|
p_polyobj.c
|
Remove commented out P_CheckSector calls and add extra comments explaining the situation
|
2019-08-15 14:21:19 +01:00 |
|
p_polyobj.h
|
Implement displacement-based polyobject rotation.
|
2019-04-05 11:50:59 +02:00 |
|
p_pspr.h
|
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
|
2019-05-06 20:20:57 +01:00 |
|
p_saveg.c
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-14 12:49:03 -03:00 |
|
p_saveg.h
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
p_setup.c
|
Fix 'Speeding off to...' placement in non-greeen resolutions
|
2019-11-26 00:16:46 +08:00 |
|
p_setup.h
|
Optimize texture/patch/png/flat flat caching
|
2019-10-20 20:24:03 -07:00 |
|
p_sight.c
|
Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking.
|
2019-05-27 21:18:02 +01:00 |
|
p_slopes.c
|
Fix all our landing woes. (For now.)
|
2019-08-10 16:06:59 +01:00 |
|
p_slopes.h
|
Add back the p_slopes.h header guard
|
2019-04-21 18:05:16 +02:00 |
|
p_spec.c
|
Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor.
|
2019-11-25 20:30:06 +01:00 |
|
p_spec.h
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
p_telept.c
|
* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
|
2019-09-07 22:12:47 +01:00 |
|
p_tick.c
|
Fix a bunch of shit with MP special stages!
|
2019-11-25 14:33:15 +00:00 |
|
p_tick.h
|
Merge branch 'master' into newmenus
|
2019-08-01 18:36:42 -04:00 |
|
p_user.c
|
Make camerascale have no effect in 2D mode (resolves #359 and resolves #363).
|
2019-11-27 12:31:23 +00:00 |
|
r_bsp.c
|
Make polyobjects agree with sector lighting/colormap like a FOF.
|
2019-08-22 22:30:36 +01:00 |
|
r_bsp.h
|
viewx/viewy also need to be stored/restored.
|
2019-06-06 13:31:48 +02:00 |
|
r_data.c
|
Accidental missing (void)
|
2019-11-15 18:53:32 -03:00 |
|
r_data.h
|
add r_patch.c
|
2019-10-28 15:28:42 -03:00 |
|
r_defs.h
|
Prevent Knuckles latching onto horizon special linedefs.
|
2019-11-23 14:20:41 +00:00 |
|
r_draw.c
|
Metal Sonic battle improvements.
|
2019-10-29 23:11:12 +00:00 |
|
r_draw.h
|
Add new dashmode colormap
|
2019-10-21 04:37:56 +08:00 |
|
r_draw8.c
|
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
|
2019-09-09 15:05:17 -04:00 |
|
r_draw16.c
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_local.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_main.c
|
Disable the GL sprite shadows behind a #define.
|
2019-11-17 22:18:46 +00:00 |
|
r_main.h
|
Disable the GL sprite shadows behind a #define.
|
2019-11-17 22:18:46 +00:00 |
|
r_patch.c
|
Deobfuscate the R_ParseSpriteInfo call
|
2019-11-14 19:56:26 -08:00 |
|
r_patch.h
|
Optimise
|
2019-11-14 14:12:36 -03:00 |
|
r_plane.c
|
fix missing mmx check
|
2019-11-22 17:30:53 -03:00 |
|
r_plane.h
|
Revert "Revert "Merge branch 'flats-png_port' into 'master'""
|
2019-09-09 15:05:17 -04:00 |
|
r_portal.c
|
Properly take skybox viewpoint angle into account.
|
2019-06-11 14:47:58 +02:00 |
|
r_portal.h
|
Remove remnants of portalcullsector.
|
2019-06-10 17:13:04 +02:00 |
|
r_segs.c
|
Prevent Knuckles latching onto horizon special linedefs.
|
2019-11-23 14:20:41 +00:00 |
|
r_segs.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_sky.c
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
r_sky.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_splats.c
|
Software plane fixes
|
2018-12-14 14:08:25 -03:00 |
|
r_splats.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
r_state.h
|
Better fades
|
2019-09-09 23:31:48 -03:00 |
|
r_things.c
|
Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was!
|
2019-11-24 16:42:13 +00:00 |
|
r_things.h
|
Hopefully the last time this week I'll ever touch these files
|
2019-11-06 20:41:55 -03:00 |
|
s_sound.c
|
Fix stuck closed captioning
|
2019-11-25 20:16:17 -03:00 |
|
s_sound.h
|
Fix stuck closed captioning
|
2019-11-25 20:16:17 -03:00 |
|
screen.c
|
fix showfps with st_translucency
|
2019-11-23 18:41:28 -03:00 |
|
screen.h
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
sounds.c
|
Merge branch 'reversesmash' into 'master'
|
2019-11-25 13:11:48 -05:00 |
|
sounds.h
|
Restore old sound effect
|
2019-11-17 21:33:59 -03:00 |
|
st_stuff.c
|
Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
|
2019-11-25 18:52:38 +00:00 |
|
st_stuff.h
|
missing prototype
|
2019-11-18 15:13:31 -03:00 |
|
strcasestr.c
|
Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL
|
2019-11-19 11:16:17 -08:00 |
|
string.c
|
Use a superior strcasestr
|
2019-10-27 14:23:13 -07:00 |
|
t_facon.c
|
remove blank lines at EOF of new files
|
2016-05-13 00:12:51 -04:00 |
|
t_fsin.c
|
remove blank lines at EOF of new files
|
2016-05-13 00:12:51 -04:00 |
|
t_ftan.c
|
remove blank lines at EOF of new files
|
2016-05-13 00:12:51 -04:00 |
|
t_tan2a.c
|
remove blank lines at EOF of new files
|
2016-05-13 00:12:51 -04:00 |
|
tables.c
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
tables.h
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
tmap.nas
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
tmap.s
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
tmap_asm.s
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
tmap_mmx.nas
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
tmap_vc.nas
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
v_video.c
|
Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
|
2019-11-25 18:52:38 +00:00 |
|
v_video.h
|
fix showfps with st_translucency
|
2019-11-23 18:41:28 -03:00 |
|
vid_copy.s
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
w_wad.c
|
Merge branch 'public_next' into 'master'
|
2019-11-18 15:39:41 -05:00 |
|
w_wad.h
|
Allow PNG graphics to be used as patches
|
2019-09-11 16:59:28 -03:00 |
|
y_inter.c
|
Do a whole bunch of cleanup for mapvisited and intermission related things.
|
2019-11-21 16:10:28 +00:00 |
|
y_inter.h
|
Do a whole bunch of cleanup for mapvisited and intermission related things.
|
2019-11-21 16:10:28 +00:00 |
|
z_zone.c
|
Add overflow checks so we I_Error instead of death crash into oblivion
|
2019-10-28 00:40:25 -07:00 |
|
z_zone.h
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
