Dander7BD
|
af85a6efdc
|
Compiler fixes in State classes
|
2014-02-12 10:43:06 +01:00 |
Erik Persson
|
5e4532d50e
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-12 10:34:56 +01:00 |
Robin Engman
|
2a214f5305
|
Added cone to apply effect
|
2014-02-12 10:31:50 +01:00 |
|
Robin Engman
|
f0178cf558
|
Added apply effect functionality
|
2014-02-12 10:23:17 +01:00 |
|
Erik Persson
|
3324da528d
|
GFERIK - added icollideable cone
|
2014-02-12 10:16:00 +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 |
|
Dander7BD
|
fdb7a7e1b6
|
Added General Protocol to DataRecieved overloads
|
2014-02-12 09:54:33 +01:00 |
|
Pontus Fransson
|
d4b7fbf1b4
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 09:52:46 +01:00 |
|
Pontus Fransson
|
0bae7b9c6b
|
Misc - Fixed a few errors that can occur
|
2014-02-12 09:50:09 +01:00 |
|
Dander7BD
|
6bf7bc898e
|
some more of those overhauls
|
2014-02-12 09:49:08 +01:00 |
lindaandersson
|
8c1f1e6608
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 09:32:22 +01:00 |
lanariel
|
e6316f3239
|
removed some old stuff, respect animation looping state
|
2014-02-12 09:32:15 +01:00 |
|
lindaandersson
|
bdc5b5e736
|
GL - fixed graphics, collision with house, locked to 30 fps on client, jump added
|
2014-02-12 09:32:13 +01:00 |
|
lanariel
|
f92bed35f5
|
Colored Text and Tinted Gui elements
|
2014-02-12 09:24:37 +01:00 |
|
Erik Persson
|
d7c381cc85
|
GL- fixed subscription
|
2014-02-12 09:23:25 +01:00 |
|
Dander7BD
|
8dc22c854c
|
Overhaul of LobbyState
|
2014-02-12 09:15:41 +01:00 |
|
Pontus Fransson
|
291e60d7b4
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 09:11:11 +01:00 |
|
Pontus Fransson
|
d0955b2f4e
|
GL - Button delete update.
|
2014-02-12 09:08:38 +01:00 |
|
Dander7BD
|
4d78e30fb8
|
Overhaul of GameState
|
2014-02-12 09:02:44 +01:00 |
|
lindaandersson
|
4c9d62b163
|
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 08:56:39 +01:00 |
|
Robin Engman
|
7541994419
|
Added support for applying impulse
|
2014-02-12 08:50:10 +01:00 |
|
lanariel
|
ebf313ccd6
|
2D transparancy
|
2014-02-12 08:35:21 +01:00 |
|
lindaandersson
|
4a6cd390eb
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 08:26:56 +01:00 |
|
lanariel
|
474744c72a
|
Fixed wierd ambience, 2DText Render and Lighting
|
2014-02-12 08:24:24 +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 |
|
Dander7BD
|
3be98e6647
|
Merge remote-tracking branch 'origin/GameServer' into Camera
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameClientState.h
Code/Game/DanBiasGame/GameClientState/GameState.cpp
|
2014-02-11 14:56:43 +01:00 |
|
Dander7BD
|
0f3c5af04a
|
pre merge
|
2014-02-11 14:47:57 +01:00 |
|
Dander7BD
|
813a97cfbf
|
Merge remote-tracking branch 'origin/GamePhysics' into Camera
|
2014-02-11 14:15:00 +01:00 |
|
Dander7BD
|
46d1fa13e1
|
premerge
|
2014-02-11 14:14:06 +01:00 |
|
Pontus Fransson
|
a99a9b3e2e
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-11 14:13:49 +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 |
|
Dander7BD
|
c3b2c1e912
|
premerge
|
2014-02-11 14:13:24 +01:00 |
|
Dander7BD
|
058eada44c
|
Added missing include lines
|
2014-02-11 14:12:14 +01:00 |
|
Erik Persson
|
89189f93d8
|
asd
|
2014-02-11 14:03:14 +01:00 |
|
Robin Engman
|
5d245d7151
|
Added quaternion to angular axis in Math
|
2014-02-11 14:00:38 +01:00 |
|
Robin Engman
|
1aa66dc79f
|
Quaternion to angular axis complete
|
2014-02-11 13:53:44 +01:00 |
|
lindaandersson
|
d771a5181d
|
GL - rotation and gravity fixed
|
2014-02-11 13:41:38 +01:00 |
|
lindaandersson
|
398be8361b
|
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-11 13:36:49 +01:00 |
|
Robin Engman
|
7075e6add6
|
Gravity well
|
2014-02-11 13:36:14 +01:00 |
|
lanariel
|
f0df377bcd
|
Basic 2d Render + Anim Updates
|
2014-02-11 13:29:19 +01:00 |
|
Dander7BD
|
03ab4affb7
|
Minor fixes
|
2014-02-11 13:27:33 +01:00 |
dean11
|
7c0a597ed3
|
GameServer - Merge with Gamelogic
|
2014-02-11 13:26:51 +01:00 |
|
lindaandersson
|
289439b768
|
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-11 13:22:17 +01:00 |
|
Dander7BD
|
322f752deb
|
Merge remote-tracking branch 'origin/GameServer' into Camera
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
|
2014-02-11 13:21:44 +01:00 |
|
Robin Engman
|
70c388779e
|
Lib change for bullet
|
2014-02-11 13:21:22 +01:00 |
|
lindaandersson
|
f9a4fce5aa
|
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-11 13:12:35 +01:00 |
|
Robin Engman
|
462413b527
|
Added support for gravity change
|
2014-02-11 13:09:46 +01:00 |