Erik Persson
|
9bddfc9ffa
|
changed collision manager
is now a namespace with functions that are to be sent to a rigidbody
|
2013-11-28 09:26:29 +01:00 |
|
Erik Persson
|
b3ec2f3aa1
|
fix
|
2013-11-28 08:41:20 +01:00 |
|
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 |
|
Linda Andersson
|
fb3ae57bbe
|
GL: key input
|
2013-11-27 12:00:44 +01:00 |
|
Linda Andersson
|
5e8e106327
|
add simple input class for testing
|
2013-11-26 11:33:16 +01:00 |
|
Erik Persson
|
97e92f8516
|
GL: debug fix
|
2013-11-26 11:32:00 +01:00 |
|
Erik Persson
|
d87e643777
|
lite saker + debug fönster
|
2013-11-26 11:30:49 +01:00 |
|
Erik Persson
|
5cc6ff81b5
|
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
Conflicts:
Code/GameLogic/Player.cpp
|
2013-11-26 09:26:04 +01:00 |
|
Erik Persson
|
2859588d20
|
added collisionManager
also some changes around the place
|
2013-11-26 09:19:59 +01:00 |
|
Linda Andersson
|
abfd3116ca
|
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
|
2013-11-26 09:17:25 +01:00 |
|
Linda Andersson
|
f78027a1cf
|
dll - working
fix in unique pointer and array - missing copy constructor
|
2013-11-26 09:16:51 +01:00 |
|
Erik Persson
|
220f1da8b6
|
added GameMode class to level
|
2013-11-26 08:56:31 +01:00 |
|
Erik Persson
|
e2c90a467b
|
reference manager for physics communication
|
2013-11-25 12:52:07 +01:00 |
|
Linda Andersson
|
0db45bd63f
|
game_dll_usage
|
2013-11-25 12:36:25 +01:00 |
|
Linda Andersson
|
de9a1cae56
|
Game_Dll_export
|
2013-11-25 12:33:27 +01:00 |
|
Linda Andersson
|
0e2401ef69
|
test with physics dll
|
2013-11-25 11:49:40 +01:00 |
|
Linda Andersson
|
15a55f76a3
|
test with physic
|
2013-11-25 11:03:06 +01:00 |
|
Linda Andersson
|
2408bf49a1
|
projectfiles
|
2013-11-21 12:31:31 +01:00 |
|
Linda Andersson
|
b38545962b
|
GL test main project: Drawing a object
|
2013-11-21 12:05:39 +01:00 |
|
Linda Andersson
|
96245fc52e
|
merged with wapon, static and dynamic
|
2013-11-20 16:01:39 +01:00 |
|
Linda Andersson
|
28da371b80
|
Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
|
2013-11-20 15:47:31 +01:00 |
|
Linda Andersson
|
68d516cc86
|
adding IGame interface
|
2013-11-20 15:47:11 +01:00 |
|
Erik Persson
|
717b425147
|
split worldObject into dynamic and static types
|
2013-11-20 14:25:37 +01:00 |
|
Erik Persson
|
abf81b7c3c
|
added weapon and connected it to player
changed player
|
2013-11-20 14:18:31 +01:00 |
|
Erik Persson
|
ce9746f10c
|
worldObject update
|
2013-11-20 12:23:45 +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 |
|
Erik Persson
|
33f9a86945
|
Added Game
cpp and h files
|
2013-11-19 09:52:36 +01:00 |
dean11
|
33e7afabcd
|
Restructured folders to give a flexible solution for dependencies and added to ignore list
|
2013-11-18 15:41:09 +01:00 |