Linda Andersson
|
057dce0aca
|
GL - merge errors
|
2013-12-19 10:31:59 +01:00 |
|
Linda Andersson
|
13430f31fc
|
GL - merge and some more protocols
|
2013-12-19 10:22:32 +01:00 |
Erik Persson
|
0ea08fbd54
|
gamesession testing
|
2013-12-19 10:21:03 +01:00 |
|
Linda Andersson
|
a4907c8e2e
|
GL - control protocol added
|
2013-12-18 15:28:47 +01:00 |
Dennis Andersen
|
92b3525587
|
GameLogic - Cleanup after erik ;)
|
2013-12-18 13:12:11 +01:00 |
|
Dennis Andersen
|
33d045de1a
|
GameLogic - Merge with Erik
|
2013-12-18 13:10:47 +01:00 |
|
Dennis Andersen
|
8721224d7c
|
GameLogic - Added alot of functionality to Game related parts
|
2013-12-18 13:07:10 +01:00 |
|
Erik Persson
|
f5490bf111
|
using a global id in object
|
2013-12-18 13:01:25 +01:00 |
|
Linda Andersson
|
0c98e2847d
|
GL - added some protocols
|
2013-12-18 12:18:01 +01:00 |
|
Linda Andersson
|
e16c939285
|
GL - using window manager, fixed consistent linking in danBiasGame
|
2013-12-18 10:47:30 +01:00 |
|
Dennis Andersen
|
e9c5a49778
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-18 08:44:18 +01:00 |
|
Dennis Andersen
|
347b546566
|
GameLogic - some minor fixes
|
2013-12-18 08:44:10 +01:00 |
|
Erik Persson
|
2daf93987a
|
team fix
|
2013-12-18 08:41:31 +01:00 |
|
Dennis Andersen
|
1eceb6095f
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-18 08:37:55 +01:00 |
|
Dennis Andersen
|
bf5cc69ff7
|
GameLogic - Added Postbox system to netsession
|
2013-12-18 08:37:45 +01:00 |
|
Erik Persson
|
4d7be753c5
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-18 08:32:20 +01:00 |
|
Erik Persson
|
8173f3818d
|
gamelogic update and added some level design elements
teammanager, team,
|
2013-12-18 08:30:58 +01:00 |
Pontus Fransson
|
d4e92d4bbe
|
Network - Fixed clear string in Translator.
|
2013-12-18 00:21:00 +01:00 |
|
Pontus Fransson
|
745268eeed
|
Network - Removed line so it doesn't causes error.
|
2013-12-18 00:15:21 +01:00 |
|
Pontus Fransson
|
623267ad1b
|
Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-18 00:10:47 +01:00 |
|
Pontus Fransson
|
fc8dba6610
|
Network - Fixed Unpackb.
Changed Unpackb to "*buffer" instead of "buffer".
|
2013-12-18 00:08:50 +01:00 |
|
Pontus Fransson
|
e1d0150ef1
|
Network - OysterByte += should now work correctly.
|
2013-12-18 00:07:24 +01:00 |
|
Pontus Fransson
|
4df33b759c
|
Network - char[] unpacking.
Fixed correct unpacking on char[].
Fixed not clearing string in translator unpack function.
|
2013-12-18 00:04:25 +01:00 |
|
Dennis Andersen
|
8700824d12
|
Gamlogic - Merge with Linda
|
2013-12-17 14:32:57 +01:00 |
|
Dennis Andersen
|
097fa1da34
|
GameLogic - Pre merge with Linda
|
2013-12-17 14:15:20 +01:00 |
|
Linda Andersson
|
9d722bced3
|
GL - recieve messages from server
|
2013-12-17 13:39:10 +01:00 |
|
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 |