stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 09:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity
SRB2/src
History
toasterbabe 095a438e9e * Super float now back on spin button, again takes precedence over shield actives. 
* Fixed BIG mistake where ShieldSpecial hook bailed out of the entire function instead of just the shield section.
2016-11-24 14:29:29 +00:00
..
android Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
blua NULL checks 2016-06-13 10:07:10 -04:00
djgppdos Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
dummy Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
hardware Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
locale Fixed forceskin to not always allow due to bad logic. 2016-07-14 13:24:57 +01:00
nds Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
sdl Console with moving cursor, selections, etc 2016-11-03 17:30:30 -07:00
sdl12 Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
win32 Fix up Win32 interface code misdeclaration of I_ClipboardPaste() 2016-11-03 14:35:32 -04:00
win32ce Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
.gitignore SRB2 2.1 release 2014-03-15 13:11:35 -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
Android.mk SRB2 2.1 release 2014-03-15 13:11:35 -04:00
asm_defs.inc SRB2 2.1 release 2014-03-15 13:11:35 -04:00
b_bot.c Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. 2016-09-23 23:48:48 +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
CMakeLists.txt Split AA trees code from m_misc.c/.h into m_aatree.c/.h 2016-06-05 21:29:40 +01: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 update colors to new palette 2016-11-10 16:53:27 -08:00
console.h make console back color use just one section of memory 2016-11-02 14:26:35 -07:00
d_clisrv.c Merge branch 'master' into damage-control 2016-09-30 21:05:44 +01:00
d_clisrv.h Merge branch 'master' into damage-control 2016-09-30 21:05:44 +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' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-11-10 16:20:03 -08: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 Merge branch 'master' into damage-control 2016-09-30 21:05:44 +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 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00: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 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00: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 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-11-10 16:20:03 -08: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 Merge branch 'unslot-music' into 'master' 2016-10-23 06:46:33 -04: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 Mario mode is boring again. (I'm going to revert this commit as soon as possible, but shield_actions needs to be clean of Mario stuff for now.) 2016-10-24 12:35:40 +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 Merge branch 'damage-control' into 'master' 2016-11-13 16:47:05 -05:00
hu_stuff.h Revert "Chat and console improvements" 2016-11-03 00:34:15 -07: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 Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
i_tcp.c NONET should also disable UPNP support 2016-08-13 10:12:14 -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 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
info.h * Flameaura shield now has boosh sprites. 2016-10-23 20:34:43 +01:00
keys.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_baselib.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
lua_consolelib.c copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
lua_hook.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
lua_hooklib.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
lua_hud.h More consistent comment. 2016-08-19 00:07:32 +01:00
lua_hudlib.c Lua now errors if negative scales are used with v.drawScaled 2016-10-18 22:07:20 +01: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 * Introducing new Lua-exclusive function, P_IsValidSprite2(mo, spr2). Basically just a wrapper for (((skin_t *)mobj->skin)->sprites[spr2].numframes > 0), useful for creating custom sprite2 defaulting functions since hooking into P_GetMobjSprite2 wouldn't be worth it. 2016-11-11 23:23:41 +00:00
lua_playerlib.c Merge branch 'master' into damage-control 2016-09-30 21:05:44 +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 'master' into damage-control 2016-10-29 17:05:59 +01:00
m_cheat.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
m_cond.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into nix-srb1 2016-10-05 18:47:32 -07: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 Merge branch 'damage-control' into 'master' 2016-11-13 16:47:05 -05: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 Public remake of a merge request I shouldn't have put in Internal in the first place. 2016-09-26 18:35:13 +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
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
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 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
p_floor.c * Some shield constants renamed. 2016-10-16 22:28:50 +01:00
p_inter.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00: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 shield-actions 2016-11-20 16:44:38 +00:00
p_map.c Revert "Nev3r wants to make barrels which are both shootable and die when you break them like you break monitors." 2016-11-12 15:39:47 +00:00
p_maputl.c Solid midtextures now account for "infinite" repeats 2016-08-27 17:14:21 +01: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 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
p_mobj.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00: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 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into animate_global 2016-10-03 00:27:49 -07:00
p_saveg.c Merge branch 'master' into damage-control 2016-09-30 21:05:44 +01:00
p_saveg.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_setup.c Merge branch 'damage-control' into 'master' 2016-11-13 16:47:05 -05: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 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00:00
p_spec.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_telept.c Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. 2016-09-23 23:48:48 +01:00
p_tick.c Merge branch 'master' into damage-control 2016-05-25 15:33:09 +01:00
p_tick.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
p_user.c * Super float now back on spin button, again takes precedence over shield actives. 2016-11-24 14:29:29 +00: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 Change 0xF7 to 0xFF in R_GenerateTexture 2016-11-07 20:27:12 +00: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 Minor tweaks to animations and endsigns. 2016-09-08 17:48:54 +01:00
r_draw.h SUPERCOLOR BONANZA COMMIT. 2016-08-10 19:48:20 +01:00
r_draw8.c Merge branch 'public_next' into master 2016-08-11 12:59:04 -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' 2016-10-29 17:03:38 +01:00
r_main.h copyright dates/statements updated and such 2016-05-17 17:42:11 -07:00
r_plane.c Merge branch 'vertical-sky-distort2' into 'master' 2016-10-07 17:30:15 -04:00
r_plane.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
r_segs.c Merge branch 'fof-slope-skew' into 'master' 2016-10-07 17:29:21 -04: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 whitespace: cleanup 2016-11-01 15:54:52 -04:00
r_things.h Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites 2016-09-27 18:11:20 +01:00
s_sound.c More thorough Mario soundification for new shield sounds. 2016-10-23 22:21:42 +01:00
s_sound.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
screen.c On MI's reccomendation, swapped FPS and %d/35's position so that only the description "FPS" moves. http://imgur.com/a/rQogE 2016-09-30 20:44:51 +01:00
screen.h FUNCMATH fun 2016-06-12 16:08:48 -04:00
sounds.c Adding new sounds for SRB2 shields. 2016-10-17 18:01:43 +01:00
sounds.h Adding new sounds for SRB2 shields. 2016-10-17 18:01:43 +01:00
st_stuff.c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-20 16:44:38 +00: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' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-11-10 16:20:03 -08:00
v_video.h make console back color use just one section of memory 2016-11-02 14:26:35 -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 Merge branch 'master' into damage-control 2016-10-23 21:08:17 +01: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