f31da90830
Network - Connection set blocking to true while connecting.
2013-12-17 09:05:32 +01:00
23a05bf431
Network - OysterByte += operator
2013-12-17 08:45:47 +01:00
e4e0e1c189
Network - Fixed delay loading dll.
2013-12-16 19:58:31 +01:00
1c8f9c7801
Fixed link errors with dll files
2013-12-16 11:04:21 +01:00
8a8cfcc5d6
Network - Forgot to use Initiateclient().
2013-12-16 09:48:41 +01:00
6f979b1044
Network - Merge with gamelogic
2013-12-16 09:15:13 +01:00
0c6badb749
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into Network
2013-12-16 09:11:18 +01:00
34d79d1207
Gamelogic - Forgot some stuff
2013-12-16 09:09:54 +01:00
3a752f6b95
Network - Merge with gamelogic
2013-12-16 09:09:48 +01:00
9eb8fcba40
Gamelogic - Publication to others...
2013-12-16 09:00:11 +01:00
7acb3a3613
Network -
2013-12-16 08:59:38 +01:00
17aa38d865
GameLogic - Merge with network, resolved 2 merging errors
2013-12-14 22:54:24 +01:00
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +01:00
8b1c2b91e8
Fixed some craches and stuff
2013-12-13 23:47:16 +01:00
c41f5dda3f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-13 12:03:04 +01:00
7c1d19946d
GL - Connection to network in clinet
2013-12-13 12:02:49 +01:00
f1f9f4d20a
added include string in level.h
2013-12-13 11:11:51 +01:00
7817003db8
updated h.files
...
description, started with level concept
2013-12-13 11:09:09 +01:00
94ccd91828
Network - Added comments
2013-12-13 08:23:54 +01:00
2ddb984a2b
Network - Fixed bugg, and small fixed
...
Using sizeof in MessageHeader class.
Fixed bugg in Translator.
2013-12-13 08:17:05 +01:00
4617523f8b
Gamelogic - Commit because branch switch
2013-12-12 20:32:54 +01:00
092f83a084
Network - Id on client and == operator.
2013-12-12 15:33:11 +01:00
a3e4262c08
Merge with Other part of gamelogic(DanbiasGame)
2013-12-12 14:44:06 +01:00
71d31db884
GAMELOGIC - Fixed a minor major huge issue with no problems
2013-12-12 14:37:35 +01:00
42fa756866
GameLogic - Merge with util fixed
2013-12-12 14:29:56 +01:00
94651ec77a
Network - Added stop in listener destructor.
2013-12-12 14:14:48 +01:00
693b9df928
Some wierd stuff is going on here
2013-12-12 12:54:08 +01:00
d0bd60c856
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 12:23:55 +01:00
c661d26d2a
Network - Not deleting smart pointers anymore.
2013-12-12 12:23:35 +01:00
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +01:00
a5ee468795
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 12:17:52 +01:00
9b9a92556a
Pre-merge with network, (again)
2013-12-12 12:17:39 +01:00
8f36f64c4f
updated AttatchmentMassDriver and CollisionManager
...
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.
CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
2013-12-12 12:16:13 +01:00
e9b41f8cb8
Network - Fixed copy construct
2013-12-12 12:14:53 +01:00
2ea252919a
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 10:37:40 +01:00
af7f0e01a8
Pre-network merge, (again)
2013-12-12 10:36:55 +01:00
49cfbbebd5
Network - Changed to CustomProtocolObject on send.
2013-12-12 10:32:43 +01:00
c801ab829a
Merge remote-tracking branch 'origin/Physics' into GameLogic
...
Conflicts:
Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +01:00
c740bd5935
Added some data to PhysicsAPI
...
GetRigidLinearVelocity() and void* as reference to game object.
2013-12-12 10:02:35 +01:00
2424b51c3e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Bin/Content/Shaders/DebugVertex.cso
2013-12-12 09:39:27 +01:00
0adb831f7a
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
2013-12-12 09:36:30 +01:00
e11d7d94f7
updated the weapon system, collisionManager and redid the "object" heirarki
2013-12-12 09:36:14 +01:00
fd3776a53b
GameLogic - Pre-network merge
2013-12-12 09:33:59 +01:00
04436258a5
Network - Non-blocking
2013-12-12 09:24:57 +01:00
bbe59836da
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-11 21:45:51 +01:00
5a3188d5f6
Network - NetworkServer, NetworkClient, Translator
...
First version of the NetworkAPI. It should work.
2013-12-11 21:45:43 +01:00
22665bc44b
GL - started using network and protocols for sending/recieveing
2013-12-11 12:14:00 +01:00
bb789faa67
GL - merge with network - fixed dependencies in launcher project
2013-12-11 09:00:36 +01:00
d95d771c43
Network - Merged with Gamelogic
2013-12-10 14:00:20 +01:00
eb0b5ec0ee
Network - Removing old gamelogic stuff before replacing them with new stuff
2013-12-10 13:38:25 +01:00
Pontus Fransson
Sam Mario Svensson
dean11
Linda Andersson
Erik Persson
Robin Engman