Commit graph

2450 commits

Author SHA1 Message Date
Sryder13
9ee6634b71 Fix checkers position in non-green resolutions 2018-01-15 04:03:27 +00:00
Sryder13
1d334cab75 Base title screen, gets screen fade working from intro->title for the fade to work 2018-01-15 03:40:25 +00:00
Sryder13
a3f38bb9e8 Fix minimaps for any maps that are larger than half of the mappable area, in either direction. 2018-01-13 21:07:44 +00:00
TehRealSalt
ec61a9c57a Title screen 2018-01-13 14:24:02 -05:00
TehRealSalt
c1f0da8687 Switched Gold 'shroom and Star's chances
Doesn't really belong in this branch, but it's also an experimental
change that needs a decent-sized netgame to test to make sure it doesn't
hurt anything. Done because Gold 'shroom is a lot harder to use as a
catch-up item now that it reduces timer whenever you use it
2018-01-08 16:51:38 -05:00
TehRealSalt
7f9f13bb97 A bunch of little things
- Minimum wall bounce speed decreased from 25*FRACUNIT to 15*FRACUNIT
- Solid objects now bump players instead of stop them
- Bounce pad strength scales with object scale
- Fixed Boo stealing being inconsistent and sometimes not stealing
anything
2018-01-08 15:48:19 -05:00
TehRealSalt
c096b97b12 Rearranging some things
Player minimum bounce is set in P_HitBounceLine instead of P_BounceMove,
which is simpler and appears to give even more consistent results
2018-01-04 16:39:29 -05:00
TehRealSalt
02d50629c7 Rewrote P_HitBounceLine
Instead of reflecting momentum (iirc), it thrusts you away prependicular
from the wall.
2018-01-04 01:49:34 -05:00
TehRealSalt
f0bb6686d6 You know what? Let's just, try removing the weird hacky bounceback stuff :V
Might be better? (I had trouble reproducing the weird bounces before, so
I can't tell if it's completely fixed)
2018-01-03 20:20:27 -05:00
TehRealSalt
bb118764e6 Merge remote-tracking branch 'refs/remotes/origin/master' into buuump 2018-01-03 20:02:53 -05:00
TehRealSalt
f89dcc9195 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/doomdef.h
2018-01-03 16:27:36 -05:00
TehRealSalt
8504eaaf0f Stupidly minor "Sonic Robo Blast 2" -> "SRB2Kart" 2018-01-02 23:15:13 -05:00
TehRealSalt
7e9bcf5a49 Merge remote-tracking branch 'refs/remotes/srb2public/master' 2018-01-02 22:59:43 -05:00
TehRealSalt
5db53c519f Minimum wall bump speed copied from K_KartBouncing 2018-01-02 13:06:49 -05:00
TehRealSalt
18c3678c7d Commiting directly to master? Oh nooooo
A forgotten include...
2018-01-01 20:17:34 -05:00
TehRealSalt
e222e3564a Merge remote-tracking branch 'refs/remotes/origin/quads' 2018-01-01 19:28:53 -05:00
TehRealSalt
8fffa290ce Merge remote-tracking branch 'refs/remotes/origin/battle' 2018-01-01 19:27:48 -05:00
TehRealSalt
5f9496c658 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
TehRealSalt
6ed9cec7b0 NOFOURPLAYER as a compile option 2018-01-01 13:18:38 -05:00
TehRealSalt
e2b769529b 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
TehRealSalt
4458cfdb9f 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
Alam Ed Arias
26ce50f02c Merge branch 'master' into next 2017-12-27 19:34:28 -05:00
Alam Ed Arias
e2d257031b GIT: ignore .vs folder 2017-12-27 19:32:59 -05:00
Alam Ed Arias
31027d1a2d MSVC: set SubSystem on DLLs to Windows 2017-12-27 19:32:38 -05:00
Monster Iestyn
83a8a77beb 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
Monster Iestyn
adf57fd5a5 Merge branch 'master' into next 2017-12-27 21:51:11 +00:00
Monster Iestyn
a9bc7158d6 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
Steel Titanium
875446295b Remove redundant !dedicated check 2017-12-27 16:36:57 -05:00
Alam Ed Arias
c7ca071c19 Merge branch 'master' into next 2017-12-27 15:50:31 -05:00
Monster Iestyn
a1b2c6129d 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
3af72ec79d 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
4f02bcc5b9 Lots more little adjustin's 2017-12-26 21:36:03 -05:00
Alam Ed Arias
def0c12279 Makefile: disable win_dbg for DirectDraw 2017-12-26 20:42:37 -05:00
Alam Ed Arias
f1968e5145 Disable win_dbg 2017-12-26 20:24:08 -05:00
Alam Ed Arias
faf88cf2e5 TCP: remove BADSOCKET 2017-12-26 19:56:50 -05:00
TehRealSalt
65ad640845 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
7688aecd31 SRB2: disable Smaller Type Check for MSVC 2017-12-25 00:41:05 -05:00
Monster Iestyn
342326bdd6 Merge branch 'master' into next 2017-12-24 20:06:33 +00:00
Monster Iestyn
90093268a9 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
60675ec101 Fixed joysticks 3 & 4
fun typos
2017-12-24 15:02:41 -05:00
TehRealSalt
b595dc31c1 Okay lets ACTUALLY fix it now :V 2017-12-24 09:19:59 -05:00
TehRealSalt
929e479499 agggh more minor 2017-12-24 09:02:40 -05:00
TehRealSalt
2e3af0a377 minor 2p/4p fix 2017-12-24 08:58:04 -05:00
TehRealSalt
92831788da some joystick fixes
Turns out P3/P4 controllers are broken (and still are)
2017-12-24 08:20:58 -05:00
TehRealSalt
e348b87b05 Battle hud stuff?! 2017-12-23 20:55:23 -05:00
TehRealSalt
5cf0381286 Closer to done HUD tweaking?
Splitscreen in Battle is left
2017-12-23 19:14:06 -05:00
TehRealSalt
c23ff3ac3d Merge remote-tracking branch 'srb2public/master' into quads 2017-12-22 21:04:56 -05:00
TehRealSalt
e62a473766 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