5987751add
Merge pull request #81 from teamfisk/HealthPickup
...
Health pickup
2016-02-08 11:50:47 +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
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
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
Jace
ff26e1235c
Merge pull request #77 from teamfisk/AMDCrashFix
...
AMD crash fix???????????
2016-02-04 12:05:05 +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
03a16b46b5
Dash component now has the dash-maxCoolDownVariable in it.
2016-02-04 10:28:28 +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
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
55854f5c0d
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
2016-02-02 16:30:57 +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
3cfbbbbf54
CollisionSystem now utilizes Octree for collision detection.
2016-02-01 16:13:48 +01:00
8bcafc1151
WIP
2016-01-27 18:07:05 +01:00
0e70dc6fa3
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 15:41:31 +01:00
44302bb0f3
Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component
2016-01-27 15:38:54 +01:00
Jace
181017313d
Made entity parser give more useful errors and fixed the errors that were while I was at it
2016-01-27 15:16:59 +01:00
Jace
dec2234019
Merge branch 'Cleanup'
...
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 13:44:15 +01:00
cbb17d22d4
WIP
2016-01-27 12:10:00 +01:00
Jace
8bed5194d8
"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective
2016-01-27 11:36:24 +01:00
Jace
7e12d00874
Merge branch 'master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
2016-01-27 10:43:23 +01:00
Jace
4245264029
Weapon RayZ
...
Weapon RayZ
2016-01-25 11:26:33 +01:00
44baa47bba
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Common.h
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/Renderer.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-25 01:21:15 +01:00
Jace
b95c1fdfa4
Merge remote-tracking branch 'origin/Menu'
...
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/RenderingWorld.xml
# src/Game/Game.cpp
2016-01-25 00:25:03 +01:00
ada1bac2a7
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
dd80323342
Merge remote-tracking branch 'origin/master' into Animations
2016-01-24 17:06:34 +01:00
af2f017cb4
AnimationSystem base WIP
2016-01-24 17:05:34 +01:00
Jace
666ef6589e
Crouching!
2016-01-23 15:06:47 +01:00
680a12d88f
HealthMeter
2016-01-23 14:53:17 +01:00
9a23d8887a
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-23 11:48:10 +01:00
Jace
90867b094a
Merge remote-tracking branch 'origin/TextRendering' into Networking
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-22 22:08:56 +01:00
46dff1a59c
Merge remote-tracking branch 'origin/master' into Menu
...
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-22 17:02:56 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
Jace
a6548a72b3
Merge remote-tracking branch 'origin/master' into EditorUsefulness
...
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
2016-01-21 16:16:35 +01:00
ea9c4d19d0
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Game/Game.h
2016-01-21 10:19:32 +01:00
Jace
f1a54a89b3
Merge pull request #37 from teamfisk/OctTree
...
Oct tree
2016-01-21 09:57:46 +01:00
f6ce98249e
Merge remote-tracking branch 'origin/master' into CapturePointTake
2016-01-20 16:32:14 +01:00
8189e3c00c
Logic in CapturePointSystem is working again. Need to update all Tests!
2016-01-20 14:59:18 +01:00
ce27b224df
Merge remote-tracking branch 'origin/master' into TextRendering
...
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderSystem.cpp
2016-01-19 17:27:09 +01:00
f0763bc2a3
Font loading crash fixed
2016-01-19 17:18:18 +01:00
f197993beb
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
2016-01-19 15:31:15 +01:00
982837052a
DirectionalLight now correctly getting directions
2016-01-19 14:44:17 +01:00
William Moberg
verysecrethero
Jace
Tleety
stiffly
viktorljung