Dennis Andersen
|
386b27e2f7
|
GameLogic - Merge with sprint2.5
|
2014-01-20 16:17:01 +01:00 |
|
Dennis Andersen
|
1a3c63cda9
|
GameLogic - fixed some minor merging errors
|
2014-01-20 16:02:26 +01:00 |
|
Dennis Andersen
|
ab2a3a3892
|
GameLogic - fixed some minor merging errors
|
2014-01-20 16:01:54 +01:00 |
|
Dennis Andersen
|
6c3c234be1
|
GameLogic - pree-sprint merge
|
2014-01-20 15:47:52 +01:00 |
lindaandersson
|
a1128986d5
|
Merge with Gamle Logic
|
2014-01-20 11:59:43 +01:00 |
Erik Persson
|
ce4c57bab3
|
GL - player inherits dynamicobject instead of object
|
2014-01-20 08:40:41 +01:00 |
|
Erik Persson
|
eaf0ae1479
|
GL - can now compile
|
2014-01-17 08:52:34 +01:00 |
|
lindaandersson
|
7b2be02113
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-16 12:26:33 +01:00 |
|
lindaandersson
|
a168328a44
|
GL - movement with physics working!!
|
2014-01-16 12:26:14 +01:00 |
|
Erik Persson
|
d08e999f07
|
Create level and initiate it with a rigidbody etc
|
2014-01-16 12:08:24 +01:00 |
|
Erik Persson
|
225d8912da
|
GL - make rigidbody level
|
2014-01-16 11:40:29 +01:00 |
|
Erik Persson
|
0080a9f6f2
|
small name changes
|
2014-01-16 11:17:19 +01:00 |
|
Erik Persson
|
567fa229eb
|
small name changes
|
2014-01-16 11:07:45 +01:00 |
|
lindaandersson
|
0c8783ba84
|
GL - merge done
|
2014-01-15 12:02:52 +01:00 |
|
lindaandersson
|
8557559b9b
|
GL - going to merge
|
2014-01-15 11:57:36 +01:00 |
|
Dennis Andersen
|
5f00aa7af7
|
GL - Merge with origin/Gamelogic
|
2014-01-15 11:45:34 +01:00 |
|
Erik Persson
|
208482b0ce
|
GL merge error
|
2014-01-15 11:25:59 +01:00 |
|
Dennis Andersen
|
ceac5ce31d
|
Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic
|
2014-01-15 11:03:25 +01:00 |
|
lindaandersson
|
9a32c44e49
|
GL - Merge branch 'GameLogic'
|
2014-01-15 08:19:35 +01:00 |
|
Dennis Andersen
|
54babfc7c7
|
Gameserver - Merged with Gamelogic
|
2014-01-14 10:38:35 +01:00 |
|
Erik Persson
|
4c1be4d807
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
Code/Game/GameLogic/Game.cpp
|
2014-01-14 10:33:08 +01:00 |
|
Erik Persson
|
54240b217c
|
GameLogic - game interface updated(not finnished)
förlåt dennis
|
2014-01-14 10:28:12 +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 |
|
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 |
|
Erik Persson
|
059b3dd5e4
|
GameLogic - Basic game interface made (functions not yet implemented)
|
2014-01-10 12:33:15 +01:00 |
|
Erik Persson
|
586031aa94
|
GameLogic - making sure GameLogic uses the new physics api
|
2014-01-10 10:08:42 +01:00 |
|
Erik Persson
|
52ba5602d5
|
GameLogic - player now using some of the new phys api
|
2014-01-09 13:06:18 +01:00 |
|
Erik Persson
|
48b9189a03
|
Revert "state"
This reverts commit 4a07586076.
|
2014-01-09 12:51:17 +01:00 |
|
Erik Persson
|
4a07586076
|
state
|
2014-01-09 12:43:32 +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
|
0065779205
|
Added comments where the physic generated errors due to big patch
|
2013-12-21 17:37:30 +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 |
|
Erik Persson
|
f4232ca0b4
|
gamplay code in gamesession
|
2013-12-20 08:59:59 +01:00 |
|
Dennis Andersen
|
694d5576d7
|
GameLogic - Pre-merge with physics
|
2013-12-19 15:35:49 +01:00 |
|
Linda Andersson
|
bb61b83392
|
GL - merge
|
2013-12-19 13:46:01 +01:00 |
|
Dennis Andersen
|
0570d76e24
|
Modified part of some player states
|
2013-12-19 12:41:37 +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
|
0ea08fbd54
|
gamesession testing
|
2013-12-19 10:21:03 +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 |
|
Erik Persson
|
2daf93987a
|
team fix
|
2013-12-18 08:41:31 +01:00 |
|
Erik Persson
|
8173f3818d
|
gamelogic update and added some level design elements
teammanager, team,
|
2013-12-18 08:30:58 +01:00 |
|
dean11
|
f29f50f830
|
Merged with Gamelogic branch and fixed errors and added features
|
2013-12-14 22:04:42 +01:00 |