aa5878d6df
Used config for soundsystem properties.
2016-02-08 16:40:13 +01:00
9da1419895
Merge remote-tracking branch 'origin/master' into Sound
2016-02-08 14:24:44 +01:00
3a5c0a2762
SoundSystem does not longer inherit from SoundManager. SoundManager is a individual class that listens to events. The SoundManager only listens to the local player.
2016-02-08 14:01:32 +01:00
12c05d5a1c
Added an Queue event for sound emitters.
2016-02-08 13:59:35 +01:00
5987751add
Merge pull request #81 from teamfisk/HealthPickup
...
Health pickup
2016-02-08 11:50:47 +01:00
Jace
70f8237a16
Merge pull request #60 from teamfisk/3rdPersonDeathCam
...
3rd person death cam
2016-02-08 11:39:57 +01:00
Jace
35b0193f15
Merge pull request #72 from teamfisk/BoxModelCollision
...
Collision in test phase
2016-02-08 10:29:41 +01:00
f8e514d21e
Merge remote-tracking branch 'origin/master' into HealthPickup
2016-02-08 10:22:35 +01:00
fad25c6e16
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
...
# Conflicts:
# include/Engine/Core/EPlayerHealthPickup.h
2016-02-08 10:21:30 +01:00
4103c878ec
Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned
2016-02-05 18:05:46 +01:00
becb197feb
Player walk is now based on distance traveled, and it is also reset when key is released. However when dashing the player step sound is still played. The distance of a step is also hard coded in the header file. Will config it up some day.
2016-02-05 17:46:27 +01:00
454eef8225
WIP. Improving player walk logic.
2016-02-05 17:21:48 +01:00
fbdaf92953
Started refactoring. Put player walk logic in a designated sound system.
2016-02-05 16:39:23 +01:00
be628d9406
Merge remote-tracking branch 'origin/master' into HealthPickup
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-05 16:23:22 +01:00
2542397511
Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.
2016-02-05 15:35:51 +01:00
fe6fd0bbe3
PickupSpawnSystem now spawns a new HealthPickup after the respawnTimer is up. Added HealthPickup.xml entity. Event PickupSpawned now gets published when a new HealthPickup spawns. Player now gains health as he picks up the HealthPickup.
2016-02-05 15:15:04 +01:00
e3a44d37d2
Merge branch 'master' into BoxModelCollision
...
# Conflicts:
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-05 14:59:14 +01:00
e90f802d48
Merge remote-tracking branch 'origin/master' into Sound
2016-02-05 13:59:21 +01:00
d61e605093
Can walk up "stair-steps". Cleanup WIP.
...
Better performance in RectanglevsTriangle check.
Added IsOnGround flag and VerticalStepHeight in Physics.
Lotsa commented code saved for historical reasons, remove later.
2016-02-05 10:56:34 +01:00
71a86cab11
removed event that's not being used
2016-02-05 10:07:56 +01:00
6a23a987b3
Started PickupSpawnSystem, added 2 events and a system
2016-02-04 17:43:45 +01:00
d50caa1763
Gain events tested. works as intended
2016-02-04 16:14:50 +01:00
Jace
ff26e1235c
Merge pull request #77 from teamfisk/AMDCrashFix
...
AMD crash fix???????????
2016-02-04 12:05:05 +01:00
Jace
c87e4d4fd6
Added mutex to resource manager cache reading to avoid a potential race condition. We hope this is the actual bug we saw.
2016-02-04 11:53:11 +01:00
d4292d4b43
Merge pull request #63 from teamfisk/AssaultDash
...
Added AssaultDash
2016-02-04 11:50:00 +01:00
035c79564b
Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash.
2016-02-04 11:41:21 +01:00
0a8ee1623f
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# assets
2016-02-04 10:47:30 +01:00
03a16b46b5
Dash component now has the dash-maxCoolDownVariable in it.
2016-02-04 10:28:28 +01:00
1bd4aa91ff
Oops! Readded "Sprint" command. Removed some unnecessary variables in FirstPersonInputController. Fixed bug where you couldnt dash right away as the game started.
2016-02-03 17:45:37 +01:00
7b5a2a5388
Dashing now works great both with shift and doubletap. Added Dash Component. Changed default Player.xml to have a Dash Component. Disabled Sprint. You can now disable DoubleTapToDash in Input.Ini. Added command "SpecialAbility".
2016-02-03 17:30:46 +01:00
2e3e59a1e2
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# resources/Schema/Entities/Player.xml
2016-02-03 16:52:33 +01:00
Jace
bd2da7bc9f
Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""
...
This reverts commit b56824786c
2016-02-03 16:30:00 +01:00
Jace
b56824786c
Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping"
...
This reverts commit 192de8078224aac6a00d
2016-02-03 16:16:06 +01:00
938caa6ba2
Now uses OnComponentAttached event. Can now queue sound on a source.
2016-02-03 15:48:25 +01:00
13161b4f57
Merge remote-tracking branch 'origin/master' into AssaultDash
2016-02-03 15:07:19 +01:00
9d3171540d
AssaultDashCheck is now in FirstPersonInputController instead. TODO: config option, shift button, forward/backward dash
2016-02-03 11:54:14 +01:00
39653a1e4c
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-03 10:38:21 +01:00
Jace
2cbeef4c69
Merge pull request #74 from teamfisk/Warnings-Jocke
...
Fixed warnings associated with Network
2016-02-03 10:37:10 +01:00
a64d227cab
Assured the volume channels were working. Playing around with drumloop
2016-02-03 10:17:53 +01:00
5e472cd69c
DeathExplosion is now an XML file, changed PlayerDeathSystem accordingly. The effect should show as soon as the explosioneffect-fix is merged into master. TODO: remove the test
2016-02-02 17:18:12 +01:00
55854f5c0d
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 16:30:57 +01:00
7236da09b4
Merge remote-tracking branch 'origin/master' into 3rdPersonDeathCam
2016-02-02 15:13:00 +01:00
45a92b362f
DoubleJumping now in InputController instead.
2016-02-02 15:10:11 +01:00
d763789490
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# src/Engine/Sound/SoundSystem.cpp
2016-02-02 13:38:49 +01:00
6a3f585fb9
Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.
...
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
2016-02-02 13:26:15 +01:00
cb0feb0b84
Tested hurt event. Randomizes between several different ones.
2016-02-02 13:25:25 +01:00
7b4826cb44
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 13:24:31 +01:00
Jace
0e5f6da9a9
Merge pull request #73 from teamfisk/CapturePointFixBranch
...
Several changes/fixes based on the latest broken refactoring in master
2016-02-02 13:22:03 +01:00
42b52a6766
Several changes/fixes based on the latest broken refactoring.
...
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
2016-02-02 11:37:22 +01:00
796e3eac79
Merge branch 'master' into BoxModelCollision
2016-02-02 10:16:48 +01:00
stiffly
William Moberg
Jace
verysecrethero
Tleety
Jocke