SRB2/src
MascaraSnake 6393542dc3 Merge branch 'wordwrapfix' into 'master'
Fix V_WordWrap and the new additional text colour codes.

See merge request STJr/SRB2Internal!612
2019-12-05 16:32:30 -05: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 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
dummy Some fixup 2019-07-22 22:01:05 -04:00
hardware Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
locale Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 2019-08-04 12:03:57 +01:00
sdl Merge branch 'public_next' into private 2019-12-05 11:18:33 -05:00
win32 Fix building libpng and zlib with MSVC 2019-12-05 12:33:18 -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 Make Tails' "I'll give you a hand!" bubble a hnext chain instead of a target set, which is way less likely to be clobbered in standard gameplay. 2019-12-05 09:36:58 +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 credits-update 2019-12-01 00:32:01 +01:00
command.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
command.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
comptime.c
config.h.in Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
console.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
console.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
d_clisrv.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
d_clisrv.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
d_event.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
d_main.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 Temporary fix for the fade timeout 2019-12-03 12:02:14 +01:00
d_net.h Remove double define 2019-02-27 16:05:43 -05:00
d_netcmd.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
d_netcmd.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
d_netfil.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
d_netfil.h Merge branch 'addons_menu' into 'master' 2018-12-15 20:46:42 -05:00
d_player.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +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 remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 credits-update 2019-12-01 00:32:01 +01:00
doomstat.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
doomtype.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
endian.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
f_finale.c Merge branch 'credits-update' into 'master' 2019-12-04 16:59:46 -05:00
f_finale.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
f_wipe.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +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 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
g_game.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
hu_stuff.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
info.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 credits-update 2019-12-01 00:32:01 +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 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_hooklib.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_hud.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_hudlib.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_infolib.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_libs.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_maplib.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +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 remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_playerlib.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
lua_script.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
m_cheat.h 2D toggle command 2019-09-06 20:51:39 -04:00
m_cond.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
m_cond.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
m_dllist.h Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
m_fixed.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
m_fixed.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
m_menu.c Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
m_menu.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
m_misc.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
m_misc.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +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 () 2019-09-12 16:12:31 -03:00
Makefile Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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
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 Fixup compiling errors 2019-12-02 12:12:26 -05:00
p_floor.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
p_inter.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
p_lights.c Basic multiple thinker list implementation 2019-04-20 22:39:22 +02:00
p_local.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
p_map.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
p_maputl.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +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 Fix compiling for MSVC 2019-12-05 12:38:50 -05:00
p_mobj.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 credits-update 2019-12-01 00:32:01 +01:00
p_saveg.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00
p_setup.c fix Ploadflat warning 2019-12-04 15:41:29 -03:00
p_setup.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 'origin/master' into credits-update 2019-12-01 00:32:01 +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 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
p_tick.h Merge branch 'master' into newmenus 2019-08-01 18:36:42 -04:00
p_user.c Merge branch 'ideyagun' into 'master' 2019-12-03 02:15:26 -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 credits-update 2019-12-01 00:32:01 +01:00
r_data.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
r_defs.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
r_draw.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
r_draw.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
r_main.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
r_patch.c frameFrame is unsigned, let set it to 0xFF 2019-12-05 15:50:44 -05:00
r_patch.h fix ErrorIfPNG errors 2019-12-04 15:26:51 -03:00
r_plane.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
r_things.c Another potential papersprite crash fix, but way more confident about this one. 2019-12-05 09:28:28 +00:00
r_things.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
s_sound.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
s_sound.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
screen.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
screen.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
sounds.c sfx_spsmsh (hhz spikeball) is now singular 2019-12-04 20:32:46 +00:00
sounds.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
st_stuff.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
st_stuff.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
strcasestr.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
string.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01: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 Fix V_WordWrap and the new additional text colour codes. 2019-12-05 19:43:37 +00:00
v_video.h change from shifting bits to multi for a OLD video function marco 2019-12-04 10:43:33 -05:00
vid_copy.s Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
w_wad.c fix ErrorIfPNG errors 2019-12-04 15:26:51 -03:00
w_wad.h Allow PNG graphics to be used as patches 2019-09-11 16:59:28 -03:00
y_inter.c Merge branch 'timeoverrings' into 'master' 2019-12-04 17:09:32 -05:00
y_inter.h Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
z_zone.c Merge remote-tracking branch 'origin/master' into credits-update 2019-12-01 00:32:01 +01:00
z_zone.h WIP 20190101 merge 2019-01-02 01:09:15 -05:00