lindaandersson
|
53f4848ea1
|
GL - merge with graphics. no SSAO. no TextRendering
|
2014-02-14 11:27:52 +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
|
b9c4fe1849
|
GL - Eventhandler does not delete collections any more.
|
2014-02-12 15:12:01 +01:00 |
|
lindaandersson
|
10c0019c02
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 11:36:19 +01:00 |
|
Pontus Fransson
|
f2a444507c
|
GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio.
|
2014-02-12 11:35:57 +01:00 |
|
lindaandersson
|
c1757eef21
|
GL - moving character
|
2014-02-12 11:35:34 +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
|
0bae7b9c6b
|
Misc - Fixed a few errors that can occur
|
2014-02-12 09:50:09 +01:00 |
|
Pontus Fransson
|
d0955b2f4e
|
GL - Button delete update.
|
2014-02-12 09:08:38 +01:00 |
|
Pontus Fransson
|
6fc110c2e8
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-11 15:07:10 +01:00 |
|
Pontus Fransson
|
1725f05c4b
|
GUI - GUI testing.
|
2014-02-11 15:06:46 +01:00 |
|
lindaandersson
|
56205ff774
|
GL - mergeerror with button handling
|
2014-02-11 15:03:27 +01:00 |
|
lindaandersson
|
5ebac80ec1
|
GL - animated character and some textrendering
|
2014-02-11 15:00:52 +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 |
dean11
|
de4ea0a830
|
GameServer - Merged with GameLogic, some stuff is broken
|
2014-02-11 13:03:37 +01:00 |
|
dean11
|
3274727923
|
GameServer - Added more gameplay protocols and structured the old mess
|
2014-02-11 10:21:47 +01:00 |
|
lindaandersson
|
49d29d87a5
|
GL - merge with bullet physics and updated server
|
2014-02-10 14:41:43 +01:00 |
|
lindaandersson
|
c87bab8808
|
GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)
|
2014-02-10 14:00:14 +01:00 |
|
Dennis Andersen
|
14bf3ede86
|
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
|
2014-02-09 18:58:14 +01:00 |
|
lindaandersson
|
91db71fe0e
|
GL - 20 boxes and a house
|
2014-02-05 15:54:48 +01:00 |
|
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
|
lindaandersson
|
e327f64702
|
GL - can play with two characters
|
2014-01-31 16:33:16 +01:00 |
|
lindaandersson
|
57c230d458
|
GL - will merge with physics
|
2014-01-31 13:56:22 +01:00 |
|
lindaandersson
|
0aa39275e3
|
GL - only client with server update server. Update recieverfunction
|
2014-01-30 15:20:35 +01:00 |
|
lindaandersson
|
1ccf98e3eb
|
GL - added loginstate
|
2014-01-30 11:58:44 +01:00 |