 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 |
|
 sippeangelo
|
0367826f16
|
Added RaptorCopter example system
|
2015-12-10 10:17:18 +01:00 |
|
|
sippeangelo
|
352074da04
|
Created base for systems
|
2015-12-10 10:17:08 +01:00 |
|
|
stiffly
|
4de613814b
|
WIP Packet loss identification. Put packetID in message
|
2015-12-09 17:43:36 +01:00 |
|
|
sippeangelo
|
58d827f7d0
|
Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld
|
2015-12-09 14:25:41 +01:00 |
|
 Jace
|
0dbe0fe48e
|
Component definitions and default values loading from schema
|
2015-12-08 21:38:52 +01:00 |
|
|
sippeangelo
|
1e1ce4e127
|
Added Model component to schema
|
2015-12-08 18:21:24 +01:00 |
|
|
sippeangelo
|
f337305dee
|
Merge remote-tracking branch 'origin/master' into ecs
|
2015-12-08 18:07:42 +01:00 |
|
|
sippeangelo
|
d7de4fc694
|
Component definitions now loaded from schema. No default values yet.
|
2015-12-08 18:07:32 +01:00 |
|
|
stiffly
|
6dc5112c26
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# include/Engine/Network/Client.h
# src/Game/Game.cpp
|
2015-12-08 16:15:50 +01:00 |
|
|
stiffly
|
e92119c99e
|
WIP trying to get Eventsystem to work in client.
|
2015-12-08 16:13:53 +01:00 |
|
 Jocke
|
c48c9e1f86
|
Added leak check when using windows (WinLeakCheck.h).
Added server to project.
A server can now be started in the project.
|
2015-12-08 13:54:18 +01:00 |
|
|
Jocke
|
8f55e90d2d
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# include/Game/Game.h
|
2015-12-08 11:11:12 +01:00 |
|
|
Jocke
|
b5a010a517
|
Network now runs on it's own thread.
Network now sends Disconnect message when game is terminated.
|
2015-12-08 11:02:40 +01:00 |
|
 viktorljung
|
d556f964e6
|
merge fixes
|
2015-12-08 10:15:12 +01:00 |
|
|
viktorljung
|
e7427bf3ad
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# include/Game/HardcodedTestWorld.h
|
2015-12-08 10:15:00 +01:00 |
|
|
viktorljung
|
9c589a0dc6
|
Added support for color tinting
|
2015-12-07 16:33:03 +01:00 |
|
|
viktorljung
|
1df63aecd5
|
Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use.
Still needs more work
|
2015-12-07 16:24:34 +01:00 |
|
|
sippeangelo
|
7f88a8b2d2
|
Merge remote-tracking branch 'origin/master' into ecs
|
2015-12-04 09:46:30 +01:00 |
|
|
sippeangelo
|
aeb6c39603
|
Created ComponentWrapperFactory to make test mocking easier and manual component registration a little less painful
|
2015-12-03 19:31:55 +01:00 |
|
 Tleety
|
45a48bbbe5
|
Merge remote-tracking branch 'origin/master' into Rendering
|
2015-12-03 18:15:56 +01:00 |
|
|
sippeangelo
|
032b384f3f
|
Created framework for a hardcoded world for TESTING PURPOSES
|
2015-12-03 16:45:03 +01:00 |
|
|
viktorljung
|
1fdf312af4
|
Set up Renderer base and shader compilation
|
2015-12-01 10:35:59 +01:00 |
|
|
sippeangelo
|
793b2f44cc
|
Proper GLFW message handling and pinkness!
|
2015-11-30 17:28:24 +01:00 |
|
|
sippeangelo
|
872879c013
|
Engine puzzle completed
|
2015-11-30 17:02:24 +01:00 |
|
|
sippeangelo
|
63674946ca
|
Initial directory structure
|
2015-11-20 15:01:37 +01:00 |
|