aa805f9a41
Merge remote-tracking branch 'origin/master' into Picking
2015-12-10 11:38:35 +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
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
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
14bcb7ea0d
Added Update call in Game to test OctTree by using collision.
2015-12-09 13:52:17 +01:00
0e6353dd79
Fixed bug where closing glwindow as client crashed.
...
Server bug is still present.
2015-12-09 13:37:02 +01:00
bad42fae1c
OctTree differentiates between static/dynamic objects now. Added a general BoxesInSameRegion method.
2015-12-09 13:27:00 +01:00
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
c9b140bd6b
Semi-working entity loading from XML files!
2015-12-09 12:29:32 +01:00
2a35c3055e
Renamed NetworkDefines.h --> NetworkDefinitions.h
2015-12-09 11:08:57 +01:00
c9d1ba6cae
EntityIDs should start at 1, because 0 is world
2015-12-09 11:07:46 +01:00
eb9c217eb4
3D picking float value error fixed.
2015-12-09 10:44:06 +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
58db7b755a
Random bugfixes and cleanup.
2015-12-08 18:24:08 +01:00
1e1ce4e127
Added Model component to schema
2015-12-08 18:21:24 +01:00
9fbea18330
fixup! Merge remote-tracking branch 'origin/master' into ecs
2015-12-08 18:20:42 +01:00
f337305dee
Merge remote-tracking branch 'origin/master' into ecs
2015-12-08 18:07:42 +01:00
d7de4fc694
Component definitions now loaded from schema. No default values yet.
2015-12-08 18:07:32 +01:00
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
9f54a08536
Implemented new version of snapshot for 3D world. Also some cleanup.
2015-12-08 17:57:01 +01:00
24dada149f
Cleaned up code in Client.h and Client.cpp.
...
Moved ping code into Ping() function.
2015-12-08 17:18:03 +01:00
a7fb77d998
OctTree can check if a box collides with a box in the OctTree.
2015-12-08 17:12:58 +01:00
32d2aa6a93
AABB can also be created with center position and its size.
2015-12-08 17:01:50 +01:00
d1880754f5
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
2015-12-08 16:42:32 +01:00
27b44d2511
Input events for Client done. Instead of windows getAsyncKeyState();
2015-12-08 16:41:48 +01:00
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
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
e92119c99e
WIP trying to get Eventsystem to work in client.
2015-12-08 16:13:53 +01:00
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
8f55e90d2d
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# include/Game/Game.h
2015-12-08 11:11:12 +01:00
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
b87e543420
Merge branch 'master' into OctTree
2015-12-08 10:47:27 +01:00
ee41721a75
Merge remote-tracking branch 'origin/master' into Networking
2015-12-08 10:41:04 +01:00
c717dd7049
Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util
2015-12-08 10:37:24 +01:00
d556f964e6
merge fixes
2015-12-08 10:15:12 +01:00
e7427bf3ad
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Game/HardcodedTestWorld.h
2015-12-08 10:15:00 +01:00
648ba502bb
Added small test for OctTree.
2015-12-07 17:27:57 +01:00
9e1a4b83ae
Linked picking to entities
2015-12-07 17:26:42 +01:00
2c993e82d6
Added the old prototype logic to Client.h. Can now communicate with a external server(on prototype).
2015-12-07 16:55:12 +01:00
viktorljung
sippeangelo
Jocke
stiffly
Tleety
William Moberg
Jace