stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
2300 commits 60 branches 11 tags 94 MiB
Commit graph

2300 commits

This branch
This branch
All branches
Author SHA1 Message Date
TehRealSalt
6d263a0dff Lots more little adjustin's 2017-12-26 21:36:03 -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
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
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
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
LJSonik
9c7ff6e0c3
Merge branch 'master' into resynch-fixes 2017-12-17 22:47:23 +01:00
TehRealSalt
1f958091df OpenGL rendering 2017-12-17 16:33:21 -05:00
TehRealSalt
66a9a6bdd4 Fixed local sync fail, among a bunch of other splitscreen check fixes in other files 
I don't know how many of the changes in d_clisrv were really necessary,
I was just franticly trying to figure out the source of the local sync
fail
 2017-12-17 14:17:07 -05:00
Wolfy
893dac11e1 Merge branch 'quads' of http://git.magicalgirl.moe/wolfs/Kart into quads 2017-12-17 01:05:57 -06:00
TehRealSalt
b820d47b63 Heyyyy, this fixes controls not registering :D 2017-12-17 01:48:47 -05:00
TehRealSalt
fc9d426660 More stuuuuff 2017-12-17 01:21:24 -05:00
Wolfy
50a2dc7b4d player views 
4p still crashes for some reason
 2017-12-17 00:09:32 -06:00
TehRealSalt
0393e24fa6 A lot lol 
The importants:
- Fixed compiling
- Combined G_BuildTiccmd for all players, no more need for a function
for each
- You can actually start 3p/4p mode
 2017-12-16 22:32:43 -05:00
Alam Ed Arias
baf227175b Merge branch 'master' into next 2017-12-16 18:16:15 -05:00
Alam Arias
703c5322d4
Merge pull request #212 from SteelTitanium/window_center_fix 
Fix for window being offcenter
 2017-12-16 18:15:00 -05:00
Alam Ed Arias
bd86f98822 Merge branch 'master' into next 2017-12-16 16:07:31 -05:00
MonsterIestyn
2ad4e1a1e5
Merge pull request #219 from LJSonik/net-archive-fix 
Fix missing lua_pop in ArchiveExtVars
 2017-12-16 20:57:46 +00:00