BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,611 Commits 116 Branches 0 Tags
1deb506fb2ddc6dfd6d64a39c2fc855f4edf922e
Commit Graph

1611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Moberg 81034420a9 Put back old version of OctTree for testing, made unit tests. 
Tests shows the old version checks for collisions etc. faster, new version adds objects into tree faster, and doesn't give duplicated results.
 2015-12-11 16:04:30 +01:00
stiffly 15442c8c75 Merge branch 'PlayerSystem' into Networking 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-11 15:45:27 +01:00
stiffly 3da69c8a1b Fixed indentation 2015-12-11 15:29:57 +01:00
stiffly 16d636a87c Removed Initialize function for systems. 2015-12-11 15:23:56 +01:00
stiffly 4da33ff4ec Fixed movement on a "player" cube. Very simple system atm 2015-12-11 15:00:57 +01:00
stiffly c2435fda2d Added Component to Components.xsd and Entity.xsd 2015-12-11 14:27:54 +01:00
Tleety 433331e752 DrawPass now moved to it's own class to make renderer cleaner. 2015-12-11 14:22:54 +01:00
stiffly 094c7fbb44 Added system to CMakeLists.txt. 2015-12-11 14:20:36 +01:00
stiffly 0b60979c7b Added a Initialize function for systems. 2015-12-11 14:03:00 +01:00
Tleety 2366cd3520 Merge remote-tracking branch 'origin/master' into RendererDecoupling 2015-12-11 13:52:41 +01:00
Tleety 725a8896ce PickingPass now publishes an event that others can listen to to get pickingdata. 2015-12-11 13:51:08 +01:00
verysecrethero 350038057d Misc OctTreeTest changes 2015-12-11 13:51:07 +01:00
stiffly 80f028edf2 Added a very basic PlayerSystem, and a PlayerComponent. 2015-12-11 13:45:19 +01:00
Jocke 23c3f0709b Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 2015-12-11 11:59:22 +01:00
Jocke 01d7388f91 Reactored the package loss logic. 
Server cannot handle multiple clients yet.
Fixed WorldTest code by adding astrix.
 2015-12-11 11:55:23 +01:00
viktorljung 8f007f6daf Added Freetype 2.62 config and option files 2015-12-11 11:26:41 +01:00
Tleety 8c563a2d76 Merge remote-tracking branch 'origin/Picking' into RendererDecoupling 
# Conflicts:
#	include/Engine/Rendering/Renderer.h
#	src/Engine/Rendering/Renderer.cpp
 2015-12-11 11:21:58 +01:00
Tleety 91edab34bc PickingPass now sets state and clear it when done. 
PickingState now it's own class so renderer is a bit cleaner.
 2015-12-11 11:18:30 +01:00
viktorljung 4c2ce3882e Added fonts folder and font 2015-12-11 11:07:22 +01:00
viktorljung 7b6902eafe Merge remote-tracking branch 'origin/master' into TextRendering 2015-12-11 10:55:10 +01:00
viktorljung 46854a63dd Text rendering includes 2015-12-11 10:54:52 +01:00
verysecrethero 1ceea91f4a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	include/Engine/Core/OctTree.h
#	src/Engine/Core/OctTree.cpp
 2015-12-10 18:02:03 +01:00
William Moberg 4195baa5dc ContainedObject in OctTree made private. 2015-12-10 17:57:09 +01:00
William Moberg 37f9ab2322 Quick fix for unit test compilation. 2015-12-10 17:53:33 +01:00
verysecrethero d8b1f4e514 ConfigFileTest attempt to explore the memleaks further 2015-12-10 17:46:17 +01:00
stiffly 6a3335315a Merge branch 'master' into Networking 2015-12-10 17:26:01 +01:00
Jace 6326a60a79 Merge pull request #11 from teamfisk/Picking 
Picking
 2015-12-10 17:24:12 +01:00
verysecrethero c651face4c ConfigFile now has tests covering the whole class 2015-12-10 17:20:47 +01:00
stiffly 641a43b2ec Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	src/Engine/Network/Client.cpp
 2015-12-10 17:16:22 +01:00
stiffly 58952725e9 Added class Package to help refactor the code. The code got easier to read. 2015-12-10 17:07:18 +01:00
verysecrethero de044dabd3 Added ConfigFileTests! 2015-12-10 16:55:28 +01:00
William Moberg ce7b26ccac Merge branch 'master' into OctTree 
# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp
 2015-12-10 16:37:55 +01:00
viktorljung bb900c5110 Added picking event 2015-12-10 16:33:33 +01:00
Tleety cefc4e5257 PickingPassState done. 2015-12-10 16:06:25 +01:00
William Moberg 0d8f7acb7e OctTree doesn't check the same object multiple times if it exists in multiple places in the tree. 2015-12-10 16:04:55 +01:00
Tleety 37cf42527b RenderState class structure made. 2015-12-10 16:03:48 +01:00
Jocke 99543a300d Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	include/Engine/Network/NetworkDefinitions.h
#	include/Game/Game.h
#	src/Engine/Network/Client.cpp
#	src/Game/Game.cpp
 2015-12-10 14:40:06 +01:00
Jocke f377d9ba70 Fixed client movement. 2015-12-10 14:14:36 +01:00
stiffly d22e59f28f Merge remote-tracking branch 'origin/master' into Networking 
NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml

# Conflicts:
#	include/Game/Game.h
#	src/Game/Game.cpp
 2015-12-10 13:53:18 +01:00
verysecrethero 7804d42fea OctTree debug temporarily disabled because of the new master layout 2015-12-10 13:42:39 +01:00
stiffly 9a8f5293af Can now Identify Packet Loss. Enumerated messages that loops around 0-1000. 2015-12-10 12:55:28 +01:00
verysecrethero e535f629bc Merge branch 'master' into PlayerTakeCapturePoint 
# Conflicts:
#	include/Game/Game.h
#	include/Game/HardcodedTestWorld.h
#	src/Game/Game.cpp
 2015-12-10 11:50:29 +01:00
viktorljung aa805f9a41 Merge remote-tracking branch 'origin/master' into Picking 2015-12-10 11:38:35 +01:00
viktorljung dc66891d60 Added Freetype 2.62 2015-12-10 11:22:56 +01:00
antc13 a22d086e60 Tested some of the Material Code. Seems to work. The project should now be following the code standard properly (hopefully). 2015-12-10 11:18:34 +01:00
verysecrethero c60e968836 Removed a boxclear in the end of the test2 method 2015-12-10 11:03:40 +01:00
Tleety 9d3313e3ed Calculate frustrum removed from code untill Nvidia isn't shit. 2015-12-10 10:46:27 +01:00
Jace dc4f5ad26e Merge pull request #9 from teamfisk/ecs-systems 
ECS Systems
 2015-12-10 10:42:37 +01:00
Viktor Ljung eaca1c4dd1 Merge pull request #7 from teamfisk/ecs 
Entity loading from schema
 2015-12-10 10:32:00 +01:00
sippeangelo 0367826f16 Added RaptorCopter example system 2015-12-10 10:17:18 +01:00