27aad0d86f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-19 11:58:54 +01:00
ba6f7114b5
GL - added id in object, vector
2013-12-19 11:58:42 +01:00
e68001da0e
testing updated
...
message to client about object creation, message to client about player
movement
2013-12-19 11:46:11 +01:00
057dce0aca
GL - merge errors
2013-12-19 10:31:59 +01:00
13430f31fc
GL - merge and some more protocols
2013-12-19 10:22:32 +01:00
0ea08fbd54
gamesession testing
2013-12-19 10:21:03 +01:00
a4907c8e2e
GL - control protocol added
2013-12-18 15:28:47 +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
0c98e2847d
GL - added some protocols
2013-12-18 12:18:01 +01:00
e16c939285
GL - using window manager, fixed consistent linking in danBiasGame
2013-12-18 10:47:30 +01:00
e9c5a49778
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:44:18 +01:00
347b546566
GameLogic - some minor fixes
2013-12-18 08:44:10 +01:00
2daf93987a
team fix
2013-12-18 08:41:31 +01:00
1eceb6095f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:37:55 +01:00
bf5cc69ff7
GameLogic - Added Postbox system to netsession
2013-12-18 08:37:45 +01:00
4d7be753c5
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:32:20 +01:00
8173f3818d
gamelogic update and added some level design elements
...
teammanager, team,
2013-12-18 08:30:58 +01:00
8700824d12
Gamlogic - Merge with Linda
2013-12-17 14:32:57 +01:00
097fa1da34
GameLogic - Pre merge with Linda
2013-12-17 14:15:20 +01:00
9d722bced3
GL - recieve messages from server
2013-12-17 13:39:10 +01:00
8667e14afb
Merged with Linda after merge conflicts
2013-12-17 10:28:44 +01:00
4650615a61
Gamelogic - Pre merge with Linda
2013-12-17 10:25:34 +01:00
5d1d64bebb
GL - trying to send move protocol
2013-12-17 10:07:46 +01:00
dc3221ee11
GL - set pos function for C_models
2013-12-16 11:08:10 +01:00
b351a7bac4
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-16 10:02:41 +01:00
6bfe7711ab
Gamelogic - Modified gameprotocol id:s
2013-12-16 10:02:30 +01:00
b60166a6e8
GL - connect to server, need right IP
2013-12-16 09:55:51 +01:00
7cda07507a
GameLogic - Pre merge with Netowkr
2013-12-16 09:50:23 +01:00
fa1473455f
GL - added C_obj files, client obj in game state to send input
2013-12-16 09:45:12 +01:00
34d79d1207
Gamelogic - Forgot some stuff
2013-12-16 09:09:54 +01:00
9eb8fcba40
Gamelogic - Publication to others...
2013-12-16 09:00:11 +01:00
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +01:00
8b1c2b91e8
Fixed some craches and stuff
2013-12-13 23:47:16 +01:00
c41f5dda3f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-13 12:03:04 +01:00
7c1d19946d
GL - Connection to network in clinet
2013-12-13 12:02:49 +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
4617523f8b
Gamelogic - Commit because branch switch
2013-12-12 20:32:54 +01:00
a3e4262c08
Merge with Other part of gamelogic(DanbiasGame)
2013-12-12 14:44:06 +01:00
71d31db884
GAMELOGIC - Fixed a minor major huge issue with no problems
2013-12-12 14:37:35 +01:00
693b9df928
Some wierd stuff is going on here
2013-12-12 12:54:08 +01:00
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +01:00
9b9a92556a
Pre-merge with network, (again)
2013-12-12 12:17:39 +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
af7f0e01a8
Pre-network merge, (again)
2013-12-12 10:36:55 +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
Linda Andersson
Erik Persson
Dennis Andersen