Jace
03e226ffea
Refactored InputProxy to gracefully handle cases where multiple origins send the same command
2015-12-12 13:42:35 +01:00
Jace
013f911ae2
Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement.
2015-12-12 13:42:34 +01:00
Jace
35624008e7
InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file.
2015-12-12 13:42:34 +01:00
Jace
784a04b8ad
Fixed bug in config file overriding. Previously it was silently overwriting the whole default config and relied on hardcoded values for defaults.
2015-12-12 13:42:33 +01:00
Jace
bffc97f310
Groundwork for input command proxy
2015-12-12 13:42:33 +01:00
Jace
7464facab9
Next generation raptor copter
2015-12-12 03:38:17 +01:00
d406059c79
Small bugfix.
2015-12-11 17:00:06 +01:00
59b261534a
Cleaned some comments and random annoyances in Renderer
2015-12-11 16:57:02 +01:00
45b87ed6b1
ShaderProgram is now a Resource.
...
All shaderprograms are now pointers and loaded with Resourcemanager.
2015-12-11 16:53:46 +01:00
55aad493ff
Fixed warnings in OctTree. Cleaned unit tests.
2015-12-11 16:45:38 +01:00
36ae451ea6
Indentation
2015-12-11 16:22:14 +01:00
53d5736420
Fixed a bugg with RenderState.
...
Renderstate now also handles the Frambuffer binding.
2015-12-11 16:07:12 +01:00
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
433331e752
DrawPass now moved to it's own class to make renderer cleaner.
2015-12-11 14:22:54 +01:00
725a8896ce
PickingPass now publishes an event that others can listen to to get pickingdata.
2015-12-11 13:51:08 +01:00
23c3f0709b
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
2015-12-11 11:59:22 +01:00
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
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
6a3335315a
Merge branch 'master' into Networking
2015-12-10 17:26:01 +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
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
9a8f5293af
Can now Identify Packet Loss. Enumerated messages that loops around 0-1000.
2015-12-10 12:55:28 +01:00
aa805f9a41
Merge remote-tracking branch 'origin/master' into Picking
2015-12-10 11:38:35 +01:00
9d3313e3ed
Calculate frustrum removed from code untill Nvidia isn't shit.
2015-12-10 10:46:27 +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
eb9c217eb4
3D picking float value error fixed.
2015-12-09 10:44:06 +01:00
Jace
Tleety
William Moberg
stiffly
Jocke
viktorljung
sippeangelo