| .. |
|
android
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
blua
|
Build: kill GCC 7's implicit-fallthrough warning
|
2017-09-28 09:39:47 -04:00 |
|
djgppdos
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
dummy
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
hardware
|
As requested by Jeck:
|
2018-10-27 21:16:19 +01:00 |
|
locale
|
|
|
|
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
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
sdl12
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
win32
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
win32ce
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
.gitignore
|
|
|
|
am_map.c
|
|
|
|
am_map.h
|
|
|
|
Android.mk
|
|
|
|
asm_defs.inc
|
|
|
|
b_bot.c
|
Comment out calls to CV_SetValue for cv_analog
|
2018-03-12 03:18:45 +00:00 |
|
b_bot.h
|
|
|
|
byteptr.h
|
|
|
|
CMakeLists.txt
|
Closer to done HUD tweaking?
|
2017-12-23 19:14:06 -05:00 |
|
command.c
|
Hard Mode is an unlockable
|
2018-10-13 17:54:53 -04:00 |
|
command.h
|
Address review
|
2018-09-20 17:11:11 -04:00 |
|
comptime.c
|
|
|
|
config.h.in
|
DevEXE version 1.1.00: Added some MD5 checks, increased md2 triagle limit, temporarily disabled magnet
|
2017-02-20 20:08:24 -05:00 |
|
console.c
|
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
|
2018-10-25 13:21:44 +02:00 |
|
console.h
|
Brown text colormap instead of teal, revert sky-blue
|
2018-10-04 18:07:56 -04:00 |
|
d_clisrv.c
|
Merge branch 'master' into 'chat-changes'
|
2018-10-21 08:27:28 -04:00 |
|
d_clisrv.h
|
Fix all of the joining ghost issues or desyncing
|
2018-09-30 16:20:01 -04:00 |
|
d_event.h
|
A lot lol
|
2017-12-16 22:32:43 -05:00 |
|
d_main.c
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen
|
2018-10-16 22:13:45 +01:00 |
|
d_main.h
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
d_net.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
d_net.h
|
Change splitscreen into UINT8, fix HUD slightly more
|
2017-12-18 20:59:04 -05:00 |
|
d_netcmd.c
|
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
|
2018-10-25 13:21:44 +02:00 |
|
d_netcmd.h
|
Merge branch 'master' into net-screen
|
2018-10-19 15:59:13 -04:00 |
|
d_netfil.c
|
Addons menu.
|
2018-08-28 21:08:47 +01:00 |
|
d_netfil.h
|
Addons menu.
|
2018-08-28 21:08:47 +01:00 |
|
d_player.h
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:20:51 -04:00 |
|
d_think.h
|
|
|
|
d_ticcmd.h
|
Lots of cmd restructuring.
|
2018-06-05 17:12:42 -04:00 |
|
dehacked.c
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:39:02 -04:00 |
|
dehacked.h
|
|
|
|
doomdata.h
|
Hundreds of tweaks
|
2018-06-19 20:20:06 -04:00 |
|
doomdef.h
|
Merge branch 'noclip-cam' into 'master'
|
2018-10-07 23:15:06 -04:00 |
|
doomstat.h
|
Resolved conflict
|
2018-10-25 01:35:55 +02:00 |
|
doomtype.h
|
Mirror Mode
|
2017-12-12 00:07:14 -05:00 |
|
endian.h
|
|
|
|
f_finale.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
f_finale.h
|
Merge branch 'master' into sonicitems
|
2018-07-08 17:51:44 -04:00 |
|
f_wipe.c
|
Do Oni's suggested changes to the wipe-based level intro fade. https://cdn.discordapp.com/attachments/270211093761097728/470690865279401994/kart0019.gif
|
2018-07-22 21:49:17 +01:00 |
|
fastcmp.h
|
|
|
|
filesrch.c
|
Fix Sryder's crash (incorrect setting of dir_on when searching in subfolders).
|
2018-09-23 13:23:03 +01:00 |
|
filesrch.h
|
* Add support for .kart files.
|
2018-08-29 14:19:08 +01:00 |
|
g_game.c
|
Merge branch 'master' into chat-changes
|
2018-10-25 11:14:49 +02:00 |
|
g_game.h
|
Merge branch 'master' into net-screen
|
2018-10-19 15:59:13 -04:00 |
|
g_input.c
|
Minor whitespace
|
2018-10-15 20:34:53 -04:00 |
|
g_input.h
|
New bindable keys
|
2018-09-27 16:55:21 -04:00 |
|
g_state.h
|
Getting there.
|
2018-01-27 20:59:29 -05:00 |
|
hu_stuff.c
|
Merge branch 'master' into 'toast_pokes'
|
2018-10-29 07:04:35 -04:00 |
|
hu_stuff.h
|
Merge branch 'master' into 'chat-changes'
|
2018-10-21 08:27:28 -04:00 |
|
i_addrinfo.c
|
Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
|
2018-07-07 16:52:01 +01:00 |
|
i_addrinfo.h
|
|
|
|
i_joy.h
|
Fix splitscreen joystick
|
2018-07-03 15:32:26 -04: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
|
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
|
2018-10-13 23:01:11 +01:00 |
|
i_system.h
|
some joystick fixes
|
2017-12-24 08:20:58 -05:00 |
|
i_tcp.c
|
SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general
|
2018-09-03 20:53:40 +01:00 |
|
i_tcp.h
|
|
|
|
i_video.h
|
|
|
|
info.c
|
Merge branch 'karma-touchups' into 'master'
|
2018-10-25 14:06:22 -04:00 |
|
info.h
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:39:02 -04:00 |
|
k_kart.c
|
Merge branch 'master' into 'toast_pokes'
|
2018-10-29 07:04:35 -04:00 |
|
k_kart.h
|
Merge branch 'master' into new-spb
|
2018-10-19 17:45:06 -04:00 |
|
keys.h
|
|
|
|
lua_baselib.c
|
Merge branch 'master' into chat-changes
|
2018-10-25 11:14:49 +02:00 |
|
lua_consolelib.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
|
2018-08-07 21:20:27 +01:00 |
|
lua_hook.h
|
Chat Manager
|
2018-06-15 05:20:01 -05:00 |
|
lua_hooklib.c
|
Chat Manager
|
2018-06-15 05:20:01 -05:00 |
|
lua_hud.h
|
More consistent comment.
|
2016-08-19 00:07:32 +01:00 |
|
lua_hudlib.c
|
Fade-in intro
|
2018-06-26 10:14:59 -04:00 |
|
lua_infolib.c
|
|
|
|
lua_libs.h
|
v1.3.04 - The Bouncy One
|
2017-04-17 13:20:52 -04:00 |
|
lua_maplib.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
lua_mathlib.c
|
Hundreds of tweaks
|
2018-06-19 20:20:06 -04:00 |
|
lua_mobjlib.c
|
Linked list bananas, hnext/hprev fixes
|
2018-06-16 19:57:08 -04:00 |
|
lua_playerlib.c
|
Lots of cmd restructuring.
|
2018-06-05 17:12:42 -04:00 |
|
lua_script.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
lua_script.h
|
|
|
|
lua_skinlib.c
|
Some more minor comeback tweaks
|
2017-11-19 19:39:40 -05:00 |
|
lua_thinkerlib.c
|
Rewrote thinkers.iterate to handle invalid pointers elegantly.
|
2017-05-27 14:03:27 -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
|
|
|
|
m_aatree.h
|
m_aatree: add newline
|
2016-12-22 19:39:37 -05:00 |
|
m_anigif.c
|
Fix order of operations messups by adding brackets
|
2018-09-16 20:25:07 +01:00 |
|
m_anigif.h
|
|
|
|
m_argv.c
|
|
|
|
m_argv.h
|
|
|
|
m_bbox.c
|
|
|
|
m_bbox.h
|
|
|
|
m_cheat.c
|
Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows.
|
2018-10-03 17:04:41 +01:00 |
|
m_cheat.h
|
Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows.
|
2018-10-03 17:04:41 +01:00 |
|
m_cond.c
|
Hard Mode is an unlockable
|
2018-10-13 17:54:53 -04:00 |
|
m_cond.h
|
Hard Mode is an unlockable
|
2018-10-13 17:54:53 -04:00 |
|
m_dllist.h
|
|
|
|
m_fixed.c
|
Correct C FixedMul() off-by-one errors
|
2018-05-20 22:55:21 +03:00 |
|
m_fixed.h
|
Comment out sdl12/SRB2CE/cehelp.h include in m_fixed.h
|
2017-09-14 21:29:38 +01:00 |
|
m_menu.c
|
As requested by Jeck:
|
2018-10-27 21:16:19 +01:00 |
|
m_menu.h
|
Fixed the menu highlight thing
|
2018-10-25 19:41:14 +02:00 |
|
m_misc.c
|
Don't allow non-keyboard keys to screenshot/gif in menus
|
2018-10-04 22:06:56 -04:00 |
|
m_misc.h
|
Merge branch 'upstream/next' into zarrotsu_vanillamerge
|
2017-02-17 20:14:55 +00:00 |
|
m_queue.c
|
|
|
|
m_queue.h
|
|
|
|
m_random.c
|
|
|
|
m_random.h
|
|
|
|
m_swap.h
|
|
|
|
Makefile
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
Makefile.cfg
|
Build: do not error on FALLTHURs
|
2017-10-27 19:49:55 -04:00 |
|
md5.c
|
|
|
|
md5.h
|
|
|
|
mserv.c
|
Merge remote-tracking branch 'refs/remotes/srb2public/master'
|
2018-01-02 22:59:43 -05:00 |
|
mserv.h
|
|
|
|
p5prof.h
|
|
|
|
p_ceilng.c
|
Build: kill GCC 7's implicit-fallthrough warning
|
2017-09-28 09:39:47 -04:00 |
|
p_enemy.c
|
Fix merges
|
2018-10-24 21:51:43 -04:00 |
|
p_floor.c
|
Two scale things I noticed.
|
2018-10-19 21:32:29 +01:00 |
|
p_inter.c
|
Merge branch 'karma-touchups' into 'master'
|
2018-10-25 14:06:22 -04:00 |
|
p_lights.c
|
|
|
|
p_local.h
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
p_map.c
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:20:51 -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
|
Higher default scale, WANTED indicator scales properly
|
2018-10-27 20:56:11 -04:00 |
|
p_mobj.h
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
p_polyobj.c
|
A lot lol
|
2017-12-16 22:32:43 -05:00 |
|
p_polyobj.h
|
|
|
|
p_pspr.h
|
Chee wanted paper sprites' code, so here it is for the public to see.
|
2016-08-22 22:54:30 +01:00 |
|
p_saveg.c
|
Merge branch 'new-spb' into 'master'
|
2018-10-24 16:04:29 -04:00 |
|
p_saveg.h
|
|
|
|
p_setup.c
|
Merge branch 'master' into new-spb
|
2018-10-19 17:45:06 -04:00 |
|
p_setup.h
|
One last thing - make the OpenGL level loading bar screen have the correct background colour.
|
2018-09-22 12:43:54 +01:00 |
|
p_sight.c
|
|
|
|
p_slopes.c
|
Flip dynamic slope toggle.
|
2018-09-28 12:58:07 +01:00 |
|
p_slopes.h
|
|
|
|
p_spec.c
|
Merge branch 'no-spectate-griefing' into 'master'
|
2018-10-19 15:50:18 -04:00 |
|
p_spec.h
|
v1.3.04 - The Bouncy One
|
2017-04-17 13:20:52 -04:00 |
|
p_telept.c
|
Nuke a bunch of iteration things that have no purpose in SRB2Kart. A full explanation of my reasoning and what it affects is as follows.
|
2018-10-03 17:04:41 +01:00 |
|
p_tick.c
|
New SPB
|
2018-10-18 04:43:50 -04:00 |
|
p_tick.h
|
|
|
|
p_user.c
|
Merge branch 'splitscreen-tuneup' into 'master'
|
2018-10-29 05:30:49 -04:00 |
|
r_bsp.c
|
Merge branch 'noclip-cam' into 'master'
|
2018-10-07 23:15:06 -04:00 |
|
r_bsp.h
|
ssplayer -> viewnumber
|
2018-06-27 13:14:22 -04:00 |
|
r_data.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
r_data.h
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
r_defs.h
|
Merge branch 'master' into public_flatsprite
|
2017-05-12 20:42:55 -04:00 |
|
r_draw.c
|
Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists...
|
2018-07-02 13:20:04 +01:00 |
|
r_draw.h
|
So much
|
2018-02-05 18:55:52 -05:00 |
|
r_draw8.c
|
Merge branch 'sonicitems' into encore
|
2018-08-10 23:22:28 +01:00 |
|
r_draw16.c
|
|
|
|
r_local.h
|
what is this bullshit?!
|
2018-03-12 01:21:35 -04:00 |
|
r_main.c
|
Merge branch 'master' into net-screen
|
2018-10-19 15:59:13 -04:00 |
|
r_main.h
|
Final weather stuff.
|
2018-10-14 22:32:34 +01:00 |
|
r_plane.c
|
Revamp flat alignment to be consistent across all renderer functions except for the software slope renderer, which me and fickle tried our best at but couldn't get to work. (This is a backport of 2.2 code that slightly postdates the improved flat alignment Kart's had for a while.)
|
2018-09-27 18:11:43 +01:00 |
|
r_plane.h
|
Encore mode - a fresh take on mirror mode!
|
2018-07-23 23:50:41 +01:00 |
|
r_segs.c
|
Don't need thissec
|
2018-10-06 23:37:27 -04:00 |
|
r_segs.h
|
|
|
|
r_sky.c
|
Rendering fixes ahoy!
|
2017-12-29 14:50:16 -05:00 |
|
r_sky.h
|
|
|
|
r_splats.c
|
|
|
|
r_splats.h
|
Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
|
2018-07-07 16:52:01 +01:00 |
|
r_state.h
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
r_things.c
|
Some token efforts to make singleplayer mode (accessible only via -warp and map mapxx -force) not COMPLETELY broken.
|
2018-10-17 13:40:17 +01:00 |
|
r_things.h
|
Merge branch 'master' into sonicitems
|
2018-07-08 17:51:44 -04:00 |
|
s_sound.c
|
Preface with splitscreen checks
|
2018-10-29 05:26:17 -04:00 |
|
s_sound.h
|
Don't look at this commit too closely until after netgame, I want to surprise yalls!!
|
2018-06-30 23:18:13 +01:00 |
|
screen.c
|
Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
|
2018-07-07 16:52:01 +01:00 |
|
screen.h
|
|
|
|
sounds.c
|
Merge branch 'master' into fz-time-over
|
2018-10-24 21:39:02 -04:00 |
|
sounds.h
|
Mementos hardcode
|
2018-10-20 21:17:13 +02:00 |
|
st_stuff.c
|
Fade stuff!
|
2018-10-27 20:39:41 +01:00 |
|
st_stuff.h
|
Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
|
2018-07-07 16:52:01 +01:00 |
|
string.c
|
|
|
|
t_facon.c
|
|
|
|
t_fsin.c
|
|
|
|
t_ftan.c
|
|
|
|
t_tan2a.c
|
|
|
|
tables.c
|
|
|
|
tables.h
|
Merge branch 'upstream/next' into zarrotsu_vanillamerge
|
2017-02-17 20:14:55 +00:00 |
|
tmap.nas
|
|
|
|
tmap.s
|
|
|
|
tmap_asm.s
|
|
|
|
tmap_mmx.nas
|
|
|
|
tmap_vc.nas
|
|
|
|
v_video.c
|
As requested by Jeck:
|
2018-10-27 21:16:19 +01:00 |
|
v_video.h
|
Brown text colormap instead of teal, revert sky-blue
|
2018-10-04 18:07:56 -04:00 |
|
vid_copy.s
|
|
|
|
w_wad.c
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
|
2018-10-14 21:52:05 +01:00 |
|
w_wad.h
|
Addons menu.
|
2018-08-28 21:08:47 +01:00 |
|
y_inter.c
|
Fade stuff!
|
2018-10-27 20:39:41 +01:00 |
|
y_inter.h
|
It's SINT8 not INT8
|
2018-02-23 01:04:52 +00:00 |
|
z_zone.c
|
|
|
|
z_zone.h
|
|
|
