Monster Iestyn
6d8dc56e55
P_AddWadFile: Remove useless firstmapname param, clean up map searching code
2018-01-04 20:15:44 +00:00
Alam Ed Arias
0a7dc63093
Use playersprite_t
2018-01-04 14:49:26 -05:00
Alam Ed Arias
b22ef1a85d
Merge branch 'public_next' into private
2018-01-04 14:32:27 -05:00
Alam Ed Arias
7c3c09b95d
SDL: disable check for noreturn
2018-01-04 14:29:29 -05:00
Alam Ed Arias
7b86c598fc
Undo signed mess
2018-01-04 14:26:16 -05:00
Monster Iestyn
07062d09c3
clarify this comment a little better
2018-01-04 15:17:32 +00:00
Monster Iestyn
e3df63feb5
clean up CM_LZF code in W_ReadLumpHeaderPwad
2018-01-04 15:14:53 +00: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
Matthew Marsalko
460733ce34
Add triple laser
2018-01-02 11:34:13 -08:00
Matthew Marsalko
cd4a0c7c41
Remove unncessary extra boss frames
2018-01-02 11:33:13 -08:00
Monster Iestyn
afaf841280
Merge branch 'master' into file-loading-cleanup
2018-01-02 18:46:02 +00:00
Monster Iestyn
3bfbcb8e5d
Merge branch 'master' into hardcoding-time-again
2018-01-02 18:36:42 +00:00
Alam Ed Arias
af76943926
MSVC2015: fixup
2018-01-02 13:22:10 -05:00
TehRealSalt
5db53c519f
Minimum wall bump speed copied from K_KartBouncing
2018-01-02 13:06:49 -05:00
Monster Iestyn
728d27f2d5
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
# src/win32/win_vid.c
2018-01-02 17:32:24 +00: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
Matthew Marsalko
c92926bfb6
Add support for overriding the ESC key
2017-12-24 23:09:06 -08: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
