c2128790af
Now using appropriate variable to see if a player is on ground. Does not check if playervel.y == 0 which will be false if a player is on a obstacle.
2016-02-10 14:07:11 +01:00
b6b96c5f11
Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon as the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump on rocks (where velocity wasnt 0.0)
2016-02-10 11:51:58 +01:00
f6a7b8ea0c
Merge remote-tracking branch 'origin/master' into Sound
2016-02-10 11:37:17 +01:00
3d2f9fa79d
Drum sounds does not start every single time a TriggerTouch happens. Specific and temporary logic for play test.
2016-02-10 11:36:54 +01:00
49e6252ee1
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-02-10 11:33:45 +01:00
94ff12cf66
When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter.
2016-02-10 11:15:49 +01:00
Jace
067780c93f
Merge pull request #83 from teamfisk/DefenderShield
...
Defender shield
2016-02-10 10:33:36 +01:00
Jace
90192e016a
Merge pull request #82 from teamfisk/BoxModelCollision
...
Small fixes to collision/trigger-boxes, etc.
2016-02-10 10:08:54 +01:00
Jace
5cea3bed3a
Work in progress weapon system
2016-02-09 23:27:04 +01:00
c09c2f4783
Merge remote-tracking branch 'origin/Importer' into Animations
...
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/RenderingWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Skeleton.cpp
2016-02-09 22:50:19 +01:00
7212217460
Added animation blending and offset animation component
2016-02-09 22:15:43 +01:00
Jace
d83190290f
Server now broadcasts certain input commands to all other clients (for stuff like shooting)
2016-02-09 19:37:42 +01:00
Jace
d5647ce89c
Working 1-snapshot interpolation
2016-02-09 19:36:22 +01:00
e9f5a3d263
Renamed some files from temporary filenames to DamageIndicator filenames
2016-02-09 16:28:43 +01:00
8bdf87da12
Some cleanup of the code
2016-02-09 16:15:19 +01:00
232bf66a09
Jump height is constant for the double jump.
2016-02-09 16:09:08 +01:00
Jace
e69864680d
PlayerMovementSystem now only updates the velocity of the local player, as it should
2016-02-09 16:08:06 +01:00
971fee4a0c
DamageIndicatorSystem code looking good. Test working well. Sprite display fixed by Viktor
2016-02-09 15:38:21 +01:00
Jace
d3bc48f5f7
Major networking refactoring to allow for snapshot filtering outside of netcode
2016-02-09 13:22:21 +01:00
0e9fb16399
Work started on DamageIndicatorSystem. Made some initial tests and test calculations
2016-02-08 17:58:07 +01:00
aa5878d6df
Used config for soundsystem properties.
2016-02-08 16:40:13 +01:00
7752832ce5
No longer needs this walk logic in SoundSystem
2016-02-08 16:21:49 +01:00
6f163bf3a3
Fixed bug where it crashed on respawn. Also bug where i subscribed to an event twice.
2016-02-08 16:13:09 +01:00
14c5410524
Merge fix
2016-02-08 14:29:55 +01:00
9da1419895
Merge remote-tracking branch 'origin/master' into Sound
2016-02-08 14:24:44 +01:00
8e86cc2123
Walking sound logic moved to PlayerMovementSystem and makes use of "wishDirection" to alleviate the problem where m_DistanceMoved were reset when it was not supposed to.
2016-02-08 14:23:53 +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
Jace
2b4e00e4b0
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
2016-02-08 13:33:55 +01:00
971beb29d8
Merge remote-tracking branch 'origin/master' into DefenderShield
...
# Conflicts:
# resources/Schema/Components.xsd
2016-02-08 12:30:41 +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
99cbdd3c1e
Player death effect fixes
2016-02-08 11:39:29 +01:00
ce22854168
HealthPickups are now based on a percentage of player maxhealth. You can no longer pickup healthpacks if you are at max health. You can no longer gain more than maxHealth.
2016-02-08 11:22:28 +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
4bf91ba56a
Merge remote-tracking branch 'origin/master' into AssaultBoost
...
# Conflicts:
# resources/Schema/Components.xsd
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-08 10:12:13 +01:00
4103c878ec
Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned
2016-02-05 18:05:46 +01:00
09fb3a6571
Added some comments.
2016-02-05 18:04:36 +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
66f442f1af
Added HealthGain to HealthPickup component. Changed PickupSpawnSystem so it copies the values from the old to the new entity.
2016-02-05 16:13:59 +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
6a23a987b3
Started PickupSpawnSystem, added 2 events and a system
2016-02-04 17:43:45 +01:00
stiffly
verysecrethero
viktorljung
Jace
William Moberg
Tleety