dean11
|
af7f0e01a8
|
Pre-network merge, (again)
|
2013-12-12 10:36:55 +01:00 |
Erik Persson
|
c801ab829a
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
Conflicts:
Bin/Content/Shaders/TextureDebug.cso
|
2013-12-12 10:10:52 +01:00 |
|
Erik Persson
|
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 |
|
Erik Persson
|
e11d7d94f7
|
updated the weapon system, collisionManager and redid the "object" heirarki
|
2013-12-12 09:36:14 +01:00 |
|
dean11
|
fd3776a53b
|
GameLogic - Pre-network merge
|
2013-12-12 09:33:59 +01:00 |
Linda Andersson
|
22665bc44b
|
GL - started using network and protocols for sending/recieveing
|
2013-12-11 12:14:00 +01:00 |
|
Linda Andersson
|
bb789faa67
|
GL - merge with network - fixed dependencies in launcher project
|
2013-12-11 09:00:36 +01:00 |
|
Linda Andersson
|
465ea1bd19
|
GL - soleved merge errors in project files
|
2013-12-10 11:50:35 +01:00 |
|
Linda Andersson
|
78f20e04a1
|
GL - moved object files to Obj
|
2013-12-10 11:27:20 +01:00 |
|
Linda Andersson
|
f0181ad9f4
|
GL - fixed defines in headers - more structure for states
|
2013-12-10 11:26:18 +01:00 |
|
Erik Persson
|
4b9f2671bf
|
updated weapon
|
2013-12-10 11:17:25 +01:00 |
|
Erik Persson
|
58c3371edd
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-10 09:57:13 +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
|
1f172b422a
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-09 12:05:30 +01:00 |
|
Linda Andersson
|
ea593743ad
|
GL - added UI object
|
2013-12-09 12:01:36 +01:00 |
|
dean11
|
a45ffb2e40
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2013-12-09 11:58:44 +01:00 |
|
dean11
|
fbd95a7109
|
GAMELOGIC - Added a protocol api
|
2013-12-09 11:57:34 +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 |
|
Linda Andersson
|
b331ce1a1f
|
GL - started working with client application
|
2013-12-06 10:38:43 +01:00 |
|
Erik Persson
|
63addde51e
|
made "interfaces" of most classes
|
2013-12-05 11:50:39 +01:00 |
|
dean11
|
1cb880a66e
|
GameLogic - Fixed the window class
|
2013-12-04 15:59:44 +01:00 |
|
dean11
|
b35ffdecfd
|
GameLogic - Merged with DanbiasGame project
|
2013-12-04 11:40:22 +01:00 |
|
dean11
|
64a8089e54
|
GameLogic - Worked on server
|
2013-12-04 11:37:26 +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 |