Dander7BD
|
88341eaff7
|
Fixed incorrect settings for vld in some projects
Now links well with x64 as well
|
2014-02-12 13:14:28 +01:00 |
lindaandersson
|
25590566d1
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 13:13:40 +01:00 |
Erik Persson
|
b34df93e49
|
GL - Massdriver updates
|
2014-02-12 13:12:51 +01:00 |
|
lindaandersson
|
57ef395bd2
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 13:11:43 +01:00 |
|
lindaandersson
|
e8536cc5d4
|
GL - removed before collision event, sending look and right dir to server
|
2014-02-12 13:11:35 +01:00 |
|
Erik Persson
|
26a6bde42a
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-12 12:43:08 +01:00 |
|
Erik Persson
|
93453529b7
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-12 12:39:11 +01:00 |
Robin Engman
|
15cc7cb85e
|
Fixed collision for object not in world
|
2014-02-12 12:38:52 +01:00 |
|
Erik Persson
|
6bbb988268
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-12 12:37:02 +01:00 |
|
Robin Engman
|
1841685edb
|
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GamePhysics
|
2014-02-12 12:34:04 +01:00 |
|
lindaandersson
|
cc4e3f947c
|
GL - playermovement fixed, can walk in diagonal directions
|
2014-02-12 12:16:16 +01:00 |
|
Dander7BD
|
134994447f
|
Fixed compilation error
|
2014-02-12 12:11:23 +01:00 |
lanariel
|
da5b9c7306
|
Nomal Mapping For TA
|
2014-02-12 12:05:27 +01:00 |
|
Dander7BD
|
d21a03f621
|
Merge remote-tracking branch 'origin/GamePhysics' into Camera
|
2014-02-12 11:56:02 +01:00 |
|
Dander7BD
|
295568d5e7
|
Fixed incorrect project settings
|
2014-02-12 11:54:47 +01:00 |
|
Dander7BD
|
377c752c46
|
Fixed Target Build table in solution file
|
2014-02-12 11:50:36 +01:00 |
|
Dander7BD
|
786c6bb3c1
|
Merge remote-tracking branch 'origin/GamePhysics' into Camera
|
2014-02-12 11:45:48 +01:00 |
|
lindaandersson
|
10c0019c02
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 11:36:19 +01:00 |
|
lindaandersson
|
fa16f71a26
|
GL - forgot to commit files
|
2014-02-12 11:36:08 +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 |
|
Erik Persson
|
3a80a71143
|
GL - working on weapon
|
2014-02-12 11:32:30 +01:00 |
|
Dander7BD
|
6becd58833
|
DanBiasGame_Impl overhauled
+ compilation errorfixes
|
2014-02-12 11:19:25 +01:00 |
|
Erik Persson
|
9f64a1b441
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-12 11:03:33 +01:00 |
|
Robin Engman
|
5d29979875
|
Fixed which body to send
|
2014-02-12 10:58:05 +01:00 |
|
Erik Persson
|
7394f68769
|
GL - fixed what some asshole did in weapon
|
2014-02-12 10:57:43 +01:00 |
|
Erik Persson
|
1db41a863b
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-12 10:44:13 +01:00 |
|
Erik Persson
|
0d643a890d
|
GL - massdriver
|
2014-02-12 10:43:41 +01:00 |
|
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 |