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 |
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 |
|
Dander7BD
|
3b225ea054
|
Merge
|
2014-02-13 15:32:54 +01:00 |
|
Pontus Fransson
|
d01acbcbe0
|
Misc - Added text and textcolor to buttons, seperate render function.
|
2014-02-13 15:21:19 +01:00 |
|
Dander7BD
|
cccaf68672
|
premerge
|
2014-02-13 15:21:02 +01:00 |
|
Pontus Fransson
|
74d28d1f62
|
Misc - Changed to MouseInput struct in EventHandler update.
|
2014-02-12 15:44:27 +01:00 |
|
Pontus Fransson
|
b9c4fe1849
|
GL - Eventhandler does not delete collections any more.
|
2014-02-12 15:12:01 +01:00 |
|
Pontus Fransson
|
f2a444507c
|
GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio.
|
2014-02-12 11:35:57 +01:00 |
|
Pontus Fransson
|
8e07475434
|
GL - Buttons is now using one texture per button type. Fixed button state when spamming the button.
|
2014-02-12 10:02:52 +01:00 |
|
Pontus Fransson
|
d0955b2f4e
|
GL - Button delete update.
|
2014-02-12 09:08:38 +01:00 |
|
Pontus Fransson
|
1725f05c4b
|
GUI - GUI testing.
|
2014-02-11 15:06:46 +01:00 |
|
Pontus Fransson
|
696d6997f6
|
GL - Button system done, only need to add 2d rendering to it.
|
2014-02-11 14:13:35 +01:00 |