e770f82ad7
Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back
2017-10-17 16:36:29 -04:00
a0d488402c
Didn't fix the y_inter.c conflicts correctly
2017-10-17 16:23:38 -04:00
5fe2f4928f
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
...
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
2017-10-17 15:53:34 -04:00
cce7b4374a
Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back
2017-10-17 00:45:30 -04:00
727d55b64e
Merge remote-tracking branch 'refs/remotes/srb2public/public_flatsprite' into zarrotsu
...
# Conflicts:
# src/doomdef.h
2017-10-17 00:40:38 -04:00
9c0437bcd1
Thought I heard something about camera changing, it hasn't, so I decided to port work I did for internal
...
Basically:
1.) farther camera defaults
2.) different camera settings save
3.) cam_dist automatically increases with splitscreen (& analog mode,
but that's irrelevant for kart :p)
(IIRC someone said that this branch is fine to commit directly to,
please feel free to revert immediately if this isn't the case :V)
2017-10-16 23:52:13 -04:00
4ed0511013
Some cleanup
...
No longer save score/rings, use the Race tally as a placeholder
replacement for the butchered vanilla one
2017-10-16 20:23:26 -04:00
b5e0a80c35
Oho, here's the problem!
...
Too many fixed_t!
2017-10-16 17:52:42 -04:00
3e74ac2b97
Ghost scale fix
2017-10-16 07:11:48 -04:00
540bea911a
First, minor steps to Record Attack support
...
To-Do:
- fix demo desync (desync is only super noticeable on slopes, but a
message pops up when the player starts moving regardless)
- fix ghosts not appearing
- replace that dumb level tally
- remove a bunch of things that made the assumption that race & record
attack would never mix (ex: "next map x doesn't support race mode, using
map y anyway" message)
2017-10-15 02:33:28 -04:00
ba7580d8e2
= Nerfed Megas across the board.
...
- Rarer
- Speed reduced from +25% to +20%
- Getting squished doesn't last as long
= Nerfed the Banana Meta - or at least changed it
- You don't wipeout for as long
- You don't lose as much speed from wiping out (1/2 instead of 1/4)
= Respawning after death is faster
- Lakitu drops you faster, only three floaty sounds instead of four
= Adjusted the camera to the values given by Sev
2017-10-13 15:44:17 -04:00
01126d1232
Actually run the fucking shadows this time
2017-10-11 21:31:17 -05:00
b27ab8f51b
oops
2017-10-11 21:14:14 -05:00
366fe9fa91
Add TD shadows to Kart
...
Disclaimer: I haven't tested this and therefore am not sure whether or not it actually works. I think it does. Probably.
2017-10-11 20:54:35 -05:00
faf886885e
Have Kart use kmd2.dat instead of md2.dat
2017-10-11 20:26:34 -05:00
7c71feb274
Fixed thrown items (99% sure)
...
Thrown items are thrown farther now; distance based on CC.
2017-10-11 10:49:14 -04:00
b95f1d568a
Updated item weights
...
Fix attempt for thrown items
2017-10-10 21:09:38 -04:00
96c014deeb
Merge branch 'master' into next
2017-10-07 12:44:28 -04:00
1b576bacf3
Build: support GCC 8
2017-09-30 23:07:47 -04:00
6fbdf37b18
Build: support building with clang 5.0
2017-09-30 08:54:17 -04:00
075c4e0956
Travis: clang 4.0 and 5.0 is not up for trusy
2017-09-29 17:57:03 -04:00
472c74907e
Travis: fix misspelling
2017-09-29 17:52:12 -04:00
03ba14640f
Travis: test building with clang 3.9, 4.0 and 5.0
2017-09-29 17:43:20 -04:00
ea372fae53
Merge branch 'master' into next
2017-09-29 17:15:57 +01:00
c90ddbca36
Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master'
...
Makefile ports tweaks cleanup etc
See merge request !211
2017-09-28 17:31:33 -04:00
6c18d15b4a
Merge branch 'master' into next
2017-09-28 16:55:04 -04:00
01602fa1f1
Build: fixup warnings in Debug builds
2017-09-28 16:54:26 -04:00
16b3f65660
Merge branch 'master' into next
2017-09-28 16:28:22 -04:00
92aa0e000e
Travis: can not use set version with sdl2
2017-09-28 16:24:22 -04:00
1ab0697fee
Merge branch 'master' into next
2017-09-28 16:09:07 -04:00
a356beac2c
Travis: install SDL2 2.0.6 and SDL2_Mixer 2.0.1
2017-09-28 15:31:34 -04:00
0eafaafca1
Travis: drop sdl2_mixer from MacPorts and use SDL 2.0.6
2017-09-28 13:49:57 -04:00
30a42c0d72
Merge branch 'master' into next
2017-09-28 11:07:35 -04:00
9adf5f811b
CircleCI: remove blank lines
2017-09-28 11:06:57 -04:00
ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
1ffdd2e945
Travis: still need to keep -Wno-tautological-compare for GCC 7
2017-09-28 10:15:10 -04:00
7f98c5c804
Build: do not error on fallthrough
2017-09-28 10:02:08 -04:00
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
55f377ba3d
Build: kill GCC 7's format-overflow warnings
2017-09-28 09:13:46 -04:00
bdba212b2a
Makefile: add support for GCC 7.1 and 7.2
2017-09-28 09:13:01 -04:00
7e23014d5f
Makefile: support GCC 6.4
2017-09-28 09:04:36 -04:00
62264901e5
Merge branch 'master' into next
2017-09-20 17:18:58 -04:00
829328637d
Merge branch 'netcode-fixes-the-sequel' into 'next'
...
Netcode fixes the sequel
See merge request !207
2017-09-20 15:00:09 -04:00
533fdcae0a
Merge branch 'custom-savegames-home-path-fix' into 'master'
...
Fix save games for a custom mod not saving to custom home folder
See merge request !209
2017-09-20 14:56:39 -04:00
7f875131ee
If compiling for GP2X with SDL, make it use SDL 1.2 interface like the others
...
Doing this way because I have no idea if the GP2X port was SUPPOSED to use SDL or not in the first place
2017-09-18 18:14:05 +01:00
2c73c1657f
Restored all missing objs/bin subfolders from the move to Git, held in place by .gitignores
2017-09-17 17:20:51 +01:00
b040113246
Removed the wrong endif by mistake
2017-09-16 20:59:35 +01:00
a33bb70a0c
Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12
...
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
2017-09-16 20:26:04 +01:00
dcb23e01c0
SDL_INIT_NOPARACHUTE does nothing in SDL 2.0, so don't use it anymore
2017-09-15 21:22:28 +01:00
5fb551dd75
Removed 1.2.x version checks in these files, SDL 2.0.x should always have these files
2017-09-15 17:15:06 +01:00
TehRealSalt