8f007f6daf
Added Freetype 2.62 config and option files
2015-12-11 11:26:41 +01:00
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
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
4c2ce3882e
Added fonts folder and font
2015-12-11 11:07:22 +01:00
7b6902eafe
Merge remote-tracking branch 'origin/master' into TextRendering
2015-12-11 10:55:10 +01:00
46854a63dd
Text rendering includes
2015-12-11 10:54:52 +01:00
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
4195baa5dc
ContainedObject in OctTree made private.
2015-12-10 17:57:09 +01:00
37f9ab2322
Quick fix for unit test compilation.
2015-12-10 17:53:33 +01:00
d8b1f4e514
ConfigFileTest attempt to explore the memleaks further
2015-12-10 17:46:17 +01:00
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
c651face4c
ConfigFile now has tests covering the whole class
2015-12-10 17:20:47 +01:00
641a43b2ec
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2015-12-10 17:16:22 +01:00
58952725e9
Added class Package to help refactor the code. The code got easier to read.
2015-12-10 17:07:18 +01:00
de044dabd3
Added ConfigFileTests!
2015-12-10 16:55:28 +01:00
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
bb900c5110
Added picking event
2015-12-10 16:33:33 +01:00
cefc4e5257
PickingPassState done.
2015-12-10 16:06:25 +01:00
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
37cf42527b
RenderState class structure made.
2015-12-10 16:03:48 +01:00
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
f377d9ba70
Fixed client movement.
2015-12-10 14:14:36 +01:00
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
7804d42fea
OctTree debug temporarily disabled because of the new master layout
2015-12-10 13:42:39 +01:00
9a8f5293af
Can now Identify Packet Loss. Enumerated messages that loops around 0-1000.
2015-12-10 12:55:28 +01:00
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
aa805f9a41
Merge remote-tracking branch 'origin/master' into Picking
2015-12-10 11:38:35 +01:00
dc66891d60
Added Freetype 2.62
2015-12-10 11:22:56 +01:00
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
c60e968836
Removed a boxclear in the end of the test2 method
2015-12-10 11:03:40 +01:00
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
eaca1c4dd1
Merge pull request #7 from teamfisk/ecs
...
Entity loading from schema
2015-12-10 10:32:00 +01:00
0367826f16
Added RaptorCopter example system
2015-12-10 10:17:18 +01:00
352074da04
Created base for systems
2015-12-10 10:17:08 +01:00
53ef749736
Fixed absoute positioning, I think...
2015-12-10 10:16:03 +01:00
bc8a922b77
Merging octTreeTests a bit
2015-12-09 17:57:32 +01:00
663aca2641
Moved client and server from header.
...
Fixed so user are able to start a server and client on the same computer.
Starting 2 servers on the same computer will probably still crash the newest server (Don't do it).
2015-12-09 17:50:30 +01:00
4de613814b
WIP Packet loss identification. Put packetID in message
2015-12-09 17:43:36 +01:00
de6e74c0b1
Forward+ Debugging commit, dont try it.
2015-12-09 17:36:03 +01:00
e580540143
Made some optimizations in OctTree and added a unit test for BoxesInSameRegion.
2015-12-09 17:16:11 +01:00
90a79c702f
Added crude absolute positioning when rendering
2015-12-09 15:26:49 +01:00
393a774140
Framework for Forward+ renderer, Buggy.
2015-12-09 14:50:39 +01:00
0807a7d0ae
Fixed the bug where starting a server made the program crash on closing.
...
Fixed some memory leaks in Client.cpp.
2015-12-09 14:43:43 +01:00
ba150a264c
Fixed bug that cause the program to crash when closing if a server had been started.
...
Removed memory leaks in Client.cpp.
2015-12-09 14:41:26 +01:00
578018607a
Moved decision of which map to load to Config.ini
2015-12-09 14:32:34 +01:00
58d827f7d0
Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld
2015-12-09 14:25:41 +01:00
3085ccdfbf
Added temporary Release function to resource manager to be able to reload a resource
2015-12-09 14:23:49 +01:00
b650eb95df
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
2015-12-09 13:57:22 +01:00
viktorljung
Tleety
verysecrethero
William Moberg
stiffly
Jace
Jocke
antc13
Viktor Ljung
sippeangelo