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
465ea1bd19
GL - soleved merge errors in project files
2013-12-10 11:50:35 +01:00
78f20e04a1
GL - moved object files to Obj
2013-12-10 11:27:20 +01:00
f0181ad9f4
GL - fixed defines in headers - more structure for states
2013-12-10 11:26:18 +01:00
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
58c3371edd
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-10 09:57:13 +01:00
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +01:00
e06ee31754
Network - First basic API.
2013-12-10 08:32:08 +01:00
226bbcc8af
MISC - Added a release feature in smartpointers
2013-12-09 22:55:22 +01:00
d27dcbe5b6
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-09 22:22:40 +01:00
2cb8bbd8a9
Network - IServer running on separate thread.
...
IServer accepting clients.
2013-12-09 22:22:05 +01:00
9d264b0d89
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-09 14:24:12 +01:00
5473c5160f
NETWORK - Modified the protocol creation structure
2013-12-09 14:23:30 +01:00
1f172b422a
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-09 12:05:30 +01:00
ea593743ad
GL - added UI object
2013-12-09 12:01:36 +01:00
a45ffb2e40
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-09 11:58:44 +01:00
fbd95a7109
GAMELOGIC - Added a protocol api
2013-12-09 11:57:34 +01:00
4134836405
GL - added client objects
...
- no memory leaks in client
2013-12-09 11:05:47 +01:00
b72fb21b07
Network - Fixed all thread related crashes.
...
The crashes was caused by OysterMutex, so i changed all OysterMutex to
std::mutex instead.
2013-12-09 10:48:43 +01:00
5416df6d86
Merge remote-tracking branch 'origin/GameLogic' into GameLogic
2013-12-09 09:24:01 +01:00
38a1602d3f
GL - merge with graphics api. Lobby and game state.
2013-12-09 09:23:39 +01:00
a79dc61159
Network - Stuff
2013-12-08 23:56:17 +01:00
597891acfe
Misc - Added more fetures to Smart pointers
2013-12-06 11:46:47 +01:00
bbb79a4ba9
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-06 10:46:05 +01:00
5465ccf51a
Network - Started implementing Server,client,session.
2013-12-06 10:45:53 +01:00
b331ce1a1f
GL - started working with client application
2013-12-06 10:38:43 +01:00
cb8fee9227
NETWORK - Added network custom protocol
2013-12-06 10:00:58 +01:00
5835a72acc
Setstruct introduction done
...
Can be found as:
Physics::Struct::CustomBodyState
Physics::ICustomBody::State
Is all inline thus no expensive API calls, as intended.
Will be expanded to move API call methods from Physics::ICustomBody to
it.
2013-12-06 09:46:30 +01:00
fb51881fab
Fixed Mem leaks on gpu and start on deffered pipeline
2013-12-05 14:56:34 +01:00
63addde51e
made "interfaces" of most classes
2013-12-05 11:50:39 +01:00
1cb880a66e
GameLogic - Fixed the window class
2013-12-04 15:59:44 +01:00
dean11
Erik Persson
Pontus Fransson
Robin Engman
Linda Andersson
Dander7BD
lanariel