lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
SRB2/src
History
toasterbabe 9c02c81095 Now that it's not 3am, here's some fixes to what I pushed last night. 
* That hacky anti-NiGHTS-deaxisment code I commented out because I thought it was visual only? Reimplemented in a way that is both more and less hacky. It's identical in result to the original code, but takes a roundabout method to get there.
* Sprite references for SUPE, SUPZ and NDRL are removed because they are now unused.
* Helper's flashing conditional is restructured to do less flag swapping.
* The check for super setting FF_FULLBRIGHT is limited to MAXTRANSLATIONS now, and also correctly takes into account MAXSKINCOLORS == SKINCOLOR_SUPERSILVER1.
* NiGHTS collision bounds aren't hardcoded anymore.
* NiGHTS link will never display when leaving stage.
* Slightly tweaked rules for the supercolor setting when doing a NiGHTS transformation, but only meaningful for setting FF_FULLBRIGHT.
 		2016-08-12 14:42:22 +01:00
..
android Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
blua NULL checks 2016-06-13 10:07:10 -04:00
djgppdos Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
dummy SRB2 2.1 release 2014-03-15 13:11:35 -04:00
hardware Now that it's not 3am, here's some fixes to what I pushed last night. 2016-08-12 14:42:22 +01:00
locale Fixed forceskin to not always allow due to bad logic. 2016-07-14 13:24:57 +01:00
nds Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
sdl Merge branch 'master' into next 2016-07-21 18:49:33 -04:00
sdl12 Revert "Merge branch 'RemoveINetC' into 'master'" 2016-07-21 14:42:00 -04:00
win32 Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
win32ce New HD SRB2 icon by VAdaPEga. 2015-03-01 20:07:56 -05: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 Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
Makefile Merge branch 'master' into next 2016-07-21 18:49:33 -04:00
Makefile.cfg Merge branch 'macosx-hacking' into 'master' 2016-07-21 15:38:46 -04:00
am_map.c gcc: clear uninitialized warnings in am_map.c 2016-05-27 14:22:02 -04: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 Merge branch 'public_next' into master 2016-05-20 17:58:57 -04: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 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements 2016-07-16 17:23:25 +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 update patch stuff again. 2016-05-04 05:43:05 -07:00
console.c Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
console.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_clisrv.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmode 2016-07-07 01:08:51 +01:00
d_clisrv.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmode 2016-07-07 01:08:51 +01:00
d_event.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_main.c Merge branch 'public_next' into master 2016-08-07 23:29:01 -04:00
d_main.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
d_net.c Revert "Merge branch 'RemoveINetC' into 'master'" 2016-07-21 14:42:00 -04:00
d_net.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_netcmd.c Fixed forceskin to not always allow due to bad logic. 2016-07-14 13:24:57 +01:00
d_netcmd.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_netfil.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_netfil.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
d_player.h CA_MELEE. Mostly complete. 2016-07-17 21:31:15 +01: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 NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp 2016-08-12 02:57:37 +01:00
dehacked.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
doomdata.h SUPERCOLOR BONANZA COMMIT. 2016-08-10 19:48:20 +01:00
doomdef.h SUPERCOLOR BONANZA COMMIT. 2016-08-10 19:48:20 +01:00
doomstat.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
doomtype.h Merge branch 'macosx-hacking' into 'master' 2016-07-21 15:38:46 -04:00
endian.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
f_finale.c ...completely misunderstood the reasons we weren't merging toast_slopes, mom holy fuck i'm stupid and bad 2016-06-20 00:20:20 +01:00
f_finale.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
f_wipe.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
fastcmp.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
filesrch.c SRB2 2.1 release 2014-03-15 13:11:35 -04:00
filesrch.h SRB2 2.1 release 2014-03-15 13:11:35 -04:00
g_game.c SUPERCOLOR BONANZA COMMIT. 2016-08-10 19:48:20 +01:00
g_game.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
g_input.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
g_input.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
g_state.h Remove extern for unused "oncontinuescreen" variable 2016-05-18 17:41:11 +01:00
hu_stuff.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
hu_stuff.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
i_addrinfo.c MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
i_addrinfo.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_joy.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_net.h Revert "Merge branch 'RemoveINetC' into 'master'" 2016-07-21 14:42:00 -04:00
i_sound.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_system.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
i_tcp.c gcc-6: error: left shift of negative value [-Werror=shift-negative-value] 2016-05-28 21:23:09 -04: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 Now that it's not 3am, here's some fixes to what I pushed last night. 2016-08-12 14:42:22 +01:00
info.h Now that it's not 3am, here's some fixes to what I pushed last night. 2016-08-12 14:42:22 +01:00
keys.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_baselib.c Merge branch 'public_next' into master 2016-07-11 15:52:27 -04:00
lua_consolelib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_hook.h CA_MELEE. Mostly complete. 2016-07-17 21:31:15 +01:00
lua_hooklib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_hud.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_hudlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_infolib.c Merge branch 'master' into spr2-freeslots 2016-07-11 15:26:39 -04:00
lua_libs.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_maplib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_mathlib.c Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
lua_mobjlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_playerlib.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmode 2016-07-07 01:08:51 +01:00
lua_script.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_script.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_skinlib.c NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp 2016-08-12 02:57:37 +01:00
lua_thinkerlib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lzf.c define SRTICT_ALIGN to - if the system is x86/x64 system 2016-07-23 23:26:08 -04: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 Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
m_anigif.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_anigif.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_argv.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 'public_next' into master 2016-05-20 17:58:57 -04:00
m_cheat.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_cond.c Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
m_cond.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_dllist.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_fixed.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_fixed.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_menu.c Some nice optimisations to the new character select menu - no need to iterate up to 3 times a tic at the expense of ((32*2 + 2)*UINT8 - 3*INT32) memory. 2016-08-06 22:41:25 +01:00
m_menu.h Some nice optimisations to the new character select menu - no need to iterate up to 3 times a tic at the expense of ((32*2 + 2)*UINT8 - 3*INT32) memory. 2016-08-06 22:41:25 +01:00
m_misc.c Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
m_misc.h Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +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 copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
md5.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
mserv.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_enemy.c Now that it's not 3am, here's some fixes to what I pushed last night. 2016-08-12 14:42:22 +01:00
p_floor.c Merge branch 'public_next' (early part) into private 2016-07-11 15:50:06 -04:00
p_inter.c NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp 2016-08-12 02:57:37 +01:00
p_lights.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_local.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements 2016-07-16 17:23:25 +01:00
p_map.c Bugfix for spike sound playing when attempting to attack non-solid spikes with CA_DASHMODE/CA_TWINSPIN/CA2_MELEE. 2016-08-06 23:54:38 +01:00
p_maputl.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_maputl.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_mobj.c Now that it's not 3am, here's some fixes to what I pushed last night. 2016-08-12 14:42:22 +01:00
p_mobj.h Merge branch 'public_next' into master 2016-07-11 16:22:05 -04:00
p_polyobj.c Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
p_polyobj.h Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
p_pspr.h Preparation for the SPR2_ freeslot branch's merger. *crosses fingers it happens soon* 2016-08-01 17:17:25 +01:00
p_saveg.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmode 2016-07-07 01:08:51 +01:00
p_saveg.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_setup.c clean up warning done in setup-fixes 2016-06-19 12:48:35 -04:00
p_setup.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_sight.c Added P_LoadReject function to properly check if REJECT lump is valid or not when loading it, so P_CheckSight can avoid accessing it if not. 2016-06-11 18:45:56 +01:00
p_slopes.c ...completely misunderstood the reasons we weren't merging toast_slopes, mom holy fuck i'm stupid and bad 2016-06-20 00:20:20 +01:00
p_slopes.h P_ReverseQuantiseMomentumToSlope is now a function. (I was thinking about a macro, but couldn't get it down.) 2016-06-12 19:27:34 +01:00
p_spec.c Merge branch 'public_next' into master 2016-08-07 23:29:01 -04:00
p_spec.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_telept.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_tick.c Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
p_tick.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_user.c Now that it's not 3am, here's some fixes to what I pushed last night. 2016-08-12 14:42:22 +01:00
r_bsp.c MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
r_bsp.h Remove unused drawfunc_t function typedef 2016-05-24 14:38:31 +01:00
r_data.c MSVC: kill level 3 warnings 2016-05-22 00:44:12 -04:00
r_data.h wad and lumps are unsigned, not signed 2016-07-23 23:02:10 -04:00
r_defs.h Making the flag value more obvious. 2016-08-08 14:35:18 +01:00
r_draw.c Forgot a comment. 2016-08-10 22:47:42 +01:00
r_draw.h SUPERCOLOR BONANZA COMMIT. 2016-08-10 19:48:20 +01:00
r_draw8.c Merge branch 'public_next' into private 2016-07-21 19:22:30 -04: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 Merge branch 'public_next' into private 2016-07-21 19:22:30 -04:00
r_main.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_plane.c MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
r_plane.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
r_segs.c Fixed typo of mine that lead to the ceiling part of GFZ2's tunnel section being rendered wrongly 2016-07-20 15:11:36 +01:00
r_segs.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_sky.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 Fix player 1 and player 2 affecting whether the other can see skyboxes or not 2016-05-18 18:20:56 +01:00
r_things.c NiGHTS is now spr2-ised. i'll upload the relevant files and etc to the ftp 2016-08-12 02:57:37 +01:00
r_things.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements 2016-08-11 17:46:08 +01:00
s_sound.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
s_sound.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
screen.c FUNCMATH fun 2016-06-12 16:08:48 -04:00
screen.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
sounds.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
sounds.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
st_stuff.c Rob requested new NiGHTS link colours, his wish is my command. (This is only vaguely appropriate for this branch, but the boat sailed on a specific Reduced_Palette branch a while ago.) 2016-08-10 23:51:35 +01:00
st_stuff.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
string.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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 copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
tables.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
tmap.nas Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
tmap.s copyright dates/statements updated and such 2016-05-17 17:42:11 -07: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' into master 2016-05-20 17:58:57 -04:00
v_video.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
vid_copy.s copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
w_wad.c Fix crash reported by FuriousFox at http://mb.srb2.org/showthread.php?t=41536 2016-06-02 20:16:25 +01:00
w_wad.h Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01:00
y_inter.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
y_inter.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
z_zone.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
z_zone.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00