 Jace
|
47053285c8
|
Merge remote-tracking branch 'origin/Menu' into WeaponSystem
# Conflicts:
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
|
2016-02-12 02:30:38 +01:00 |
|
|
Jace
|
b9ea314232
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# resources/Schema/Entities/NewMap.xml
|
2016-02-12 02:11:11 +01:00 |
|
 viktorljung
|
6442254575
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# src/Game/Game.cpp
|
2016-02-12 02:09:14 +01:00 |
|
|
Jace
|
9f8b0f7aa9
|
Merge pull request #104 from teamfisk/AmmoPickup
Added AmmoPickupSystem with Component, Entity.
|
2016-02-12 02:08:29 +01:00 |
|
|
Jace
|
5295133311
|
Hack to sync ammo over network until we have input replaying + Reload effect from all views
|
2016-02-12 01:45:54 +01:00 |
|
 William Moberg
|
40ae2b8cbb
|
DefaultInput key 'K' to kill player, since we can't respawn when alive. Also moved TakeDamage InputCommand to HealthSystem.
|
2016-02-12 00:52:58 +01:00 |
|
|
William Moberg
|
11af6a3078
|
Merge branch 'master' into Respawning
# Conflicts:
# resources/DefaultConfig.ini
# resources/Schema/Entities/MovementTest.xml
# src/Game/Systems/SoundSystem.cpp
|
2016-02-12 00:29:51 +01:00 |
|
|
viktorljung
|
0370775820
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Schema/Entities/Player.xml
|
2016-02-12 00:28:24 +01:00 |
|
|
viktorljung
|
a36ed76a4e
|
AmmunitionHUDSystem now really working
|
2016-02-12 00:26:59 +01:00 |
|
 verysecrethero
|
af30e51564
|
Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William.
|
2016-02-11 23:56:40 +01:00 |
|
|
Jace
|
44a73ef883
|
fixup! Merge remote-tracking branch 'origin/master' into WeaponSystem
|
2016-02-11 23:44:20 +01:00 |
|
|
viktorljung
|
c1860ae383
|
AmmunitionHUD now working
|
2016-02-11 23:38:25 +01:00 |
|
|
Jace
|
7cae84d4ee
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# include/Engine/Core/EPlayerDamage.h
# src/Game/Game.cpp
# src/Game/Systems/Weapon/WeaponSystem.cpp
|
2016-02-11 22:52:51 +01:00 |
|
|
Jace
|
d1213f9f59
|
Working damage dealing, a super cool reload effect and hit markers!
|
2016-02-11 22:50:44 +01:00 |
|
 Tobias Dahl
|
5bcadd5b1a
|
Merge pull request #95 from teamfisk/CapturePointTake
Fixed CapturePointTimer,Color
|
2016-02-11 21:10:30 +01:00 |
|
|
verysecrethero
|
8f500965d4
|
Changed DamageIndicator.xml to not use a glowmap and not a depthsort.
|
2016-02-11 20:34:25 +01:00 |
|
|
Jace
|
e2a8605101
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
|
2016-02-11 17:25:37 +01:00 |
|
|
Jace
|
e47201ff61
|
First person shoot animations
|
2016-02-11 17:06:34 +01:00 |
|
|
verysecrethero
|
3301f66ad1
|
Merge remote-tracking branch 'origin/master' into DamageIndicator
# Conflicts:
# resources/Shaders/Sprite.vert.glsl
|
2016-02-11 16:36:48 +01:00 |
|
|
William Moberg
|
97b915f130
|
Merge branch 'master' into Respawning
# Conflicts:
# src/Game/Game.cpp
# src/Game/Systems/PlayerSpawnSystem.cpp
# src/Game/Systems/SoundSystem.cpp
|
2016-02-11 16:15:47 +01:00 |
|
|
verysecrethero
|
c9f815fd42
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
# Conflicts:
# src/Game/Systems/CapturePointSystem.cpp
|
2016-02-11 16:09:05 +01:00 |
|
|
William Moberg
|
8eea0c8395
|
WIP respawning.
|
2016-02-11 16:08:19 +01:00 |
|
|
verysecrethero
|
38a3e88999
|
Merge pull request #87 from teamfisk/DoubleJumpEffect
Spawned DoubleJumpHexagon as the player doublejumps
|
2016-02-11 16:00:09 +01:00 |
|
|
Tleety
|
6ba1e95da7
|
Fixed depth sorting for HUD elements.
|
2016-02-11 15:27:07 +01:00 |
|
|
verysecrethero
|
a8ab49f202
|
Merge remote-tracking branch 'origin/master' into DoubleJumpEffect
# Conflicts:
# include/Game/Systems/PlayerMovementSystem.h
|
2016-02-11 15:19:01 +01:00 |
|
|
Tleety
|
9f657ada4e
|
merge fixes
|
2016-02-11 14:52:52 +01:00 |
|
|
Tleety
|
f0ae365401
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# src/Engine/Rendering/Texture.cpp
# src/Game/Game.cpp
|
2016-02-11 14:43:30 +01:00 |
|
|
verysecrethero
|
f11bd24d53
|
Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture.
|
2016-02-11 11:46:34 +01:00 |
|
|
Jace
|
81943516a9
|
Protected inheritance, not even once.
|
2016-02-11 11:36:39 +01:00 |
|
|
Jace
|
9d9c6bdf1e
|
Third person animations and shoot effects base work
|
2016-02-11 00:08:50 +01:00 |
|
|
Tleety
|
447f41dbff
|
HUD for capture points now update with Capture point data.
|
2016-02-10 23:59:13 +01:00 |
|
|
Tleety
|
64a2354b24
|
WIP with CapturePointHUDSystem
|
2016-02-10 22:22:09 +01:00 |
|
|
Jace
|
2c0f66d9c7
|
Merge remote-tracking branch 'origin/master' into WeaponSystem
# Conflicts:
# include/Engine/Collision/FillFrustumOctreeSystem.h
# include/Engine/Core/Octree.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/DefaultInput.ini
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
|
2016-02-10 17:02:00 +01:00 |
|
|
Jace
|
d931660c56
|
WIP
|
2016-02-10 14:43:32 +01:00 |
|
|
verysecrethero
|
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 |
|
 stiffly
|
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 |
|
|
stiffly
|
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
|
5cea3bed3a
|
Work in progress weapon system
|
2016-02-09 23:27:04 +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 |
|
|
verysecrethero
|
8bdf87da12
|
Some cleanup of the code
|
2016-02-09 16:15:19 +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 |
|
|
verysecrethero
|
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 |
|
|
verysecrethero
|
0e9fb16399
|
Work started on DamageIndicatorSystem. Made some initial tests and test calculations
|
2016-02-08 17:58:07 +01:00 |
|
|
stiffly
|
aa5878d6df
|
Used config for soundsystem properties.
|
2016-02-08 16:40:13 +01:00 |
|
|
stiffly
|
7752832ce5
|
No longer needs this walk logic in SoundSystem
|
2016-02-08 16:21:49 +01:00 |
|
|
stiffly
|
9da1419895
|
Merge remote-tracking branch 'origin/master' into Sound
|
2016-02-08 14:24:44 +01:00 |
|
|
stiffly
|
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 |
|
|
stiffly
|
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 |
|