Dennis Andersen
|
682a28513b
|
Gamelogic - Merge with network
|
2013-12-17 11:35:34 +01:00 |
Pontus Fransson
|
7c029a5242
|
Network - Fixed bugs
|
2013-12-17 10:58:07 +01:00 |
|
dean11
|
8667e14afb
|
Merged with Linda after merge conflicts
|
2013-12-17 10:28:44 +01:00 |
|
dean11
|
4650615a61
|
Gamelogic - Pre merge with Linda
|
2013-12-17 10:25:34 +01:00 |
Linda Andersson
|
5d1d64bebb
|
GL - trying to send move protocol
|
2013-12-17 10:07:46 +01:00 |
|
Pontus Fransson
|
cbf3c7db8f
|
asd
|
2013-12-17 09:05:49 +01:00 |
|
Pontus Fransson
|
f31da90830
|
Network - Connection set blocking to true while connecting.
|
2013-12-17 09:05:32 +01:00 |
|
Pontus Fransson
|
23a05bf431
|
Network - OysterByte += operator
|
2013-12-17 08:45:47 +01:00 |
|
dean11
|
abc94e9acb
|
Nothing important done
|
2013-12-17 00:51:42 +01:00 |
|
dean11
|
3ffbb9525d
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-17 00:47:06 +01:00 |
|
Pontus Fransson
|
e4e0e1c189
|
Network - Fixed delay loading dll.
|
2013-12-16 19:58:31 +01:00 |
|
Linda Andersson
|
3ee25f0112
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-16 11:08:22 +01:00 |
|
Linda Andersson
|
dc3221ee11
|
GL - set pos function for C_models
|
2013-12-16 11:08:10 +01:00 |
|
dean11
|
ca8df00e34
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-16 11:05:57 +01:00 |
|
dean11
|
ec3c5f1290
|
Gamelogic - Added threading functionality to NetworkClient
|
2013-12-16 11:05:24 +01:00 |
Sam Mario Svensson
|
1c8f9c7801
|
Fixed link errors with dll files
|
2013-12-16 11:04:21 +01:00 |
Erik Persson
|
77bc6050fc
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-16 10:04:27 +01:00 |
|
Erik Persson
|
f5b806a512
|
launcher include
|
2013-12-16 10:03:30 +01:00 |
|
dean11
|
b351a7bac4
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-16 10:02:41 +01:00 |
|
dean11
|
6bfe7711ab
|
Gamelogic - Modified gameprotocol id:s
|
2013-12-16 10:02:30 +01:00 |
|
Linda Andersson
|
b60166a6e8
|
GL - connect to server, need right IP
|
2013-12-16 09:55:51 +01:00 |
|
dean11
|
0d5b84a7dd
|
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-16 09:54:05 +01:00 |
|
dean11
|
7cda07507a
|
GameLogic - Pre merge with Netowkr
|
2013-12-16 09:50:23 +01:00 |
|
Pontus Fransson
|
8a8cfcc5d6
|
Network - Forgot to use Initiateclient().
|
2013-12-16 09:48:41 +01:00 |
|
Linda Andersson
|
fa1473455f
|
GL - added C_obj files, client obj in game state to send input
|
2013-12-16 09:45:12 +01:00 |
|
Pontus Fransson
|
6f979b1044
|
Network - Merge with gamelogic
|
2013-12-16 09:15:13 +01:00 |
|
Pontus Fransson
|
0c6badb749
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into Network
|
2013-12-16 09:11:18 +01:00 |
|
dean11
|
34d79d1207
|
Gamelogic - Forgot some stuff
|
2013-12-16 09:09:54 +01:00 |
|
Pontus Fransson
|
3a752f6b95
|
Network - Merge with gamelogic
|
2013-12-16 09:09:48 +01:00 |
|
dean11
|
9eb8fcba40
|
Gamelogic - Publication to others...
|
2013-12-16 09:00:11 +01:00 |
|
Pontus Fransson
|
7acb3a3613
|
Network -
|
2013-12-16 08:59:38 +01:00 |
|
dean11
|
17aa38d865
|
GameLogic - Merge with network, resolved 2 merging errors
|
2013-12-14 22:54:24 +01:00 |
|
dean11
|
f29f50f830
|
Merged with Gamelogic branch and fixed errors and added features
|
2013-12-14 22:04:42 +01:00 |
|
dean11
|
8b1c2b91e8
|
Fixed some craches and stuff
|
2013-12-13 23:47:16 +01:00 |
|
Linda Andersson
|
c41f5dda3f
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-13 12:03:04 +01:00 |
|
Linda Andersson
|
7c1d19946d
|
GL - Connection to network in clinet
|
2013-12-13 12:02:49 +01:00 |
|
Erik Persson
|
f1f9f4d20a
|
added include string in level.h
|
2013-12-13 11:11:51 +01:00 |
|
Erik Persson
|
7817003db8
|
updated h.files
description, started with level concept
|
2013-12-13 11:09:09 +01:00 |
|
Pontus Fransson
|
94ccd91828
|
Network - Added comments
|
2013-12-13 08:23:54 +01:00 |
|
Pontus Fransson
|
2ddb984a2b
|
Network - Fixed bugg, and small fixed
Using sizeof in MessageHeader class.
Fixed bugg in Translator.
|
2013-12-13 08:17:05 +01:00 |
|
dean11
|
4617523f8b
|
Gamelogic - Commit because branch switch
|
2013-12-12 20:32:54 +01:00 |
|
Pontus Fransson
|
092f83a084
|
Network - Id on client and == operator.
|
2013-12-12 15:33:11 +01:00 |
|
dean11
|
a3e4262c08
|
Merge with Other part of gamelogic(DanbiasGame)
|
2013-12-12 14:44:06 +01:00 |
|
dean11
|
71d31db884
|
GAMELOGIC - Fixed a minor major huge issue with no problems
|
2013-12-12 14:37:35 +01:00 |
|
dean11
|
42fa756866
|
GameLogic - Merge with util fixed
|
2013-12-12 14:29:56 +01:00 |
|
Pontus Fransson
|
94651ec77a
|
Network - Added stop in listener destructor.
|
2013-12-12 14:14:48 +01:00 |
|
dean11
|
693b9df928
|
Some wierd stuff is going on here
|
2013-12-12 12:54:08 +01:00 |
|
dean11
|
d0bd60c856
|
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-12 12:23:55 +01:00 |
|
Pontus Fransson
|
c661d26d2a
|
Network - Not deleting smart pointers anymore.
|
2013-12-12 12:23:35 +01:00 |
|
Erik Persson
|
c63e9f1c08
|
Some comments on the massdriver and player
|
2013-12-12 12:21:19 +01:00 |