dean11
|
fd3776a53b
|
GameLogic - Pre-network merge
|
2013-12-12 09:33:59 +01:00 |
|
dean11
|
d95d771c43
|
Network - Merged with Gamelogic
|
2013-12-10 14:00:20 +01:00 |
|
dean11
|
eb0b5ec0ee
|
Network - Removing old gamelogic stuff before replacing them with new stuff
|
2013-12-10 13:38:25 +01:00 |
Linda Andersson
|
465ea1bd19
|
GL - soleved merge errors in project files
|
2013-12-10 11:50:35 +01:00 |
|
Linda Andersson
|
78f20e04a1
|
GL - moved object files to Obj
|
2013-12-10 11:27:20 +01:00 |
|
Linda Andersson
|
f0181ad9f4
|
GL - fixed defines in headers - more structure for states
|
2013-12-10 11:26:18 +01:00 |
Erik Persson
|
4b9f2671bf
|
updated weapon
|
2013-12-10 11:17:25 +01:00 |
|
Erik Persson
|
58c3371edd
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-10 09:57:13 +01:00 |
|
Erik Persson
|
97e0b1298a
|
added functionallity to player and weapon, started on the weapon design.
|
2013-12-10 09:57:05 +01:00 |
Pontus Fransson
|
e06ee31754
|
Network - First basic API.
|
2013-12-10 08:32:08 +01:00 |
|
Pontus Fransson
|
d27dcbe5b6
|
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
|
2013-12-09 22:22:40 +01:00 |
|
Pontus Fransson
|
2cb8bbd8a9
|
Network - IServer running on separate thread.
IServer accepting clients.
|
2013-12-09 22:22:05 +01:00 |
|
dean11
|
9d264b0d89
|
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
|
2013-12-09 14:24:12 +01:00 |
|
dean11
|
5473c5160f
|
NETWORK - Modified the protocol creation structure
|
2013-12-09 14:23:30 +01:00 |
|
Linda Andersson
|
1f172b422a
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-09 12:05:30 +01:00 |
|
Linda Andersson
|
ea593743ad
|
GL - added UI object
|
2013-12-09 12:01:36 +01:00 |
|
dean11
|
a45ffb2e40
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-09 11:58:44 +01:00 |
|
dean11
|
fbd95a7109
|
GAMELOGIC - Added a protocol api
|
2013-12-09 11:57:34 +01:00 |
|
Linda Andersson
|
4134836405
|
GL - added client objects
- no memory leaks in client
|
2013-12-09 11:05:47 +01:00 |
|
Pontus Fransson
|
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 |
|
Linda Andersson
|
5416df6d86
|
Merge remote-tracking branch 'origin/GameLogic' into GameLogic
|
2013-12-09 09:24:01 +01:00 |
|
Linda Andersson
|
38a1602d3f
|
GL - merge with graphics api. Lobby and game state.
|
2013-12-09 09:23:39 +01:00 |
|
Pontus Fransson
|
a79dc61159
|
Network - Stuff
|
2013-12-08 23:56:17 +01:00 |
|
Pontus Fransson
|
bbb79a4ba9
|
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
|
2013-12-06 10:46:05 +01:00 |
|
Pontus Fransson
|
5465ccf51a
|
Network - Started implementing Server,client,session.
|
2013-12-06 10:45:53 +01:00 |
|
Linda Andersson
|
b331ce1a1f
|
GL - started working with client application
|
2013-12-06 10:38:43 +01:00 |
|
dean11
|
cb8fee9227
|
NETWORK - Added network custom protocol
|
2013-12-06 10:00:58 +01:00 |
lanariel
|
fb51881fab
|
Fixed Mem leaks on gpu and start on deffered pipeline
|
2013-12-05 14:56:34 +01:00 |
|
Erik Persson
|
63addde51e
|
made "interfaces" of most classes
|
2013-12-05 11:50:39 +01:00 |
|
dean11
|
1cb880a66e
|
GameLogic - Fixed the window class
|
2013-12-04 15:59:44 +01:00 |
Sam Mario Svensson
|
cc793851af
|
Network- set blocking mode
|
2013-12-04 14:59:00 +01:00 |
|
Pontus Fransson
|
df1594a43b
|
Network - Fixed small errors
|
2013-12-04 14:58:15 +01:00 |
|
Pontus Fransson
|
e81062b875
|
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
|
2013-12-04 12:41:37 +01:00 |
|
Pontus Fransson
|
f0dff0b728
|
Network - Starting to implement correct shutdown connection.
|
2013-12-04 12:41:25 +01:00 |
|
Sam Mario Svensson
|
79cf9df111
|
Network - changed from & to smartpoints
|
2013-12-04 12:40:49 +01:00 |
|
dean11
|
b35ffdecfd
|
GameLogic - Merged with DanbiasGame project
|
2013-12-04 11:40:22 +01:00 |
|
dean11
|
64a8089e54
|
GameLogic - Worked on server
|
2013-12-04 11:37:26 +01:00 |
|
Linda Andersson
|
e658071643
|
GL- open a red window from lancher project
|
2013-12-04 11:32:43 +01:00 |
|
lanariel
|
47aa2c89a2
|
Quick Error fix and using .png
|
2013-12-04 09:56:03 +01:00 |
|
lanariel
|
ce294cd1d7
|
Forgot to add a folder
|
2013-12-04 09:43:43 +01:00 |
|
lanariel
|
d03f1eaf44
|
Merge to sprint2
|
2013-12-04 09:42:52 +01:00 |
|
lanariel
|
f29af8b8bd
|
Release Now Stable
|
2013-12-04 09:36:43 +01:00 |
|
Pontus Fransson
|
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 |
|
Pontus Fransson
|
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 |
|
Sam Mario Svensson
|
1466c0db31
|
Network - projectfile fix
|
2013-12-03 13:16:44 +01:00 |
|
Sam Mario Svensson
|
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 |
|
Sam Mario Svensson
|
10c1dc57f3
|
merge fix
|
2013-12-03 13:08:04 +01:00 |
|
Sam Mario Svensson
|
aa4cf634d3
|
Client interface and class for both server and client. now using postbox system
|
2013-12-03 13:04:53 +01:00 |
|
dean11
|
3d973c16a2
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-03 12:09:22 +01:00 |
|
dean11
|
a852e8eab4
|
Created the game modules
|
2013-12-03 12:07:37 +01:00 |