vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,521 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

2521 Commits

Author SHA1 Message Date
Monster Iestyn fa507ee939 Merge branch 'respawnspecials-mobjtype-hotfix' into 'next' 
P_RespawnSpecials mobj type hotfix

See merge request STJr/SRB2!217
 2017-12-27 15:47:44 -05:00
Monster Iestyn a87eec89ff Merge branch 'airbob-fix-backport' into 'next' 
Airbob fix backport

See merge request STJr/SRB2!219
 2017-12-27 15:46:39 -05:00
Steel Titanium 3856165623 Indentation cleanup 2017-12-27 13:18:20 -05:00
TehRealSalt 6d263a0dff Lots more little adjustin's 2017-12-26 21:36:03 -05:00
Alam Ed Arias f397b5fc3f Makefile: disable win_dbg for DirectDraw 2017-12-26 20:42:37 -05:00
Alam Ed Arias a29203acd8 Disable win_dbg 2017-12-26 20:24:08 -05:00
Alam Ed Arias e2b604fdfd TCP: remove BADSOCKET 2017-12-26 19:56:50 -05:00
TehRealSalt ab010f91b0 Last few finishing touches for the HUD 
Battle Mode cards & Race countdown timers display properly
 2017-12-25 10:05:36 -05:00
Alam Arias 97af30ae4b SRB2: disable Smaller Type Check for MSVC 2017-12-25 00:41:05 -05:00
Monster Iestyn 6886a29e99 Merge branch 'master' into next 2017-12-24 20:06:33 +00:00
Monster Iestyn 69be3f34bf Merge branch 'addfile-netgame-fixes' into 'master' 
"addfile" console command netgame fixes

See merge request STJr/SRB2!218
 2017-12-24 15:05:03 -05:00
TehRealSalt 189d2f7a34 Fixed joysticks 3 & 4 
fun typos
 2017-12-24 15:02:41 -05:00
TehRealSalt 9c7aad2929 Okay lets ACTUALLY fix it now :V 2017-12-24 09:19:59 -05:00
TehRealSalt ae1fc244c5 agggh more minor 2017-12-24 09:02:40 -05:00
TehRealSalt df03c27ba4 minor 2p/4p fix 2017-12-24 08:58:04 -05:00
TehRealSalt 0dfd7fc41e some joystick fixes 
Turns out P3/P4 controllers are broken (and still are)
 2017-12-24 08:20:58 -05:00
TehRealSalt c2db0ddca2 Battle hud stuff?! 2017-12-23 20:55:23 -05:00
TehRealSalt 7a5bd7c597 Closer to done HUD tweaking? 
Splitscreen in Battle is left
 2017-12-23 19:14:06 -05:00
TehRealSalt d7227a3dcc Merge remote-tracking branch 'srb2public/master' into quads 2017-12-22 21:04:56 -05:00
TehRealSalt c38423eeb0 Merge remote-tracking branch 'srb2public/next' into quads 
Update
 2017-12-22 20:55:59 -05:00
TehRealSalt 508df2e269 thing 2017-12-22 16:24:20 -05:00
TehRealSalt 94a42d1bf6 Unfinished V_HORZSCREEN revamp 2017-12-22 10:16:41 -05:00
toasterbabe a1620b709e Fix airbob sectors fucking up when below 0 z-height. 2017-12-20 21:13:24 +00:00
toasterone ff745531b0
Merge branch 'master' into addfile-netgame-fixes 2017-12-20 20:58:45 +00:00
toasterone 6ef3465d7d
Merge pull request #216 from LJSonik/download-freeze-fix 
Fix Master Server requests and player joins stopping file downloading
 2017-12-20 20:52:34 +00:00
TehRealSalt 59976d3ce8 More post processor support, HUD tweaks, SP new game fix 
Mirror Mode minimap, growing position nums, and general reorganization.
Some stuff needs more work but I'm exhausted rn
 2017-12-19 01:55:33 -05:00
TehRealSalt 5ad82554db Draw over the fourth screen *properly* 
Thanks Sryder, for suggesting V_NOSCALESTART
 2017-12-18 22:17:16 -05:00
Sryder13 47ee5f3976 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart.git into quads 2017-12-19 03:12:30 +00:00
Sryder13 d0b4ad0ce7 Fix Minimap Icon positions for new Minimap scale 2017-12-19 03:11:51 +00:00
TehRealSalt 5db276173e Merge remote-tracking branch 'origin/quads' into quads 
# Conflicts:
#	src/k_kart.c
 2017-12-18 21:11:59 -05:00
TehRealSalt 349b27e0de Change splitscreen into UINT8, fix HUD slightly more 2017-12-18 20:59:04 -05:00
Wolfy 36439da320 Resurrect the minimap 
Still kinda broken.
 2017-12-18 18:07:38 -06:00
Monster Iestyn d576453b56 Command_Addfile: add "too many files" and already-loaded checks and respective error messages 
No more shall the server be kicked from their own servers for re-adding a wad by accident!
 2017-12-18 21:17:37 +00:00
LJSonik 36ce6579b7
Merge branch 'master' into download-freeze-fix 2017-12-18 21:39:16 +01:00
Louis-Antoine 47481804da Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix 2017-12-18 21:38:10 +01:00
Louis-Antoine c8e9e779e7 Add a short comment to explain the newplayernum hack 2017-12-18 21:35:02 +01:00
Wolfy ea49a4c009 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads 2017-12-18 04:57:57 -06:00
Wolfy 2e26e79934 Fix 3P and 4P configuration screens 
They don't crash anymore!
 2017-12-18 04:56:38 -06:00
TehRealSalt 6346058f35 Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads 2017-12-18 01:03:14 -05:00
TehRealSalt 122eb82170 Merge remote-tracking branch 'refs/remotes/origin/battle' into quads 
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
 2017-12-18 01:02:53 -05:00
Wolfy c5a4822df6 Reorganize minimap code 2017-12-17 23:12:51 -06:00
TehRealSalt e7abd77299 Merge remote-tracking branch 'origin/quads' into quads 
# Conflicts:
#	src/d_main.c
#	src/r_draw.c
 2017-12-17 22:32:12 -05:00
TehRealSalt 80f62a057d SUCCESS 2017-12-17 22:27:26 -05:00
Alam Ed Arias 57a7a3bed8 Merge branch 'master' into next 2017-12-17 22:22:57 -05:00
Wolfy 0305af3069 Merge branch 'quads' of http://git.magicalgirl.moe/wolfs/Kart into quads 
# Conflicts:
#	src/d_main.c
 2017-12-17 20:30:37 -06:00
Wolfy 32b9663202 more stuff 
nothing too special here
 2017-12-17 20:23:11 -06:00
TehRealSalt d2425329ca HUD 2017-12-17 20:42:17 -05:00
TehRealSalt 654e5e482b Mess with camera distance stuff 
Also fixed a bug where I made all of the screens in 3p/4p mode in OpenGL
too zoomed in
 2017-12-17 17:01:19 -05:00
MonsterIestyn 47a06ffda5
Merge pull request #218 from LJSonik/resynch-fixes 
Resynch fixes
 2017-12-17 21:57:25 +00:00
LJSonik 084a534f6a
Merge branch 'master' into download-freeze-fix 2017-12-17 22:48:13 +01:00