| .. |
|
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
|
Disable the GL sprite shadows behind a #define.
|
2019-11-17 22:18:46 +00:00 |
|
locale
|
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
|
2019-08-04 12:03:57 +01:00 |
|
sdl
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
win32
|
Better ping implementation.
|
2019-11-17 20:22:47 -05: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
|
There's code in B_RespawnBot that handles gravflip, but none in B_CheckRespawn. This commit fixes that. (Only done on this branch since bots had already been touched.)
|
2019-10-06 15:11:00 +01: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
|
|
|
|
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
|
Merge branch 'reset-rollangle' into 'master'
|
2019-11-18 14:11:32 -05: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
|
Move setting from defaults to M_FirstLoadConfig, so it triggers even when the title screen doesn't start
|
2019-11-15 17:31:53 -08:00 |
|
d_main.h
|
Render title map on connecting to server screen too
|
2019-10-26 12:50:49 -07: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
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
d_netcmd.h
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
d_netfil.c
|
Use zones.pk3 instead of zones.dta.
|
2019-09-29 05:31:50 +02:00 |
|
d_netfil.h
|
Merge branch 'addons_menu' into 'master'
|
2018-12-15 20:46:42 -05:00 |
|
d_player.h
|
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
|
2019-11-14 12:27:22 -03: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 'flickies_not_in_walls' into 'master'
|
2019-11-14 18:07:19 -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
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-14 12:49:03 -03:00 |
|
doomstat.h
|
Oh right, the keywords...
|
2019-10-27 14:26:29 -07: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
|
Fix crash when using the -connect startup paramater (Resolves #292)
|
2019-11-15 16:57:47 -05:00 |
|
f_finale.h
|
Disable menu input on the title screen for the first second (ie, before the flash), to guarantee people won't start the menu the very first tic after the fade and ruin the animation. (Console and gif/screenshot recording still works, for the impatient.)
|
2019-11-14 12:52:34 +00:00 |
|
f_wipe.c
|
A good and bad ending cutscene now exist.
|
2019-07-28 00:32:57 +01: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
|
Fix Metal Sonic not correctly flipping with gravity. (Doesn't require a new Metal recording.)
|
2019-11-15 13:10:41 +00:00 |
|
g_game.h
|
Merge branch 'map-by-name' into 'master'
|
2019-11-13 13:45:36 -05: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
|
Shift ping display in scores HUD up, so it aligns with the bottom of player name
|
2019-11-17 18:53:17 -08:00 |
|
hu_stuff.h
|
Snapping for showping, so it doesn't jump way up on non-green
|
2019-11-17 18:52:05 -08: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 'papersign2' into 'master'
|
2019-11-14 18:07:34 -05:00 |
|
info.h
|
Merge branch 'flickies_not_in_walls' into 'master'
|
2019-11-14 18:07:19 -05:00 |
|
keys.h
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
lua_baselib.c
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-14 12:49:03 -03: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
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -05:00 |
|
lua_hudlib.c
|
Sound test is cool now!
|
2019-11-05 16:23:46 +00: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
|
Allow access to players userdata outside levels.
|
2019-10-14 22:12:26 -04: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
|
WIP 20190101 merge
|
2019-01-02 01:09:15 -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
|
Lots of changes
|
2019-10-15 22:54:21 -04: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 remote-tracking branch 'origin/master' into internal-md3-vanilla
|
2019-06-29 17:51:30 -04:00 |
|
m_menu.c
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
m_menu.h
|
Merge branch 'radiomode' into 'master'
|
2019-11-13 04:16:38 -05:00 |
|
m_misc.c
|
Remove defaultname, since players are probably sure on their name change
|
2019-11-15 17:32:43 -08:00 |
|
m_misc.h
|
Better directory structure
|
2019-09-08 01:29:09 -04: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 #288.
|
2019-11-15 12:47:21 +00:00 |
|
p_floor.c
|
There's some whitespace...
|
2019-11-07 14:56:42 -08:00 |
|
p_inter.c
|
Yeah, yeah...
|
2019-11-14 22:14:40 -03:00 |
|
p_lights.c
|
Basic multiple thinker list implementation
|
2019-04-20 22:39:22 +02:00 |
|
p_local.h
|
* Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it.
|
2019-11-13 20:14:08 +00:00 |
|
p_map.c
|
Fix silly typo :P
|
2019-11-09 15:46:34 +01: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 'flickies_not_in_walls' into 'master'
|
2019-11-14 18:07:19 -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
|
Merge branch 'coop-item-respawn' into 'master'
|
2019-11-14 18:06:32 -05: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
|
Merge branch 'stopclock' into 'master'
|
2019-11-13 14:39:59 -05: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
|
STOP THE CLOCK linedef exectutor!
|
2019-11-08 15:47:12 +00:00 |
|
p_tick.h
|
Merge branch 'master' into newmenus
|
2019-08-01 18:36:42 -04:00 |
|
p_user.c
|
Merge branch 'reset-rollangle' into 'master'
|
2019-11-18 14:11:32 -05: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
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -03:00 |
|
r_data.h
|
add r_patch.c
|
2019-10-28 15:28:42 -03:00 |
|
r_defs.h
|
add r_patch.c
|
2019-10-28 15:28:42 -03: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
|
Merge remote-tracking branch 'origin/master' into rotsprite_i
|
2019-11-12 21:38:02 -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
|
Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out.
|
2019-06-09 20:04:07 +02: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
|
Moving away more portal-related global vars to r_portal.
|
2019-06-03 13:33:12 +02:00 |
|
r_things.c
|
Resolve #288.
|
2019-11-15 12:47:21 +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
|
Resolve #281. (Might have problems with non-SDL interfaces, but definitely good for what we're shipping with.)
|
2019-11-14 14:19:13 +00:00 |
|
s_sound.h
|
Merge branch 'radiomode' into 'master'
|
2019-11-13 04:16:38 -05:00 |
|
screen.c
|
Shift showping display up a bit
|
2019-11-17 18:54:23 -08:00 |
|
screen.h
|
Better ping implementation.
|
2019-11-17 20:22:47 -05:00 |
|
sounds.c
|
Paper sign tweaks.
|
2019-11-13 16:33:53 +00:00 |
|
sounds.h
|
Sound test is cool now!
|
2019-11-05 16:23:46 +00:00 |
|
st_stuff.c
|
Merge branch 'stopclock' into 'master'
|
2019-11-13 14:39:59 -05:00 |
|
st_stuff.h
|
Continue screen! With aaaaaall the new assets to go with it.
|
2019-09-11 00:50:51 +01:00 |
|
strcasestr.c
|
Use a superior strcasestr
|
2019-10-27 14:23:13 -07: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
|
Merge branch 'secretstuff' into 'master'
|
2019-11-14 17:49:23 -05:00 |
|
v_video.h
|
Sound test is cool now!
|
2019-11-05 16:23:46 +00:00 |
|
vid_copy.s
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
w_wad.c
|
Merge branch 'secretstuff' into 'master'
|
2019-11-14 17:49:23 -05:00 |
|
w_wad.h
|
Allow PNG graphics to be used as patches
|
2019-09-11 16:59:28 -03:00 |
|
y_inter.c
|
Lol it's the wrong union!
|
2019-11-07 16:22:25 -08:00 |
|
y_inter.h
|
Restore the last gameplay frame while on the intermission screen
|
2019-11-05 17:04:57 -03: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 |
