SRB2/src
Jaime Passos ff293c3f6f fix non powers of two spans 2019-09-07 18:20:49 -03:00
..
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 Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01:00
dummy Some fixup 2019-07-22 22:01:05 -04:00
hardware fix translucency 2019-09-07 16:54:26 -03:00
locale Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01:00
sdl Merge branch 'public_next' 2019-08-20 13:54:48 +01:00
win32 Merge branch 'public_next' into private 2019-08-08 23:41:19 -04:00
.gitignore
Android.mk
CMakeLists.txt Merge branch 'public-notpublic-libopenmpt' into 'master' 2019-06-21 17:03:53 -04:00
Makefile Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01:00
Makefile.cfg Merge branch 'public_next' 2019-09-03 19:07:57 +01:00
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
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 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
command.c 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
command.h Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07:00
comptime.c Branch and revision information in builds 2016-03-14 12:43:08 -04:00
config.h.in Update MD5 for patch.dta 2019-08-17 18:15:23 +01:00
console.c A good and bad ending cutscene now exist. 2019-07-28 00:32:57 +01:00
console.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_clisrv.c Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
d_clisrv.h Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
d_event.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_main.c Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +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 'mi-cleanup-returns' into 'master' 2019-08-20 09:35:36 -04:00
d_netcmd.h Merge branch 'public_next' 2019-08-20 13:54:48 +01:00
d_netfil.c Merge branch 'public_next' 2019-08-25 18:18:59 +01:00
d_netfil.h Merge branch 'addons_menu' into 'master' 2018-12-15 20:46:42 -05:00
d_player.h Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07: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 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07: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 fix translucency 2019-09-07 16:54:26 -03:00
doomstat.h Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01: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 tweak the defaults for titlescrollxspeed and numDemos 2019-08-11 22:28:32 +01:00
f_finale.h curbgname need one more byte to hold the NULL 2019-08-08 23:46:08 -04:00
f_wipe.c A good and bad ending cutscene now exist. 2019-07-28 00:32:57 +01: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 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
g_game.h Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07: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 Merge branch 'ending' into 'master' 2019-08-03 16:23:51 -04:00
hu_stuff.c Revert "Try to compile with AppVeyor's GCC 9.1.0" 2019-08-08 22:31:18 -04:00
hu_stuff.h WIP 20190101 merge 2019-01-02 01:09:15 -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 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 Tweak the Metal Sonic death explosion sequence. It's longer than all the others before the egg capsule comes up, but so is Mecha Sonic in s3k, so it fits. 2019-08-14 10:22:14 +01:00
info.h Tweak the ACZ3 fight a little, animationwise, since every other non-Brak boss got an upgrade to its death anim in this branch. 2019-08-13 19:41:04 +01:00
keys.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
lua_baselib.c Merge branch 'ending' into 'master' 2019-08-03 16:23:51 -04:00
lua_blockmaplib.c I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00
lua_consolelib.c Merge branch 'public_next' 2019-08-25 18:18:59 +01:00
lua_hook.h "PlayerCanDamage" hook! 2019-06-19 12:55:05 +01:00
lua_hooklib.c "PlayerCanDamage" hook! 2019-06-19 12:55:05 +01:00
lua_hud.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_hudlib.c With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): 2019-06-18 17:55:57 +01:00
lua_infolib.c gcc7 compile fixes (Fall through; spr2 var comparison) 2019-08-03 23:01:10 -04:00
lua_libs.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
lua_maplib.c Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01: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 branch 'bossenable' into 'master' 2019-08-03 16:23:22 -04:00
lua_playerlib.c Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
lua_script.c Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02: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 * Made the evaluation screen even more attractive. 2019-07-29 14:55:36 +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 true not TRUE 2019-08-20 15:43:59 -04:00
m_cheat.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
m_cond.c * Made the evaluation screen even more attractive. 2019-07-29 14:55:36 +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 Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua 2019-08-12 14:00:26 +01:00
m_menu.h A good and bad ending cutscene now exist. 2019-07-28 00:32:57 +01:00
m_misc.c Merge branch 'public_next' into private 2019-08-08 23:41:19 -04: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
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 Merge branch 'gfz_boss_rework' into 'master' 2019-08-22 11:27:24 -04:00
p_floor.c Fix !150, too 2019-07-18 00:16:01 +01:00
p_inter.c Tweak the ACZ3 fight a little, animationwise, since every other non-Brak boss got an upgrade to its death anim in this branch. 2019-08-13 19:41:04 +01:00
p_lights.c Basic multiple thinker list implementation 2019-04-20 22:39:22 +02:00
p_local.h Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01:00
p_map.c Autobrake polish! 2019-08-22 16:13:00 +01:00
p_maputl.c After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all. 2019-08-15 14:30:10 +01: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 Use the softer explosion sound from s3k to go with the increased quantity of explosions. 2019-08-13 20:24:46 +01:00
p_mobj.h Ring sparkle mirroring 2019-08-03 18:28:53 -04: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 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
p_saveg.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_setup.c Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
p_setup.h Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03: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 remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
p_spec.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_telept.c Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V 2019-06-22 17:33:37 +01:00
p_tick.c fix PARANOIA builds 2019-08-07 12:39:04 -04:00
p_tick.h Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 2019-07-13 01:42:03 +02:00
p_user.c Merge branch 'ring-penalty-graphic' into 'master' 2019-08-30 13:28:05 -04: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 fix translucency 2019-09-07 16:54:26 -03:00
r_data.h Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03: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 Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
r_draw.h Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
r_draw8.c Fix tilted spans. 2019-09-06 19:37:07 -03: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 fix non powers of two spans 2019-09-07 18:20:49 -03:00
r_plane.h Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03: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 Fix signed vs unsigned comapre 2019-08-07 12:41:22 -04:00
r_things.h A good and bad ending cutscene now exist. 2019-07-28 00:32:57 +01:00
s_sound.c All C files should a newline at the end 2019-08-07 12:39:51 -04:00
s_sound.h Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01:00
screen.c Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
screen.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
sounds.c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-09 19:52:52 +01:00
sounds.h Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-09 19:52:52 +01:00
st_stuff.c Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
st_stuff.h A good and bad ending cutscene now exist. 2019-07-28 00:32:57 +01:00
string.c Update source copyrights to 2018 2018-11-25 07:35:38 -05: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 Revert "Try to compile with AppVeyor's GCC 9.1.0" 2019-08-08 22:31:18 -04:00
v_video.h A good and bad ending cutscene now exist. 2019-07-28 00:32:57 +01:00
vid_copy.s Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
w_wad.c Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
w_wad.h Merge branch 'public_next' 2019-06-29 20:55:58 +01:00
y_inter.c Have the ring bonus in MP Special Stages be based on the shared sum of all players'. 2019-08-02 23:56:25 +01: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