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

2296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
verysecrethero 8949db5456 Little more work with OctTreeTest 2015-12-09 13:56:59 +01:00
William Moberg 14bcb7ea0d Added Update call in Game to test OctTree by using collision. 2015-12-09 13:52:17 +01:00
verysecrethero 519178dfba Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	src/Engine/Core/OctTree.cpp
 2015-12-09 13:37:27 +01:00
Jocke 0e6353dd79 Fixed bug where closing glwindow as client crashed. 
Server bug is still present.
 2015-12-09 13:37:02 +01:00
verysecrethero ed5cd392ab Further work in testing OctTree 2015-12-09 13:29:15 +01:00
William Moberg bad42fae1c OctTree differentiates between static/dynamic objects now. Added a general BoxesInSameRegion method. 2015-12-09 13:27:00 +01:00
stiffly 247ff09743 Smoother movement over network. Some refactoring on client side. Now uses EKeyUp to determine if a key is pressed. 2015-12-09 13:02:39 +01:00
sippeangelo c9b140bd6b Semi-working entity loading from XML files! 2015-12-09 12:29:32 +01:00
FakeShemp 74c1beed20 gitignore 2015-12-09 12:03:01 +01:00
FakeShemp c8cb0ee939 Grab all materials 2015-12-09 11:58:49 +01:00
stiffly 2a35c3055e Renamed NetworkDefines.h --> NetworkDefinitions.h 2015-12-09 11:08:57 +01:00
sippeangelo c9d1ba6cae EntityIDs should start at 1, because 0 is world 2015-12-09 11:07:46 +01:00
Tleety eb9c217eb4 3D picking float value error fixed. 2015-12-09 10:44:06 +01:00
stiffly ce41421dbb Added a "StartNetwork" bool to DefaultConfig. 2015-12-09 10:37:40 +01:00
verysecrethero 1d0810db10 OctTree is now drawn perfectly 2015-12-09 10:24:06 +01:00
verysecrethero c85bb2eef7 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-09 10:08:26 +01:00
verysecrethero 75402b0f93 Working on OctTree tests 2015-12-09 10:08:08 +01:00
Jace d597c7e60e Cleaned up custom type conversion code 2015-12-08 22:51:35 +01:00
Jace 0dbe0fe48e Component definitions and default values loading from schema 2015-12-08 21:38:52 +01:00
stiffly f83e217638 Bugfix. if-statement was incorrect 2015-12-08 18:35:30 +01:00
stiffly 58db7b755a Random bugfixes and cleanup. 2015-12-08 18:24:08 +01:00
sippeangelo 1e1ce4e127 Added Model component to schema 2015-12-08 18:21:24 +01:00
sippeangelo 9fbea18330 fixup! Merge remote-tracking branch 'origin/master' into ecs 2015-12-08 18:20:42 +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 a8c0a1f294 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 
# Conflicts:
#	include/Engine/Network/Client.h
#	src/Engine/Network/Client.cpp
 2015-12-08 18:07:18 +01:00
stiffly 9f54a08536 Implemented new version of snapshot for 3D world. Also some cleanup. 2015-12-08 17:57:01 +01:00
sippeangelo 03bbe25a1e Fixed FindXerces.cmake 2015-12-08 17:42:59 +01:00
Jocke 24dada149f Cleaned up code in Client.h and Client.cpp. 
Moved ping code into Ping() function.
 2015-12-08 17:18:03 +01:00
William Moberg a7fb77d998 OctTree can check if a box collides with a box in the OctTree. 2015-12-08 17:12:58 +01:00
William Moberg 32d2aa6a93 AABB can also be created with center position and its size. 2015-12-08 17:01:50 +01:00
Jocke d1880754f5 Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 2015-12-08 16:42:32 +01:00
stiffly 27b44d2511 Input events for Client done. Instead of windows getAsyncKeyState(); 2015-12-08 16:41:48 +01:00
Jocke 94adaf8ae3 Added support for multiplayer. 
Reactored code, clumped together variables in PlayerDefinition.h.
Integrated server with entity system.
 2015-12-08 16:41:22 +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
verysecrethero 7ac2aaef15 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 
# Conflicts:
#	src/Engine/Core/OctTree.cpp
 2015-12-08 11:16:34 +01:00
verysecrethero 06f56d13d1 added some octTreeTest tests and a few comments in OctTree 2015-12-08 11:14:01 +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
William Moberg b87e543420 Merge branch 'master' into OctTree 2015-12-08 10:47:27 +01:00
William Moberg fa3816e55d Fixed flawed unit test. 2015-12-08 10:44:12 +01:00
stiffly ee41721a75 Merge remote-tracking branch 'origin/master' into Networking 2015-12-08 10:41:04 +01:00
Jace ed8d0fb608 Merge pull request #6 from teamfisk/Rendering 
Rendering
 2015-12-08 10:39:54 +01:00
viktorljung c717dd7049 Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util 2015-12-08 10:37:24 +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
William Moberg 648ba502bb Added small test for OctTree. 2015-12-07 17:27:57 +01:00
viktorljung 9e1a4b83ae Linked picking to entities 2015-12-07 17:26:42 +01:00