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
54240b217c
GameLogic - game interface updated(not finnished)
...
förlåt dennis
2014-01-14 10:28:12 +01:00
97cba4248d
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
2014-01-14 09:25:22 +01:00
eb9360377d
GameServer - Merged with other half of GameLogic
2014-01-13 12:50:27 +01:00
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
792f78c34a
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
2014-01-13 12:11:45 +01:00
059b3dd5e4
GameLogic - Basic game interface made (functions not yet implemented)
2014-01-10 12:33:15 +01:00
586031aa94
GameLogic - making sure GameLogic uses the new physics api
2014-01-10 10:08:42 +01:00
52ba5602d5
GameLogic - player now using some of the new phys api
2014-01-09 13:06:18 +01:00
48b9189a03
Revert "state"
...
This reverts commit 4a07586076
2014-01-09 12:51:17 +01:00
4a07586076
state
2014-01-09 12:43:32 +01:00
42de421904
Master - Modified igore
2014-01-08 13:07:55 +01:00
ed202a15a2
Worked over the holidays
2014-01-07 10:26:09 +01:00
0065779205
Added comments where the physic generated errors due to big patch
2013-12-21 17:37:30 +01:00
be39365a27
Gamelogic - Merged with existing stuff
2013-12-20 09:47:24 +01:00
15d6ac8cf9
GameLogic - Final sprint2 merge
2013-12-20 09:42:02 +01:00
f4232ca0b4
gamplay code in gamesession
2013-12-20 08:59:59 +01:00
694d5576d7
GameLogic - Pre-merge with physics
2013-12-19 15:35:49 +01:00
bb61b83392
GL - merge
2013-12-19 13:46:01 +01:00
0570d76e24
Modified part of some player states
2013-12-19 12:41:37 +01:00
934aa6e45a
Merge
2013-12-19 12:34:59 +01:00
beb116e964
Fixed some threafing and stuff
2013-12-19 12:32:23 +01:00
0ea08fbd54
gamesession testing
2013-12-19 10:21:03 +01:00
92b3525587
GameLogic - Cleanup after erik ;)
2013-12-18 13:12:11 +01:00
33d045de1a
GameLogic - Merge with Erik
2013-12-18 13:10:47 +01:00
8721224d7c
GameLogic - Added alot of functionality to Game related parts
2013-12-18 13:07:10 +01:00
f5490bf111
using a global id in object
2013-12-18 13:01:25 +01:00
2daf93987a
team fix
2013-12-18 08:41:31 +01:00
8173f3818d
gamelogic update and added some level design elements
...
teammanager, team,
2013-12-18 08:30:58 +01:00
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +01:00
f1f9f4d20a
added include string in level.h
2013-12-13 11:11:51 +01:00
7817003db8
updated h.files
...
description, started with level concept
2013-12-13 11:09:09 +01:00
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +01:00
8f36f64c4f
updated AttatchmentMassDriver and CollisionManager
...
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.
CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
2013-12-12 12:16:13 +01:00
c801ab829a
Merge remote-tracking branch 'origin/Physics' into GameLogic
...
Conflicts:
Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +01:00
2424b51c3e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Bin/Content/Shaders/DebugVertex.cso
2013-12-12 09:39:27 +01:00
e11d7d94f7
updated the weapon system, collisionManager and redid the "object" heirarki
2013-12-12 09:36:14 +01:00
465ea1bd19
GL - soleved merge errors in project files
2013-12-10 11:50:35 +01:00
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +01:00
4134836405
GL - added client objects
...
- no memory leaks in client
2013-12-09 11:05:47 +01:00
5416df6d86
Merge remote-tracking branch 'origin/GameLogic' into GameLogic
2013-12-09 09:24:01 +01:00
38a1602d3f
GL - merge with graphics api. Lobby and game state.
2013-12-09 09:23:39 +01:00
63addde51e
made "interfaces" of most classes
2013-12-05 11:50:39 +01:00
e658071643
GL- open a red window from lancher project
2013-12-04 11:32:43 +01:00
3d973c16a2
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-03 12:09:22 +01:00
a852e8eab4
Created the game modules
2013-12-03 12:07:37 +01:00
Erik Persson
Dennis Andersen
lindaandersson