8fffa290ce
Merge remote-tracking branch 'refs/remotes/origin/battle'
2018-01-01 19:27:48 -05:00
d92e2d89dd
Y'know what let's just completely get rid of this prefcolor restriction
...
Kart doesn't really need this if we're taking the MK8 Yoshi/Shy Guy
approach to just letting you pick whatever colors. It's just plain
annoying to set your color in the menu, then go into splitscreen and see
that none of it actually carried over :V
2018-01-01 18:12:44 -05:00
4d207e9037
NOFOURPLAYER as a compile option
2018-01-01 13:18:38 -05:00
4a23c4704d
Rendering fixes ahoy!
...
- Fix squished sky in Software 3P/4P
- Fix reversed sky in OpenGL Mirror Mode
- Fix MD2 culling in Mirror Mode
2017-12-29 14:50:16 -05:00
c70a2f51aa
Tweeeeeaks
...
- MT_FALLINGROCK bumps you instead of spinning you out! RIP annoying af apples
- Made some Battle-related messages only happen in netgames
- Messed with the timing on the intro
2017-12-28 18:37:25 -05:00
1ab5273400
Merge branch 'master' into next
2017-12-27 19:34:28 -05:00
98d6619c36
GIT: ignore .vs folder
2017-12-27 19:32:59 -05:00
f647989433
MSVC: set SubSystem on DLLs to Windows
2017-12-27 19:32:38 -05:00
d937f6fc8b
Merge branch '2.1.20-preparation' into 'next'
...
2.1.20 preparation
See merge request STJr/SRB2!215
2017-12-27 16:53:43 -05:00
5400beb2e3
Merge branch 'master' into next
2017-12-27 21:51:11 +00:00
afcdb5cd1e
Merge branch 'restartaudio' into 'master'
...
Add command to restart the audio system
Closes #27
See merge request STJr/SRB2!214
2017-12-27 16:47:50 -05:00
875446295b
Remove redundant !dedicated check
2017-12-27 16:36:57 -05:00
f9388eab1b
Merge branch 'master' into next
2017-12-27 15:50:31 -05:00
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
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
3856165623
Indentation cleanup
2017-12-27 13:18:20 -05:00
6d263a0dff
Lots more little adjustin's
2017-12-26 21:36:03 -05:00
f397b5fc3f
Makefile: disable win_dbg for DirectDraw
2017-12-26 20:42:37 -05:00
a29203acd8
Disable win_dbg
2017-12-26 20:24:08 -05:00
e2b604fdfd
TCP: remove BADSOCKET
2017-12-26 19:56:50 -05:00
ab010f91b0
Last few finishing touches for the HUD
...
Battle Mode cards & Race countdown timers display properly
2017-12-25 10:05:36 -05:00
97af30ae4b
SRB2: disable Smaller Type Check for MSVC
2017-12-25 00:41:05 -05:00
6886a29e99
Merge branch 'master' into next
2017-12-24 20:06:33 +00:00
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
189d2f7a34
Fixed joysticks 3 & 4
...
fun typos
2017-12-24 15:02:41 -05:00
9c7aad2929
Okay lets ACTUALLY fix it now :V
2017-12-24 09:19:59 -05:00
ae1fc244c5
agggh more minor
2017-12-24 09:02:40 -05:00
df03c27ba4
minor 2p/4p fix
2017-12-24 08:58:04 -05:00
0dfd7fc41e
some joystick fixes
...
Turns out P3/P4 controllers are broken (and still are)
2017-12-24 08:20:58 -05:00
c2db0ddca2
Battle hud stuff?!
2017-12-23 20:55:23 -05:00
7a5bd7c597
Closer to done HUD tweaking?
...
Splitscreen in Battle is left
2017-12-23 19:14:06 -05:00
d7227a3dcc
Merge remote-tracking branch 'srb2public/master' into quads
2017-12-22 21:04:56 -05:00
c38423eeb0
Merge remote-tracking branch 'srb2public/next' into quads
...
Update
2017-12-22 20:55:59 -05:00
508df2e269
thing
2017-12-22 16:24:20 -05:00
94a42d1bf6
Unfinished V_HORZSCREEN revamp
2017-12-22 10:16:41 -05:00
a1620b709e
Fix airbob sectors fucking up when below 0 z-height.
2017-12-20 21:13:24 +00:00
ff745531b0
Merge branch 'master' into addfile-netgame-fixes
2017-12-20 20:58:45 +00:00
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
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
5ad82554db
Draw over the fourth screen *properly*
...
Thanks Sryder, for suggesting V_NOSCALESTART
2017-12-18 22:17:16 -05:00
47ee5f3976
Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart.git into quads
2017-12-19 03:12:30 +00:00
d0b4ad0ce7
Fix Minimap Icon positions for new Minimap scale
2017-12-19 03:11:51 +00:00
5db276173e
Merge remote-tracking branch 'origin/quads' into quads
...
# Conflicts:
# src/k_kart.c
2017-12-18 21:11:59 -05:00
349b27e0de
Change splitscreen into UINT8, fix HUD slightly more
2017-12-18 20:59:04 -05:00
36439da320
Resurrect the minimap
...
Still kinda broken.
2017-12-18 18:07:38 -06:00
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
36ce6579b7
Merge branch 'master' into download-freeze-fix
2017-12-18 21:39:16 +01:00
47481804da
Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix
2017-12-18 21:38:10 +01:00
c8e9e779e7
Add a short comment to explain the newplayernum hack
2017-12-18 21:35:02 +01:00
ea49a4c009
Merge branch 'quads' of http://git.magicalgirl.moe/KartKrew/Kart into quads
2017-12-18 04:57:57 -06:00
TehRealSalt