8a676d8aa4
Added movebob removed viewheight
...
"movebob" lets you determine the strength of movement bobbing (does not
affect landing delta, that's technically not movement bobbing :p),
values range from 0.0 to 4.0. viewheight is now relative to
player->height.
2017-10-14 16:11:08 -04:00
f31cdf395a
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff
...
# Conflicts:
# src/p_user.c
2017-09-30 22:29:16 -04:00
de4ea022c0
Merge branch 'public_next'
2017-09-29 17:23:47 +01:00
ea372fae53
Merge branch 'master' into next
2017-09-29 17:15:57 +01:00
f0eee4737f
Menu: no more pop/push options
2017-09-28 17:45:27 -04:00
3e26e2a443
Menu: Compile M_DrawAddons without any optimizes
2017-09-28 17:38:14 -04: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
2629301947
Merge branch 'public_next' into master
2017-09-28 17:29:02 -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
1be137f461
cleanup
2017-09-28 11:10:24 -04:00
3a2a6076b3
Merge branch 'public_next' into master
2017-09-28 11:09:48 -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
5986720789
Build: fixups
2017-09-28 11:01:52 -04:00
f1a347e55f
Merge branch 'public_next' into master
2017-09-28 11:01:20 -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
fcc1554467
Play bubble breathe sound for bots
2017-09-24 13:43:36 -04:00
09c3c58575
Obligatory "fixing a very tiny and very stupid mistake" commit :p
2017-09-21 17:38:42 -04:00
6b448f72ee
A_GhostMe lets you change fuse with var1, fixed the walking-spin frames bug For Real This Time
2017-09-21 17:34:53 -04:00
d55f84bec0
Camera scaling to splitscreen mode
...
Stacks with analog's camera buff. The camera height of both are also now
proportional with their dist
2017-09-21 16:43:55 -04:00
62264901e5
Merge branch 'master' into next
2017-09-20 17:18:58 -04:00
cfce6650ca
Fix holding spin while landing putting you in your walking state, remove commented out stuff
2017-09-20 16:53:05 -04:00
7c7bf243a2
Okay, nope, still nothing; reverting
2017-09-20 16:20:30 -04:00
4e7b817945
Does THIS fix the conflicts??
2017-09-20 16:14:00 -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
6a0f50cdf5
Resolve conflicts
2017-09-19 17:27:13 -04:00
4a51d4bee0
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff
...
# Conflicts:
# src/g_game.h
2017-09-19 17:07:09 -04:00
ca42659e03
Made a mistake in the directionchar branch. I'm pushing to master - naughty naughty - but nobody's around to stop me and it's my birthday c:
2017-09-19 14:22:17 +01:00
48c0ef2362
Remove extraneous DEH_WriteUndoline's.
2017-09-19 13:21:48 +01:00
3cc14e3985
Merge branch 'directionchar' into 'master'
...
Autobrake & decoupling player sprite angle from camera angle
See merge request !69
2017-09-19 07:56:22 -04:00
ecfeb7b0af
Merge branch 'spr2fixes' into 'master'
...
Sprite2 MD2s and customisable defaulting
See merge request !115
2017-09-19 07:49:04 -04:00
6d03c50966
Merge branch 'continue_startinglives' into 'master'
...
Save cards and continue startinglives-balancing
See merge request !114
2017-09-19 07:45:35 -04:00
b805380294
Merge branch 'titlemap' into 'master'
...
Titlemap
See merge request !97
2017-09-19 07:44:00 -04:00
c389328789
Merge branch 'mi-misc-whatever' into 'master'
...
MI misc whatever
See merge request !111
2017-09-19 07:40:29 -04:00
da82a6bb56
Replaced instances of "joystick" with "gamepad" in menus
2017-09-19 00:33:53 -04:00
d1e379f4f9
Whoops, forgot P2
2017-09-19 00:30:08 -04:00
e020352c0c
Fixed diagonal analog input being weakened
...
Using a keyboard and an analog stick should now give you similar
acceleration in all directions.
2017-09-19 00:26:05 -04:00
TehRealSalt