lindaandersson
|
a168328a44
|
GL - movement with physics working!!
|
2014-01-16 12:26:14 +01:00 |
|
lindaandersson
|
8557559b9b
|
GL - going to merge
|
2014-01-15 11:57:36 +01:00 |
|
lindaandersson
|
0ffe26c134
|
GL - Merge client with gameserver
|
2014-01-15 08:18:06 +01:00 |
|
lindaandersson
|
32e64c0dbb
|
GL - moved reciever struct to a separate file
|
2014-01-14 10:25:49 +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 |
|
Dennis Andersen
|
eb9360377d
|
GameServer - Merged with other half of GameLogic
|
2014-01-13 12:50:27 +01:00 |
|
Dennis Andersen
|
ce89e6bc98
|
GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions
|
2014-01-13 12:44:33 +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
|
2b5a5b2fbd
|
GameServer - Merge with gamelogic
|
2014-01-10 23:36:03 +01:00 |
|
lindaandersson
|
c541d032e7
|
GL - can move a obj on the client via the server
|
2014-01-10 10:47:54 +01:00 |
|
Dennis Andersen
|
a02a32c029
|
Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder
|
2014-01-09 14:18:01 +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 |
|
Linda Andersson
|
16715f3f2a
|
GL - push before merge
|
2013-12-20 11:27:04 +01:00 |
|
Dennis Andersen
|
be39365a27
|
Gamelogic - Merged with existing stuff
|
2013-12-20 09:47:24 +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 |
|
Linda Andersson
|
ecf1c5fc36
|
GL - delete timer
|
2013-12-19 14:32:52 +01:00 |
|
Linda Andersson
|
ea59c25119
|
GL - mergeing error
|
2013-12-19 13:49:46 +01:00 |
|
Linda Andersson
|
bb61b83392
|
GL - merge
|
2013-12-19 13:46:01 +01:00 |
|
Dennis Andersen
|
d68fd63b25
|
Added server launcher
|
2013-12-19 13:35:56 +01:00 |
|
Linda Andersson
|
ba6f7114b5
|
GL - added id in object, vector
|
2013-12-19 11:58:42 +01:00 |
|
Linda Andersson
|
13430f31fc
|
GL - merge and some more protocols
|
2013-12-19 10:22:32 +01:00 |
|
Linda Andersson
|
a4907c8e2e
|
GL - control protocol added
|
2013-12-18 15:28:47 +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 |
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 |
|
Linda Andersson
|
9d722bced3
|
GL - recieve messages from server
|
2013-12-17 13:39:10 +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 |
|
Linda Andersson
|
dc3221ee11
|
GL - set pos function for C_models
|
2013-12-16 11:08:10 +01:00 |
|
Linda Andersson
|
b60166a6e8
|
GL - connect to server, need right IP
|
2013-12-16 09:55:51 +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 |
|
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
|
7c1d19946d
|
GL - Connection to network in clinet
|
2013-12-13 12:02:49 +01:00 |
|
dean11
|
a3e4262c08
|
Merge with Other part of gamelogic(DanbiasGame)
|
2013-12-12 14:44:06 +01:00 |
|
dean11
|
fd3776a53b
|
GameLogic - Pre-network merge
|
2013-12-12 09:33:59 +01:00 |
|
Linda Andersson
|
22665bc44b
|
GL - started using network and protocols for sending/recieveing
|
2013-12-11 12:14:00 +01:00 |
|
Linda Andersson
|
bb789faa67
|
GL - merge with network - fixed dependencies in launcher project
|
2013-12-11 09:00:36 +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 |
|
Linda Andersson
|
ea593743ad
|
GL - added UI object
|
2013-12-09 12:01:36 +01:00 |
|
Linda Andersson
|
4134836405
|
GL - added client objects
- no memory leaks in client
|
2013-12-09 11:05:47 +01:00 |
|
Linda Andersson
|
38a1602d3f
|
GL - merge with graphics api. Lobby and game state.
|
2013-12-09 09:23:39 +01:00 |
|
Linda Andersson
|
b331ce1a1f
|
GL - started working with client application
|
2013-12-06 10:38:43 +01:00 |
|
Linda Andersson
|
e658071643
|
GL- open a red window from lancher project
|
2013-12-04 11:32:43 +01:00 |