lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
SRB2/src
History
Monster Iestyn 58a844d3cf Merge branch 'public_next' 
# Conflicts:
#	src/r_things.c
#	src/v_video.c
 		2018-08-28 19:31:08 +01:00
..
android Default sound volume is too loud 2018-04-11 14:40:05 -04:00
blua Merge branch 'public_next' into master 2017-09-28 11:01:20 -04:00
djgppdos Merge branch 'public_next' 2018-08-21 15:40:54 +01:00
dummy Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
hardware Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
locale Fixed forceskin to not always allow due to bad logic. 2016-07-14 13:24:57 +01:00
sdl Merge branch 'public_next' 2018-08-21 15:40:54 +01:00
win32 Merge branch 'public_next' 2018-08-21 15:40:54 +01:00
.gitignore SRB2 2.1 release 2014-03-15 13:11:35 -04:00
Android.mk SRB2 2.1 release 2014-03-15 13:11:35 -04:00
CMakeLists.txt Merge branch 'master' into opengl-improvements 2017-01-25 19:37:35 +00:00
Makefile Merge branch 'public_next' 2018-07-31 19:41:54 +01:00
Makefile.cfg Merge branch 'public_next' 2017-11-01 18:39:25 +00:00
am_map.c ended NDS 2017-09-29 22:48:14 +01:00
am_map.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
asm_defs.inc SRB2 2.1 release 2014-03-15 13:11:35 -04:00
b_bot.c * (probably) fix crash with followmobj not being properly invalidated on mapload 2018-06-09 18:06:14 +01:00
b_bot.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
byteptr.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
command.c Gutted the GP2X 2017-09-29 22:27:08 +01:00
command.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
comptime.c Branch and revision information in builds 2016-03-14 12:43:08 -04:00
config.h.in * Patch.pk3 as requested by literally everyone else on the team. 2018-06-06 14:42:50 +01:00
console.c Bit of a random one today, but the branch approaches completion... 2018-06-05 17:22:28 +01:00
console.h * Add new console text colours - sky, purple, aqua, peridot, azure, brown, rosy, and invert. 2018-03-02 13:32:55 +00:00
d_clisrv.c Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
d_clisrv.h MONSTER COMMIT. 2018-06-03 22:41:54 +01:00
d_event.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_main.c Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
d_main.h Removed unused function prototypes in d_main.h 2017-02-11 22:56:08 +00:00
d_net.c Burned Dreamcast port at the stake 2017-09-29 18:19:34 +01:00
d_net.h -Added a timeout for game state downloading to prevent definitive join freezes in some cases. The timeout has a minimum value of "jointimeout" and gets higher as the game state grows in size 2017-01-13 20:53:52 +01:00
d_netcmd.c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
d_netcmd.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 2017-08-16 19:29:23 +01:00
d_netfil.c Merge branch 'public_next' 2018-06-09 19:35:36 +01:00
d_netfil.h Merge branch 'addfile_menu' into 'master' 2017-08-05 16:05:12 -04:00
d_player.h Track player's previous mare rings with player->finishedrings. 2018-08-10 04:05:20 -04:00
d_think.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_ticcmd.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
dehacked.c Expose NEWTICRATE and NEWTICRATERATIO to Lua 2018-08-25 03:40:43 -05:00
dehacked.h Introducing skin patching! (Also, DELFILE is super dead.) 2017-01-17 00:16:23 +00:00
doomdata.h * Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. 2018-04-28 15:13:44 +01:00
doomdef.h * Patch.pk3 as requested by literally everyone else on the team. 2018-06-06 14:42:50 +01:00
doomstat.h FINAL CHANGE, I PROMISE, I THINK 2018-06-06 16:07:14 +01:00
doomtype.h Obliterated OS/2 2017-10-07 18:11:14 +01:00
endian.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
f_finale.c Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
f_finale.h * Prevent crash if you go to a map and it doesn't exist. 2017-05-09 11:09:58 +01:00
f_wipe.c Merge branch 'public_next' into master 2017-09-28 11:01:20 -04:00
fastcmp.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
filesrch.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-10-21 14:28:44 +01:00
filesrch.h Fixes from toaster, plus some other things 2017-10-07 14:48:49 -05:00
g_game.c Merge branch 'public_next' 2018-08-28 19:31:08 +01:00
g_game.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit 2017-11-02 20:39:07 +00:00
g_input.c ended NDS 2017-09-29 22:48:14 +01:00
g_input.h Wiped out Wii (and Wii Linux) 2017-09-29 21:03:28 +01:00
g_state.h Remove extern for unused "oncontinuescreen" variable 2016-05-18 17:41:11 +01:00
hu_stuff.c Merge branch 'master' into leveltitle-tinkering 2018-08-10 20:03:59 +01:00
hu_stuff.h Merge branch 'master' into leveltitle-tinkering 2018-08-10 20:03:59 +01:00
i_addrinfo.c ended NDS 2017-09-29 22:48:14 +01:00
i_addrinfo.h PS3 was deposed 2017-09-29 20:12:57 +01:00
i_joy.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_net.h -Added a timeout for game state downloading to prevent definitive join freezes in some cases. The timeout has a minimum value of "jointimeout" and gets higher as the game state grows in size 2017-01-13 20:53:52 +01:00
i_sound.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_system.h Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
i_tcp.c Merge branch 'public_next' 2018-01-02 17:32:24 +00:00
i_tcp.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_video.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
info.c Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
info.h Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125 2018-08-22 17:16:11 +01:00
keys.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_baselib.c * Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. 2018-05-08 23:26:36 +01:00
lua_blockmaplib.c cleanup 2017-09-28 11:10:24 -04:00
lua_consolelib.c Merge branch 'public_next' 2018-07-31 19:41:54 +01:00
lua_hook.h Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo! 2017-10-02 14:08:58 +01:00
lua_hooklib.c Merge branch 'public_next' 2018-01-02 17:32:24 +00:00
lua_hud.h MONSTER COMMIT. 2018-06-03 22:41:54 +01:00
lua_hudlib.c * M_Random function access to v! (so v.RandomFixed(), etc...) 2018-03-20 15:00:27 +00:00
lua_infolib.c Use playersprite_t 2018-01-04 14:49:26 -05:00
lua_libs.h Added the META_ACTION userdata type to Lua, created getActionName() to return string name 2017-05-17 20:36:40 +01:00
lua_maplib.c Merge branch 'public_next' 2018-08-21 15:40:54 +01:00
lua_mathlib.c Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
lua_mobjlib.c Mace optimisation! 2018-04-01 20:54:19 +01:00
lua_playerlib.c Track player's previous mare rings with player->finishedrings. 2018-08-10 04:05:20 -04:00
lua_script.c Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
lua_script.h Added the "lua_lumploading" variable for restricting certain Lua functions to lump load time only 2017-04-25 21:45:53 +01:00
lua_skinlib.c Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo! 2017-10-02 14:08:58 +01:00
lua_thinkerlib.c Merge branch 'public_next' 2017-05-31 15:18:05 +01:00
lzf.c Incinerated WinCE 2017-09-29 23:25:34 +01:00
lzf.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
m_aatree.c Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
m_aatree.h m_aatree: add newline 2016-12-22 19:39:37 -05:00
m_anigif.c Introducing pMasterPalette. 2017-04-30 22:18:06 +01:00
m_anigif.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_argv.c Wiped out Wii (and Wii Linux) 2017-09-29 21:03:28 +01:00
m_argv.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_bbox.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_bbox.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_cheat.c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
m_cheat.h Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
m_cond.c cleanup 2017-09-28 11:10:24 -04:00
m_cond.h Fix inconsistencies in spacing in m_cond.h 2017-05-09 16:28:20 +01:00
m_dllist.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_fixed.c Correct C FixedMul() off-by-one errors 2018-05-20 22:55:21 +03:00
m_fixed.h Incinerated WinCE 2017-09-29 23:25:34 +01:00
m_menu.c Pandora's Box support for player->spheres 2018-08-10 13:15:54 -04:00
m_menu.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus 2017-10-18 21:02:50 +01:00
m_misc.c Merge branch 'public_next' 2018-07-31 19:41:54 +01:00
m_misc.h postponed PSP 2017-09-29 20:34:16 +01:00
m_queue.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_queue.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_random.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_random.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_swap.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 Merge branch 'public_next' 2018-01-02 17:32:24 +00:00
mserv.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p5prof.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
p_ceilng.c Build: kill GCC 7's implicit-fallthrough warning 2017-09-28 09:39:47 -04:00
p_enemy.c fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype) 2018-07-02 21:03:04 +01:00
p_floor.c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 19:36:48 +01:00
p_inter.c SETSPHERES console command for debugging/cheating 2018-08-10 13:06:53 -04:00
p_lights.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_local.h MONSTER COMMIT. 2018-06-03 22:41:54 +01:00
p_map.c Merge branch 'nights-invertloopfix' into 'master' 2018-08-10 13:49:42 -04:00
p_maputl.c Created R_GetTextureNum to make sure top/bottom/midtexture texture ids are always valid in rendering code for both software and OpenGL (and also for the Solid Midtexture effect physics code) 2016-12-16 21:38:53 +00:00
p_maputl.h P_LineOpening now takes a mobj_t argument, instead of relying on tmthing 2016-08-13 21:41:18 +01:00
p_mobj.c MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation 2018-08-10 02:18:24 -04:00
p_mobj.h Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
p_polyobj.c Whooh boy. Probably requires re-review. 2017-07-18 14:17:23 +01:00
p_polyobj.h Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
p_pspr.h * SPR2_DRL0-C are gone. They're now (FF_SPR2SUPER|SPR2_NGT0-C). This frees up a bunch of badly-used freeslots, considering that you can't be super AND NiGHTS at the same time. 2017-03-11 17:14:39 +00:00
p_saveg.c Track player's previous mare rings with player->finishedrings. 2018-08-10 04:05:20 -04:00
p_saveg.h * New, pretty save select! Requires patch.dta to really appreciate. 2017-08-20 23:18:47 +01:00
p_setup.c Merge branch 'hardcoding-nights-spheredamage' into 'master' 2018-08-10 13:50:57 -04:00
p_setup.h MONSTER COMMIT. 2018-06-03 22:41:54 +01:00
p_sight.c Fixed P_CheckSight not considering polyobject top and bottom at all 2017-04-19 22:19:46 +01:00
p_slopes.c asdf 2018-03-29 20:12:19 +02:00
p_slopes.h * Put all of the wall transfer code in one place. 2017-01-23 17:23:42 +00:00
p_spec.c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 19:36:48 +01:00
p_spec.h Merge branch 'level-specials-setup-stuff' into 'master' 2017-05-08 15:15:50 -04:00
p_telept.c Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion. 2017-03-14 18:11:17 +00:00
p_tick.c Restore music upon successful completion of old-style special stage 2018-06-09 21:12:56 +01:00
p_tick.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_user.c Track player's previous mare rings with player->finishedrings. 2018-08-10 04:05:20 -04:00
r_bsp.c Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this) 2018-02-07 17:46:01 +00:00
r_bsp.h Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly 2017-01-10 20:07:02 +00:00
r_data.c Merge branch 'public_next' 2018-08-28 19:31:08 +01:00
r_data.h Clean out code/update comments relating to TEXTUREn, TEXTURE (SOC), PNAMES, and ANIMATED. 2017-08-08 22:03:37 +01:00
r_defs.h Clean out code/update comments relating to TEXTUREn, TEXTURE (SOC), PNAMES, and ANIMATED. 2017-08-08 22:03:37 +01:00
r_draw.c * Bumpers and Balloons in a more final state. 2018-05-20 00:04:39 +01:00
r_draw.h Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency 2016-11-16 18:43:25 +00:00
r_draw8.c Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
r_draw16.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_local.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_main.c whitespace cleanup 2017-11-02 23:13:34 -04:00
r_main.h Remove all traces of SSN's old port of ZDoom's secplanes for slopes, since our slopes do not need them 2017-01-02 19:12:09 +00:00
r_plane.c Merge branch 'public_next' 2018-08-28 19:31:08 +01:00
r_plane.h R_FindPlane now has a polyobj argument, R_DrawPlanes now skips polyobj planes, like it does with FOF planes 2016-10-09 21:48:25 +01:00
r_segs.c Merge branch 'horizon-line-hom-fix' into 'master' 2018-08-12 03:48:20 -04:00
r_segs.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_sky.c titlemap - skipintro bugfix 2017-04-24 12:52:51 -04:00
r_sky.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_splats.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_splats.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
r_state.h Remove unused sscount variable 2017-02-11 22:41:15 +00:00
r_things.c Merge branch 'public_next' 2018-08-28 19:31:08 +01:00
r_things.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-10-21 14:28:44 +01:00
s_sound.c Merge branch 'public_next' 2018-08-21 15:40:54 +01:00
s_sound.h Reset captions where appropriate (including in S_StopSounds(), as it should have been doing all along). 2017-04-29 17:53:24 +01:00
screen.c MONSTER COMMIT. 2018-06-03 22:41:54 +01:00
screen.h Incinerated WinCE 2017-09-29 23:25:34 +01:00
sounds.c * Made P_LevelInitStuff's stuff clearer. 2018-06-09 18:20:59 +01:00
sounds.h MONSTER COMMIT. 2018-06-03 22:41:54 +01:00
st_stuff.c Merge branch 'master' into leveltitle-tinkering 2018-08-10 20:03:59 +01:00
st_stuff.h A lot! 2018-03-26 23:53:09 +01:00
string.c Accidentially removed newline 2017-05-09 14:22:53 +01: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 ended NDS 2017-09-29 22:48:14 +01:00
tables.h ended NDS 2017-09-29 22:48:14 +01:00
tmap.nas Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
tmap.s Obliterated OS/2 2017-10-07 18:11:14 +01:00
tmap_asm.s copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
tmap_mmx.nas Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
tmap_vc.nas copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
v_video.c Merge branch 'public_next' 2018-08-28 19:31:08 +01:00
v_video.h Merge branch 'master' into leveltitle-tinkering 2018-06-14 21:26:44 +01:00
vid_copy.s copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
w_wad.c CORRECTION OF MINOR ANNOYANCES 2018-06-06 17:11:12 +01:00
w_wad.h created W_IsLumpWad as a shortcut for the "is the lump a WAD" checking in the code getting map data lumps 2018-01-10 16:51:23 +00:00
y_inter.c Merge branch 'master' into leveltitle-tinkering 2018-08-10 20:03:59 +01:00
y_inter.h Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame 2017-05-18 16:54:58 +01:00
z_zone.c Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX) 2018-02-16 20:32:43 +00:00
z_zone.h Added Z_TotalUsage as a shortcut for Z_TagsUsage(0, INT32_MAX) 2018-02-16 20:32:43 +00:00