Dennis Andersen
|
310ed3dfc5
|
GameServer - Multiplayer now working properly
|
2014-02-09 16:42:26 +01:00 |
|
Dennis Andersen
|
201a07f0dc
|
GameServer - Merged with GameLogic
|
2014-02-05 15:16:31 +01:00 |
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
|
Dennis Andersen
|
b7f550859d
|
GameServer - Merge with GameLogic
|
2014-02-04 22:13:07 +01:00 |
|
Dennis Andersen
|
de8c76f051
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:07:10 +01:00 |
|
lindaandersson
|
a3886c4f1f
|
GL - added models and started to fix camera movement
|
2014-02-03 15:52:00 +01:00 |
|
Dennis Andersen
|
a673e64694
|
GameServer - Pre-merge with graphic
|
2014-01-31 22:52:52 +01:00 |
|
Dennis Andersen
|
40f0fe61f0
|
GameServer - Fixed Protocols not recieveing properly and fixed the resource loader.
|
2014-01-31 08:41:08 +01:00 |
|
Dennis Andersen
|
09f39ec26d
|
GameServer - Added acces directly to clients in network session
|
2014-01-30 14:15:25 +01:00 |
|
lindaandersson
|
d41ddca45d
|
Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-30 11:13:42 +01:00 |
|
Dennis Andersen
|
05740665da
|
GameServer - Fixed a small error regarding not reaching some data
|
2014-01-30 11:11:04 +01:00 |
|
lindaandersson
|
a249e7ede9
|
GL - merge with new serverAPI
|
2014-01-30 10:57:44 +01:00 |
|
lindaandersson
|
09693c7f35
|
GL - merge
|
2014-01-30 09:40:58 +01:00 |
|
lindaandersson
|
7d9d8e4615
|
GL - added jump
|
2014-01-30 09:07:56 +01:00 |
|
Dennis Andersen
|
fa29cd7307
|
GameServer - Merged with GameLogic
|
2014-01-30 00:19:00 +01:00 |
|
Dennis Andersen
|
1e89bb4e30
|
Fixed protocol messaging. Known crash when recieveing protocol on server after a while...
|
2014-01-29 15:01:14 +01:00 |
|
Dennis Andersen
|
36f057d2cc
|
Broekn branch not broekn more
|
2014-01-29 10:18:01 +01:00 |
|
Dennis Andersen
|
91e825dbfb
|
Broekn stuff to tobias
|
2014-01-28 09:00:02 +01:00 |
|
lindaandersson
|
4085a5f5e2
|
GL - added shot protocol
|
2014-01-27 13:56:31 +01:00 |
|
lindaandersson
|
8c297d1e9b
|
GL - starting to send lookdir to server
|
2014-01-23 09:24:55 +01:00 |
|
Dennis Andersen
|
22a5db97f8
|
Added final protocols, and a bit of support for them on server side
|
2014-01-22 15:22:52 +01:00 |
|
Dennis Andersen
|
50c09547f3
|
GameServer - Added protocols and stuff
|
2014-01-21 14:32:42 +01:00 |
|
Dennis Andersen
|
f7f59e8ac8
|
GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client
|
2014-01-21 09:52:48 +01:00 |
|
Dennis Andersen
|
6c3c234be1
|
GameLogic - pree-sprint merge
|
2014-01-20 15:47:52 +01:00 |
|
lindaandersson
|
a168328a44
|
GL - movement with physics working!!
|
2014-01-16 12:26:14 +01:00 |
|
lindaandersson
|
0ffe26c134
|
GL - Merge client with gameserver
|
2014-01-15 08:18:06 +01:00 |
|
Dennis Andersen
|
97cba4248d
|
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
|
2014-01-14 09:25:22 +01:00 |
|
lindaandersson
|
04c5898f4e
|
GL - sending string and createOBJ working
|
2014-01-14 09:24:55 +01:00 |
|
lindaandersson
|
792f78c34a
|
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
|
2014-01-13 12:11:45 +01:00 |
|
Dennis Andersen
|
42de421904
|
Master - Modified igore
|
2014-01-08 13:07:55 +01:00 |
|
Dennis Andersen
|
ed202a15a2
|
Worked over the holidays
|
2014-01-07 10:26:09 +01:00 |
|
Dennis Andersen
|
15d6ac8cf9
|
GameLogic - Final sprint2 merge
|
2013-12-20 09:42:02 +01:00 |
|
Dennis Andersen
|
694d5576d7
|
GameLogic - Pre-merge with physics
|
2013-12-19 15:35:49 +01:00 |
|
Dennis Andersen
|
934aa6e45a
|
Merge
|
2013-12-19 12:34:59 +01:00 |
|
Dennis Andersen
|
beb116e964
|
Fixed some threafing and stuff
|
2013-12-19 12:32:23 +01:00 |
Erik Persson
|
e68001da0e
|
testing updated
message to client about object creation, message to client about player
movement
|
2013-12-19 11:46:11 +01:00 |
|
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
|
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 |
|
Linda Andersson
|
0c98e2847d
|
GL - added some protocols
|
2013-12-18 12:18:01 +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 |
|
dean11
|
6bfe7711ab
|
Gamelogic - Modified gameprotocol id:s
|
2013-12-16 10:02:30 +01:00 |
|
dean11
|
7cda07507a
|
GameLogic - Pre merge with Netowkr
|
2013-12-16 09:50:23 +01:00 |
|
dean11
|
9eb8fcba40
|
Gamelogic - Publication to others...
|
2013-12-16 09:00:11 +01:00 |
|
dean11
|
f29f50f830
|
Merged with Gamelogic branch and fixed errors and added features
|
2013-12-14 22:04:42 +01:00 |