..
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
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
dummy
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
hardware
Improve rain/weather.
2019-06-22 16:50:30 +01:00
locale
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
sdl
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
2019-06-11 17:48:00 -04:00
win32
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
2019-06-11 17:48:00 -04:00
.gitignore
am_map.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
am_map.h
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
Android.mk
apng.c
Merge branch 'apng-oh-shit-fixes' into 'master'
2019-02-28 12:00:58 -08:00
apng.h
Merge branch 'apng-oh-shit-fixes' into 'master'
2019-02-28 12:00:58 -08:00
asm_defs.inc
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
b_bot.c
WIP 20190101 merge
2019-01-02 01:09:15 -05: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 branch 'public-notpublic-libopenmpt' into 'master'
2019-06-21 17:03:53 -04:00
command.c
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
command.h
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
comptime.c
config.h.in
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
console.c
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
console.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
d_clisrv.c
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
d_clisrv.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
d_event.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
d_main.c
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
d_main.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
d_net.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
d_net.h
Remove double define
2019-02-27 16:05:43 -05:00
d_netcmd.c
Merge branch 'public_next'
2019-04-02 15:49:15 +01:00
d_netcmd.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
d_netfil.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
d_netfil.h
Merge branch 'addons_menu' into 'master'
2018-12-15 20:46:42 -05:00
d_player.h
Hardcoded the saloon door
2019-06-12 21:20:14 +02: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
Snapper head/legs and minecart segments flash when they're destroyed
2019-06-16 15:35:32 +02: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
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
doomdef.h
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
doomstat.h
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
doomtype.h
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
2019-06-11 17:48:00 -04:00
endian.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
f_finale.c
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
f_finale.h
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
f_wipe.c
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
fastcmp.h
filesrch.c
Resolved filesrch.c conflicts (20190101 public merge)
2019-01-07 02:54:26 -05:00
filesrch.h
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
g_game.c
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
g_game.h
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
2019-03-18 22:00:23 +00:00
g_input.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
g_input.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
g_state.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
hu_stuff.c
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
hu_stuff.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
i_addrinfo.c
WIP 20190101 merge
2019-01-02 01:09:15 -05: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
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
i_system.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
i_tcp.c
Merge branch 'public_next'
2019-03-28 14:19:02 +00: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
Always use the white sidemark sprite, since track switching is no longer "activated"
2019-06-21 23:40:28 +02:00
info.h
Merge branch 'master' into new-acz-minecarts
2019-06-17 20:43:21 +02:00
keys.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
lua_baselib.c
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
lua_blockmaplib.c
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
lua_consolelib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_hook.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_hooklib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_hud.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_hudlib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_infolib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_libs.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_maplib.c
Merge branch 'public_next'
2019-03-15 01:43:03 -04:00
lua_mathlib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_mobjlib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_playerlib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_script.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_script.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_skinlib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lua_thinkerlib.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
lzf.c
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
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
2019-05-06 20:20:57 +01:00
m_cheat.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
m_cond.c
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
m_cond.h
In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC
2019-02-03 14:32:07 +01: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
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
m_menu.c
Improve rain/weather.
2019-06-22 16:50:30 +01:00
m_menu.h
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
m_misc.c
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
m_misc.h
Merge branch 'public_next'
2019-06-09 20:04:08 +01: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
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Makefile
Merge branch 'public-notpublic-libopenmpt' into 'master'
2019-06-21 17:03:53 -04:00
Makefile.cfg
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
md5.c
md5.h
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
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_enemy.c
Fix warnings/errors found during compiling, mostly of the mixed-declaration-and-code or shadowed variables variety
2019-06-20 20:05:07 +01:00
p_floor.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
p_inter.c
Some more minecart fixes
2019-06-19 00:10:28 +02:00
p_lights.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
p_local.h
"Finished" minecart hardcoding (still untested and buggy)
2019-06-14 21:19:52 +02:00
p_map.c
Finetuned the saloon door swinging
2019-06-16 17:57:03 +02:00
p_maputl.c
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_maputl.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_mobj.c
Improve rain/weather.
2019-06-22 16:50:30 +01:00
p_mobj.h
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
2019-05-06 20:20:57 +01:00
p_polyobj.c
added "checkmobjs" boolean to both Polyobj_moveXY and Polyobj_rotate, so we can disable interaction with mobjs for netgames
2019-04-05 12:03:03 +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
Properly fix crash due to duplicated lines.
2019-05-13 00:23:43 -04:00
p_saveg.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
p_setup.c
Add visplane portal creation functionality and use it to replace the skybox rendering.
2019-06-02 00:07:55 +02:00
p_setup.h
WIP 20190101 merge
2019-01-02 01:09:15 -05: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
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
p_slopes.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
p_spec.c
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
p_spec.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
p_telept.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
p_tick.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
p_tick.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_user.c
Forgot to copy something over from the CR_ROPEHANG case
2019-06-21 23:42:48 +02:00
r_bsp.c
Remove remnants of portalcullsector.
2019-06-10 17:13:04 +02:00
r_bsp.h
viewx/viewy also need to be stored/restored.
2019-06-06 13:31:48 +02:00
r_data.c
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
r_data.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
r_defs.h
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
2019-05-06 20:20:57 +01:00
r_draw.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
r_draw.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
r_draw8.c
WIP 20190101 merge
2019-01-02 01:09:15 -05: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
Improve rain/weather.
2019-06-22 16:50:30 +01:00
r_main.h
Improve rain/weather.
2019-06-22 16:50:30 +01:00
r_plane.c
Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.
2019-06-09 22:48:54 +02:00
r_plane.h
Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.
2019-06-09 22:48:54 +02: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
Improve rain/weather.
2019-06-22 16:50:30 +01:00
r_things.h
viewx/viewy also need to be stored/restored.
2019-06-06 13:31:48 +02:00
s_sound.c
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
2019-06-11 17:48:00 -04:00
s_sound.h
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
2019-06-11 17:48:00 -04:00
screen.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
screen.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
sounds.c
More incomplete minecart hardcoding
2019-06-13 21:45:30 +02:00
sounds.h
Merge branch 'master' into new-acz-minecarts
2019-06-17 20:43:21 +02:00
st_stuff.c
Merge branch 'public_next'
2019-06-09 20:04:08 +01:00
st_stuff.h
Merge branch 'public_next'
2019-06-09 20:04:08 +01:00
string.c
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
t_facon.c
t_fsin.c
t_ftan.c
t_tan2a.c
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 'public_next'
2019-05-16 15:58:17 +01:00
v_video.h
Merge errors for compile
2019-01-07 17:05:20 -05:00
vid_copy.s
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
w_wad.c
Merge branch 'public_next'
2019-06-21 22:13:39 +01:00
w_wad.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
y_inter.c
lclear -> _clear typo
2019-03-15 03:15:20 -04:00
y_inter.h
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
z_zone.c
WIP 20190101 merge
2019-01-02 01:09:15 -05:00
z_zone.h
WIP 20190101 merge
2019-01-02 01:09:15 -05:00