..
android
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
blua
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
djgppdos
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
dummy
Merge remote-tracking branch 'srb2public/next'
2018-11-07 16:15:14 -05:00
hardware
Missed a few spots
2019-01-09 15:53:59 -06:00
locale
Missed (unused?) viewpoint strings
2018-12-03 12:20:19 -05:00
nds
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
2018-10-14 21:52:05 +01:00
sdl
-nohidapi parameter
2019-01-10 23:12:06 -06:00
sdl12
Kart Public Next merge
2019-01-08 18:43:49 -05:00
win32
Kart Public Next merge
2019-01-08 18:43:49 -05:00
win32ce
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
.gitignore
…
Android.mk
…
CMakeLists.txt
Edited even more things to say "SRB2Kart"
2018-12-05 20:40:58 -05:00
Makefile
Merge remote-tracking branch 'master' into next
2019-01-08 16:29:14 -05:00
Makefile.cfg
Clear float equal warnings
2018-12-14 20:34:06 -05:00
am_map.c
Update am_map.c
2018-12-12 19:59:21 -02:00
am_map.h
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
asm_defs.inc
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
b_bot.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -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
Fix improperly resolved conflicts
2019-01-08 16:44:56 -06:00
command.h
Keep execversion stuff on, just dummied out
2019-01-06 01:41:42 -05:00
comptime.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
config.h.in
merge srb2 next
2019-01-05 15:59:23 -05:00
console.c
merge srb2 next
2019-01-05 15:59:23 -05:00
console.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
d_clisrv.c
Allow any key to abort network connection, ignore non-keyboard keys in chat
2019-01-13 19:22:54 -06:00
d_clisrv.h
merge srb2 next
2019-01-05 15:59:23 -05:00
d_event.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
d_main.c
Add MUSICDEF lump for defining custom songs & replacing existing songs
2019-01-09 21:00:45 -05:00
d_main.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
d_net.c
merge srb2 next
2019-01-05 15:59:23 -05:00
d_net.h
merge srb2 next
2019-01-05 15:59:23 -05:00
d_netcmd.c
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
d_netcmd.h
Merge branch 'next' into 21-version
2018-12-02 15:45:07 +00:00
d_netfil.c
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
d_netfil.h
Merge branch 'addons_menu' into 'master'
2018-12-15 20:46:42 -05:00
d_player.h
Minimum speed to get drift sparks
2019-01-06 17:17:52 -05:00
d_think.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
d_ticcmd.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
dehacked.c
Merge branch 'dehacked-versioning' into 'next'
2019-01-11 20:25:00 -05:00
dehacked.h
Actually, let's just do "1"
2019-01-03 16:43:01 -05:00
doomdata.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
doomdef.h
Kart Public Next merge
2019-01-08 18:43:49 -05:00
doomstat.h
Merge branch 'mobjscale-global' into 'next'
2019-01-08 17:00:34 -05:00
doomtype.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
endian.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
f_finale.c
Gag spacing was not updated
2019-01-13 20:47:57 -05:00
f_finale.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
f_wipe.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
fastcmp.h
…
filesrch.c
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
filesrch.h
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
g_game.c
Revert "Enable d-pad on the vote screen"
2019-01-12 05:37:07 -06:00
g_game.h
Revert "Enable d-pad on the vote screen"
2019-01-12 05:37:07 -06:00
g_input.c
Fix player 2 not being able to play while the chat is open
2019-01-10 06:08:12 -06:00
g_input.h
merge srb2 next
2019-01-05 15:59:23 -05:00
g_state.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
hu_stuff.c
Merge branch 'gamepad-tweaks' into 'next'
2019-01-13 20:32:17 -05:00
hu_stuff.h
Fix the chat being incorrectly placed in splitscreen
2019-01-11 16:04:12 -06:00
i_addrinfo.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
i_addrinfo.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
i_joy.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
i_net.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
i_sound.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
i_system.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
i_tcp.c
Netcode: handle NULL in addrinfo lookup
2018-12-22 21:06:13 -05: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
Fix Ballhog under the last commit...
2018-12-13 09:47:14 -05:00
info.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
k_kart.c
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
k_kart.h
Revert "Add player taunt functions to Lua"
2018-12-04 11:39:45 -05:00
keys.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
lua_baselib.c
Expose S_ShowMusicCredit to Lua
2019-01-09 21:17:24 -05:00
lua_blockmaplib.c
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
lua_consolelib.c
Merge branch 'next' into 21-version
2018-12-02 15:45:07 +00:00
lua_hook.h
Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.
2018-12-22 16:44:58 +01:00
lua_hooklib.c
Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.
2018-12-22 16:44:58 +01:00
lua_hud.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
lua_hudlib.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
lua_infolib.c
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
lua_libs.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
lua_maplib.c
merge srb2 next
2019-01-05 15:59:23 -05:00
lua_mathlib.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
lua_mobjlib.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
lua_playerlib.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
lua_script.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-03 00:31:23 -05:00
lua_script.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
lua_skinlib.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
lua_thinkerlib.c
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
lzf.c
define SRTICT_ALIGN to - if the system is x86/x64 system
2016-07-23 23:26:08 -04: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
Fix 2 of the Unsuffixed Float Constant warnings
2018-11-29 22:12:14 +00:00
m_anigif.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
m_argv.c
Do not remove newlines from the end of files
2018-11-24 17:30:49 -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 remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
m_cheat.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
m_cond.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
m_cond.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05: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
bland
2018-12-20 18:52:51 -03:00
m_menu.c
Kart Public Next merge
2019-01-08 18:43:49 -05:00
m_menu.h
Merge branch 'addons_menu' into 'master'
2018-12-15 20:46:42 -05:00
m_misc.c
Fix improperly resolved conflicts
2019-01-08 16:44:56 -06:00
m_misc.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -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
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
md5.c
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
md5.h
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
mserv.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -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
Tiny SPB fixes
2019-01-14 02:01:00 -05:00
p_floor.c
Add a mapobjectscale global
2018-12-12 21:55:59 -05:00
p_inter.c
Kart Public Next merge
2019-01-08 18:43:49 -05:00
p_lights.c
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_local.h
merge srb2 next
2019-01-05 15:59:23 -05:00
p_map.c
Merge branch 'mobjscale-global' into 'next'
2019-01-08 17:00:34 -05: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
Merge branch 'mobjscale-global' into 'next'
2019-01-08 17:00:34 -05:00
p_mobj.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
p_polyobj.c
merge srb2 next
2019-01-05 15:59:23 -05:00
p_polyobj.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_pspr.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
p_saveg.c
Remove this, doesn't work
2019-01-10 00:35:11 -05:00
p_saveg.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_setup.c
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
p_setup.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
p_sight.c
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_slopes.c
Add a mapobjectscale global
2018-12-12 21:55:59 -05:00
p_slopes.h
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
p_spec.c
Add disable for music credit showing on the change music linedef
2019-01-09 21:17:10 -05:00
p_spec.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
p_telept.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
p_tick.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
p_tick.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
p_user.c
Merge branch 'mobjscale-global' into 'next'
2019-01-08 17:00:34 -05:00
r_bsp.c
merge srb2 next
2019-01-05 15:59:23 -05:00
r_bsp.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
r_data.c
Kart Public Next merge
2019-01-08 18:43:49 -05:00
r_data.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
r_defs.h
merge srb2 next
2019-01-05 15:59:23 -05:00
r_draw.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
r_draw.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
r_draw8.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -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
Fix errors from merge
2019-01-06 01:00:30 -05:00
r_main.h
merge srb2 next
2019-01-05 15:59:23 -05:00
r_plane.c
merge srb2 next
2019-01-05 15:59:23 -05:00
r_plane.h
merge srb2 next
2019-01-05 15:59:23 -05:00
r_segs.c
Fix rendering gaps on polys with upper/lower textures
2019-01-11 21:21:56 -06:00
r_segs.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
r_sky.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -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 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
r_things.c
merge srb2 next
2019-01-05 15:59:23 -05:00
r_things.h
merge srb2 next
2019-01-05 15:59:23 -05:00
s_sound.c
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
s_sound.h
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
screen.c
Software plane fixes
2018-12-14 14:08:25 -03:00
screen.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
sounds.c
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
sounds.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
st_stuff.c
Kart Public Next merge
2019-01-08 18:43:49 -05:00
st_stuff.h
Remove facefreed/iconfreed
2019-01-05 20:40:47 -06: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
Large room fix
2018-12-09 19:34:17 -03:00
tables.h
merge srb2 next
2019-01-05 15:59:23 -05:00
tmap.nas
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
tmap.s
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
tmap_asm.s
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
tmap_mmx.nas
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
tmap_vc.nas
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
v_video.c
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
v_video.h
merge srb2 next
2019-01-05 15:59:23 -05:00
vid_copy.s
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
w_wad.c
Add MUSICDEF lump for defining custom songs & replacing existing songs
2019-01-09 21:00:45 -05:00
w_wad.h
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
y_inter.c
Revert "Enable d-pad on the vote screen"
2019-01-12 05:37:07 -06:00
y_inter.h
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
z_zone.c
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
z_zone.h
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00