Erik Persson
|
899e833fca
|
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
Conflicts:
Bin/DLL/GamePhysics_x86D.dll
Bin/DLL/GamePhysics_x86D.exp
Bin/DLL/GamePhysics_x86D.ilk
Bin/DLL/GamePhysics_x86D.pdb
Code/GameLogic/Object.cpp
Code/GameLogic/Object.h
|
2013-11-28 08:37:56 +01:00 |
|
Erik Persson
|
acd8681489
|
asd
|
2013-11-28 08:33:29 +01:00 |
Linda Andersson
|
1a5d1217a3
|
GL could draw an object but now adding DanBiasGame - problems with dll!
|
2013-11-27 16:17:47 +01:00 |
|
Erik Persson
|
d87e643777
|
lite saker + debug fönster
|
2013-11-26 11:30:49 +01:00 |
|
Linda Andersson
|
15a55f76a3
|
test with physic
|
2013-11-25 11:03:06 +01:00 |
|
Linda Andersson
|
b38545962b
|
GL test main project: Drawing a object
|
2013-11-21 12:05:39 +01:00 |
|
Erik Persson
|
abf81b7c3c
|
added weapon and connected it to player
changed player
|
2013-11-20 14:18:31 +01:00 |
|
Erik Persson
|
27e5b07ef6
|
object and worldObject
|
2013-11-19 18:35:35 +01:00 |
|
Erik Persson
|
ea0f3f05b4
|
added level and player
|
2013-11-19 11:07:14 +01:00 |