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
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
cc793851af
Network- set blocking mode
2013-12-04 14:59:00 +01:00
df1594a43b
Network - Fixed small errors
2013-12-04 14:58:15 +01:00
d0936f9133
InverseRotationMatrix fixed
...
Compiler overstepping its bound, doing whatever it wants.
2013-12-04 14:22:25 +01:00
7ad60969fc
Sphere Vs Box collision detect fix
...
second ed. ... Works now! :3
2013-12-04 14:12:06 +01:00
e0adc0ae93
Sphere Vs Box collision detect fix
2013-12-04 13:52:07 +01:00
e81062b875
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
2013-12-04 12:41:37 +01:00
f0dff0b728
Network - Starting to implement correct shutdown connection.
2013-12-04 12:41:25 +01:00
79cf9df111
Network - changed from & to smartpoints
2013-12-04 12:40:49 +01:00
202ee23b25
Octtree::leafData Container should be kept updated now
2013-12-04 11:49:33 +01:00
080bbf68fd
Collideables fixed
...
Missing returns
2013-12-04 11:42:11 +01:00
b35ffdecfd
GameLogic - Merged with DanbiasGame project
2013-12-04 11:40:22 +01:00
64a8089e54
GameLogic - Worked on server
2013-12-04 11:37:26 +01:00
e658071643
GL- open a red window from lancher project
2013-12-04 11:32:43 +01:00
1d94ed0ddc
Fixed MomentOfInertia methods
2013-12-04 11:30:56 +01:00
f10f3b0bef
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2013-12-04 10:05:02 +01:00
87e9d137ea
Merge remote-tracking branch 'origin/Graphics' into Physics
2013-12-04 09:58:11 +01:00
47aa2c89a2
Quick Error fix and using .png
2013-12-04 09:56:03 +01:00
f2548c43ce
Merge branch 'Physics' of https://github.com/dean11/Danbias into Physics
2013-12-04 09:52:03 +01:00
b03e9af027
Fixed octree and API
...
Rewrote AddObject function in octree and OnPossibleCollision in
PhysocsAPI_Impl
2013-12-04 09:51:48 +01:00
d03f1eaf44
Merge to sprint2
2013-12-04 09:42:52 +01:00
f29af8b8bd
Release Now Stable
2013-12-04 09:36:43 +01:00
df1470eb2c
Network - Send/Recv both ways.
...
Impl: SetBlockingMode() : Connection.
Impl: Resize() : OysterByte.
Remade Clear() : OysterByte.
Added bool return if FetchMessage() succeded or failed : PostBox.
Fixed a few errors with mutex on ThreadedClient.
Added missing mutex unlock in ThreadSafeQueue.
2013-12-03 23:12:48 +01:00
e4476f7757
Added function for ICustomBody
...
void ICustomBody::SetMomentum( const ::Oyster::Math::Float3 &worldG )
- Added and implemented
2013-12-03 15:11:24 +01:00
e837b80e43
Network - Fixed warning, made functions private.
...
Fixed warnings.
Made functions regarding the thread private in listener.
2013-12-03 13:20:50 +01:00
1466c0db31
Network - projectfile fix
2013-12-03 13:16:44 +01:00
aa19002cbe
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
...
Conflicts:
Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
2013-12-03 13:12:17 +01:00
Pontus Fransson
dean11
Linda Andersson
Erik Persson
Robin Engman
Dander7BD
lanariel
Sam Mario Svensson