lanariel
|
431faff684
|
Merge Conficts btween projects
|
2014-02-14 11:17:30 +01:00 |
Pontus Fransson
|
30317ec365
|
Moved project to Stand alone server folder.
|
2014-02-14 10:59:01 +01:00 |
Pontus Fransson
|
5579b8a73c
|
Merge branch 'StandaloneServer' of https://github.com/dean11/Danbias into StandaloneServer
|
2014-02-14 10:49:04 +01:00 |
Pontus Fransson
|
e7cd44e75e
|
Server - Added CLI project
|
2014-02-14 10:48:49 +01:00 |
lanariel
|
4f849bddb3
|
Folder and Launcher Added
|
2014-02-14 10:46:23 +01:00 |
Dander7BD
|
78f47cd3ae
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
Code/Game/GameLogic/Portal.cpp
|
2014-02-14 10:34:00 +01:00 |
Dander7BD
|
de6c5a1185
|
Merge remote-tracking branch 'origin/Camera' into Camera-Merge-buffer
|
2014-02-14 10:32:56 +01:00 |
Dander7BD
|
76f0b712b1
|
Revert this
added printout of mouse state values in MainState
|
2014-02-14 10:32:25 +01:00 |
Dander7BD
|
5eec9fdd75
|
compilation fix
|
2014-02-14 10:11:39 +01:00 |
Erik Persson
|
5defe7c0f7
|
GL - fixed compile errors
|
2014-02-14 10:08:29 +01:00 |
Dander7BD
|
14661a86f8
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
Code/Game/DanBiasGame/GameClientState/GameState.cpp
|
2014-02-14 10:02:25 +01:00 |
Erik Persson
|
59697bfcea
|
GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction
|
2014-02-14 09:59:26 +01:00 |
Dander7BD
|
f6d97054cf
|
Merge remote-tracking branch 'origin/Camera' into Camera-Merge-buffer
|
2014-02-14 09:55:07 +01:00 |
Dander7BD
|
b9895f8c7f
|
All states fix
All new compilation errors dealt with
|
2014-02-14 09:54:05 +01:00 |
Dander7BD
|
d4139e265e
|
MainState fix
new compilation errors dealt with
|
2014-02-14 09:46:17 +01:00 |
Pontus Fransson
|
06ae4d29dd
|
GL - Fixed some warnings.
|
2014-02-14 09:44:31 +01:00 |
Dander7BD
|
49fc55be60
|
Textfield and Bunch of fixes
|
2014-02-14 09:40:53 +01:00 |
lindaandersson
|
2dee9dd084
|
GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content.
|
2014-02-13 16:33:26 +01:00 |
Dander7BD
|
3b225ea054
|
Merge
|
2014-02-13 15:32:54 +01:00 |
Dander7BD
|
805f90d926
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
Code/Game/DanBiasGame/GameClientState/LoginState.cpp
|
2014-02-13 15:25:07 +01:00 |
Dander7BD
|
3139d6d409
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
|
2014-02-13 15:21:49 +01:00 |
Pontus Fransson
|
d01acbcbe0
|
Misc - Added text and textcolor to buttons, seperate render function.
|
2014-02-13 15:21:19 +01:00 |
Pontus Fransson
|
95e08e84c3
|
Network - Overloaded Connect in NetworkClient to use std::wstring.
|
2014-02-13 15:21:19 +01:00 |
Dander7BD
|
cccaf68672
|
premerge
|
2014-02-13 15:21:02 +01:00 |
Dander7BD
|
d705e73dc5
|
Added LobbyAdminState + other stuff
|
2014-02-13 13:30:14 +01:00 |
Dander7BD
|
d60fd65805
|
Overhaul LanMenuState
|
2014-02-13 10:14:44 +01:00 |
Erik Persson
|
bd6b531418
|
GL - added Portal and started on crystalformation
|
2014-02-13 09:58:25 +01:00 |
Dander7BD
|
6c667f32cd
|
some fixes
|
2014-02-13 09:45:45 +01:00 |
Dander7BD
|
c2f67f6f77
|
Merge branch 'Camera-test-merge' into Camera
Conflicts:
Code/Misc/EventHandler/EventHandler.cpp
|
2014-02-13 08:49:45 +01:00 |
Dander7BD
|
45f6d983ad
|
Merge remote-tracking branch 'origin/GameLogic' into Camera-test-merge
Conflicts:
Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/DanBiasGame/GameClientState/LoginState.cpp
|
2014-02-13 08:48:34 +01:00 |
Dander7BD
|
8744c751a8
|
resized buttons
|
2014-02-13 08:43:47 +01:00 |
Dander7BD
|
5d4d66cf06
|
stuff
|
2014-02-12 17:20:42 +01:00 |
Dander7BD
|
63bc360645
|
stuff
|
2014-02-12 16:31:15 +01:00 |
Pontus Fransson
|
74d28d1f62
|
Misc - Changed to MouseInput struct in EventHandler update.
|
2014-02-12 15:44:27 +01:00 |
Pontus Fransson
|
7a218c61d8
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 15:12:28 +01:00 |
Pontus Fransson
|
b9c4fe1849
|
GL - Eventhandler does not delete collections any more.
|
2014-02-12 15:12:01 +01:00 |
Dander7BD
|
587fe62b8e
|
Removed obosolete functions
|
2014-02-12 15:06:08 +01:00 |
Sam Mario Svensson
|
573a0109e3
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
Code/Game/GameLogic/GameLogicStates.h
Code/Game/GameLogic/JumpPad.cpp
Code/Game/GameLogic/JumpPad.h
|
2014-02-12 15:03:40 +01:00 |
lanariel
|
492205b24a
|
Merge branch 'Camera' of https://github.com/dean11/Danbias into Camera
|
2014-02-12 15:02:57 +01:00 |
lanariel
|
20c4833126
|
Fix start render
|
2014-02-12 15:02:29 +01:00 |
Dander7BD
|
9d9481b87a
|
stuff
|
2014-02-12 14:52:31 +01:00 |
Sam Mario Svensson
|
64b2d688bd
|
Försök till merge men det är cp
|
2014-02-12 14:48:58 +01:00 |
Erik Persson
|
6cbec3e2ac
|
GL - jumppad testing
|
2014-02-12 14:45:10 +01:00 |
Dander7BD
|
5ff8661843
|
Bugs and Compilation errors dealt with
|
2014-02-12 14:33:56 +01:00 |
Erik Persson
|
14d492f22e
|
changes in massdriver
|
2014-02-12 14:12:48 +01:00 |
lindaandersson
|
7c44e8ba17
|
GL - added jumppad model and rigidbody
|
2014-02-12 14:12:47 +01:00 |
Robin Engman
|
5e1bc2264c
|
Fixed set position
|
2014-02-12 14:10:17 +01:00 |
Erik Persson
|
b95e1d6b7a
|
changes in massdriver
|
2014-02-12 14:00:53 +01:00 |
Erik Persson
|
8f627f8a71
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-12 13:57:01 +01:00 |
Robin Engman
|
777c1183c5
|
Fixed set transformation
|
2014-02-12 13:55:43 +01:00 |