 verysecrethero
|
64610e3c03
|
Fixed so some of the tests are working again. Also removed the test errors
|
2016-02-18 11:27:07 +01:00 |
|
 William Moberg
|
581a7b470c
|
Merge pull request #94 from teamfisk/AndersTest
Added 3 PickupSpawnSystem test
|
2016-02-18 10:21:37 +01:00 |
|
 Jace
|
d1213f9f59
|
Working damage dealing, a super cool reload effect and hit markers!
|
2016-02-11 22:50:44 +01:00 |
|
|
verysecrethero
|
02cd822cf1
|
Tiny test refactoring
|
2016-02-10 17:04:05 +01:00 |
|
|
verysecrethero
|
f7756ff60f
|
Tiny refactoring of PickupSpawnTest. Updated and fixed HealthSystemTest.
|
2016-02-10 16:51:00 +01:00 |
|
|
verysecrethero
|
2542397511
|
Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.
|
2016-02-05 15:35:51 +01:00 |
|
 antc13
|
4c5d17b203
|
Merge remote-tracking branch 'origin/master' into Importer
# Conflicts:
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
# src/Tests/ResourceManagerTest.cpp
|
2016-01-24 14:40:52 +01:00 |
|
|
antc13
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
verysecrethero
|
deb6ff1b16
|
Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)
|
2016-01-21 17:36:47 +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 |
|
|
antc13
|
386e76f642
|
Puyshing
|
2016-01-20 09:49:54 +01:00 |
|
|
verysecrethero
|
b45de542da
|
CapturePointSystem updated, all tests are green
|
2016-01-19 17:19:58 +01:00 |
|
|
verysecrethero
|
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 |
|
|
Jace
|
51979d7f0c
|
Changed System to take World through constructor and store it instead, cause it makes more sense.
|
2016-01-18 23:59:33 +01:00 |
|
|
verysecrethero
|
4b672b11e7
|
EquippedItem,Ammo got changed to int instead of double. Loading entities from map the new way in Tests. ComponentWrapper:s Name is now Type
|
2016-01-13 15:58:52 +01:00 |
|
|
William Moberg
|
ef9ce7932a
|
New small fix.
|
2016-01-07 17:40:47 +01:00 |
|
|
verysecrethero
|
a1ed79dfbf
|
HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes
|
2016-01-07 14:53:31 +01:00 |
|