 verysecrethero
|
592776e783
|
Fixed so the PlayerDeath event doesn't get spammed while the player is dead. Also made sure that any remaining healthDeltas are cleared when dead.
|
2016-01-08 11:37:51 +01:00 |
|
|
verysecrethero
|
ff44dccb33
|
Merge pull request #23 from teamfisk/OrderedSystemPipeline
Ordered system pipeline approved
|
2016-01-08 10:32:58 +01:00 |
|
 William Moberg
|
ef9ce7932a
|
New small fix.
|
2016-01-07 17:40:47 +01:00 |
|
 stiffly
|
da6e50dc7e
|
Correct orientation. Need to clean this up.
|
2016-01-07 17:04:43 +01:00 |
|
|
William Moberg
|
beb0967c3b
|
Merge branch 'master' into OrderedSystemPipeline
# Conflicts:
# src/Game/Game.cpp
|
2016-01-07 16:49:20 +01:00 |
|
|
verysecrethero
|
0e0a361a38
|
HotFix: Updated the CMakeList.txt in src/Game so it has the HealthSystem.cpp. This is needed otherwise the solution cant find that file
|
2016-01-07 16:36:18 +01:00 |
|
|
William Moberg
|
6ebc4fc784
|
Merge pull request #22 from teamfisk/HealthSystem
Health system
|
2016-01-07 16:17:17 +01:00 |
|
|
William Moberg
|
7fb71f17b2
|
Destruct all systems properly in the pipeline.
|
2016-01-07 16:13:52 +01:00 |
|
|
stiffly
|
2838446072
|
In lack of camera entity I created a Listener cube to test 3D sound. Works fine. Updates listener pos each tick.
|
2016-01-07 16:03:33 +01:00 |
|
|
verysecrethero
|
e52c0c9633
|
Now using the easier/cleaner way of getting/setting the HealthProperties
|
2016-01-07 15:27:39 +01:00 |
|
|
stiffly
|
d8c4c6e5ff
|
Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet.
|
2016-01-07 15:22:46 +01:00 |
|
|
verysecrethero
|
578ca13f79
|
Merge remote-tracking branch 'origin/master' into HealthSystem
|
2016-01-07 15:19:32 +01:00 |
|
|
William Moberg
|
4048ce6bd4
|
Small fix.
|
2016-01-07 15:18:35 +01:00 |
|
|
William Moberg
|
c4642cc530
|
Merge branch 'master' into OrderedSystemPipeline
# Conflicts:
# include/Engine/Core/SystemPipeline.h
|
2016-01-07 15:07:16 +01:00 |
|
|
William Moberg
|
32ebc061b4
|
Merge pull request #21 from teamfisk/AndersTest
Pull request approved.
|
2016-01-07 14:57:12 +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 |
|
|
verysecrethero
|
638c236ceb
|
HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass
|
2016-01-07 14:53:31 +01:00 |
|
|
verysecrethero
|
f67f22c82d
|
Added Healthrelated events and start of HealthSystem, also reverted the crash "fix"
|
2016-01-07 14:53:31 +01:00 |
|
|
verysecrethero
|
f3ff433bf7
|
Merge remote-tracking branch 'origin/master' into AndersTest
|
2016-01-07 14:51:08 +01:00 |
|
|
verysecrethero
|
85ff86a2fe
|
Revert "Exit Crash has been dealt with. There is no need to unsubscribe game since m_ContextRelays has already been destroyed at that point"
This reverts commit 0ae6c42df8.
|
2016-01-07 14:50:13 +01:00 |
|
|
William Moberg
|
fa8775a72e
|
Renamed vars and added some comments.
|
2016-01-07 10:28:18 +01:00 |
|
 Jace
|
49884d7e60
|
Fix for crash when unsubscription during event processing (untested)
|
2016-01-06 13:47:02 +01:00 |
|
|
stiffly
|
7ae42a5bf7
|
Removed some comments. Basically did nothing
|
2016-01-06 11:39:32 +01:00 |
|
 Tleety
|
e7bb8954bf
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/Renderer.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/Renderer.cpp
|
2016-01-06 11:35:55 +01:00 |
|
|
Tleety
|
e510f2b88c
|
Forward plus render pass now removed from Renderer.cpp to it's own class.
|
2016-01-06 11:32:42 +01:00 |
|
|
Jace
|
34cbbb3eb1
|
Fixed exit crash(es)
|
2016-01-06 11:20:16 +01:00 |
|
|
verysecrethero
|
0ae6c42df8
|
Exit Crash has been dealt with. There is no need to unsubscribe game since m_ContextRelays has already been destroyed at that point
|
2016-01-05 15:22:16 +01:00 |
|
|
verysecrethero
|
3678cceb1c
|
Merge remote-tracking branch 'origin/master' into AndersTest
|
2016-01-05 14:48:16 +01:00 |
|
 FakeShemp
|
eb5fca898f
|
Fix small bug with push_back order
Commited directly from GitHub. Blame it if something explodes.
|
2015-12-21 12:55:25 +01:00 |
|
 antc13
|
c9db46564f
|
Spitting out files WIP
|
2015-12-18 16:21:07 +01:00 |
|
|
William Moberg
|
de8461e257
|
SystemPipeline should update systems in order depending on input update priority in AddSystem.
|
2015-12-18 15:33:25 +01:00 |
|
 viktorljung
|
bd82f75dd0
|
Some merge fixes, needs more work
|
2015-12-18 15:28:44 +01:00 |
|
|
Tleety
|
eb69e03e82
|
Merge branch 'Forward+' of github.com:teamfisk/TacticalZ into Forward+
|
2015-12-18 15:28:25 +01:00 |
|
|
Tleety
|
d38f58165f
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderState.cpp
# src/Engine/Rendering/Renderer.cpp
|
2015-12-18 15:27:47 +01:00 |
|
 Viktor Ljung
|
c133223bac
|
Merge pull request #19 from teamfisk/Networking
Networking
|
2015-12-18 14:54:11 +01:00 |
|
|
verysecrethero
|
2f6d4fcd0b
|
Adjusted some of the corefiles back to the original in preparation for the Pull Request
|
2015-12-18 14:49:35 +01:00 |
|
|
Tleety
|
069a6756b9
|
LightcullingPass for forward+ is now separate from Renderer.cpp.
|
2015-12-18 14:31:16 +01:00 |
|
|
stiffly
|
a550b6077e
|
Re-enabled InputCommand debugging info in console
|
2015-12-18 14:25:55 +01:00 |
|
|
verysecrethero
|
e0cc25dbac
|
Fixed the OctTreeTestGameClass.cpp so it draws the OctTree nicely again
|
2015-12-18 14:22:57 +01:00 |
|
|
stiffly
|
00bc55370d
|
Added error check in Collision.cpp
|
2015-12-18 14:19:28 +01:00 |
|
|
stiffly
|
330f08b926
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
|
2015-12-18 14:18:53 +01:00 |
|
|
stiffly
|
a0255f1b31
|
Now uses config file to determine if client or server should be started.
|
2015-12-18 13:34:21 +01:00 |
|
|
viktorljung
|
ef4cbfece8
|
Added PointLight Component in XML files
|
2015-12-18 13:20:55 +01:00 |
|
|
Tleety
|
ab6af30a28
|
Base classes for decoupled forward+ renderer and a fix where if you had to many lights in a tile(200-300+) the list would fill up before the end of frustums.
|
2015-12-18 12:02:02 +01:00 |
|
|
stiffly
|
a858dab8b6
|
Network not longer threaded
|
2015-12-18 12:00:14 +01:00 |
|
|
verysecrethero
|
b1ae96f737
|
Merge remote-tracking branch 'origin/master' into AndersTest
# Conflicts:
# include/Game/Game.h
# src/Engine/Core/OctTree.cpp
# src/Game/Game.cpp
# src/Tests/CMakeLists.txt
# src/Tests/OctTreeTest.cpp
# src/Tests/WorldTest.cpp
|
2015-12-18 11:57:21 +01:00 |
|
|
Jace
|
7dcd75fccc
|
Merge pull request #18 from teamfisk/OctTree
CollisionSystem, TriggerSystem and Octree
|
2015-12-18 11:42:44 +01:00 |
|
|
verysecrethero
|
1e5e24a036
|
The tests seems to work under boost 1.59 but test explorer window is broken in 1.60. also changed ResourceManagerTest.cpp
|
2015-12-18 11:37:02 +01:00 |
|
|
viktorljung
|
3636ad45af
|
Changed to correct branch
|
2015-12-18 11:29:11 +01:00 |
|
|
stiffly
|
6d649e4d35
|
Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
# src/Engine/Network/Client.cpp
|
2015-12-18 11:26:48 +01:00 |
|