Commit Graph

160 Commits

Author SHA1 Message Date
Linda Andersson 465ea1bd19 GL - soleved merge errors in project files 2013-12-10 11:50:35 +01:00
Erik Persson 4b9f2671bf updated weapon 2013-12-10 11:17:25 +01:00
Erik Persson 97e0b1298a added functionallity to player and weapon, started on the weapon design. 2013-12-10 09:57:05 +01:00
Linda Andersson 4134836405 GL - added client objects
-  no memory leaks in client
2013-12-09 11:05:47 +01:00
Linda Andersson 5416df6d86 Merge remote-tracking branch 'origin/GameLogic' into GameLogic 2013-12-09 09:24:01 +01:00
Linda Andersson 38a1602d3f GL - merge with graphics api. Lobby and game state. 2013-12-09 09:23:39 +01:00
Erik Persson 63addde51e made "interfaces" of most classes 2013-12-05 11:50:39 +01:00
Linda Andersson e658071643 GL- open a red window from lancher project 2013-12-04 11:32:43 +01:00
dean11 3d973c16a2 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-03 12:09:22 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00