lanariel
|
51711b86e3
|
Fixed Animate Skeleton, TODO Fix Skinning
|
2014-02-05 16:00:28 +01:00 |
lindaandersson
|
81d43b59c0
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-05 15:54:56 +01:00 |
|
lindaandersson
|
91db71fe0e
|
GL - 20 boxes and a house
|
2014-02-05 15:54:48 +01:00 |
Pontus Fransson
|
a3cea997ba
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-05 15:47:00 +01:00 |
|
Pontus Fransson
|
b39a670347
|
GL - Updated LevelLoader, works with Fredricks level editor.
|
2014-02-05 15:46:45 +01:00 |
Dennis Andersen
|
201a07f0dc
|
GameServer - Merged with GameLogic
|
2014-02-05 15:16:31 +01:00 |
|
lindaandersson
|
70a2cf27e3
|
GL - almost ok, at least on the top of the world
|
2014-02-05 11:53:38 +01:00 |
|
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
|
lindaandersson
|
30c89ed330
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-05 09:06:44 +01:00 |
|
lindaandersson
|
6818dda2b9
|
GL - testing
|
2014-02-05 09:06:33 +01:00 |
|
Dennis Andersen
|
60736c52fe
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameServer
|
2014-02-04 22:34:07 +01:00 |
|
Dennis Andersen
|
db822fa832
|
GameServer - Merged with gamelogic
|
2014-02-04 22:33:39 +01:00 |
|
Dennis Andersen
|
b7f550859d
|
GameServer - Merge with GameLogic
|
2014-02-04 22:13:07 +01:00 |
Robin Engman
|
98644e3fa0
|
Minimised to potential skinning problem
|
2014-02-04 17:59:04 +01:00 |
Dander7BD
|
fb4025eb1a
|
bug fix
|
2014-02-04 16:56:31 +01:00 |
|
lindaandersson
|
ac278555ea
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 16:39:21 +01:00 |
|
lindaandersson
|
b43902d31e
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 16:39:11 +01:00 |
|
lindaandersson
|
ec4d34b131
|
GL - added error checking
|
2014-02-04 16:39:01 +01:00 |
|
Dander7BD
|
c8e8d3510d
|
Added debug traps
|
2014-02-04 16:38:42 +01:00 |
|
Dander7BD
|
68dc5be9cb
|
added lost rebound deltatime compensation
|
2014-02-04 16:33:52 +01:00 |
|
Dennis Andersen
|
168539da08
|
Gameserver - Fixed minor merging isues
|
2014-02-04 16:27:18 +01:00 |
|
Dennis Andersen
|
b17b542ebc
|
Gameserver - Fixed minor merging isues
|
2014-02-04 16:26:48 +01:00 |
Erik Persson
|
4ad86ae83b
|
GL - Added jumppad(implemented but not tested)
|
2014-02-04 16:24:48 +01:00 |
|
lanariel
|
4de809a952
|
Added Resource support
|
2014-02-04 16:20:42 +01:00 |
|
lindaandersson
|
6e0dd63d64
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 16:11:01 +01:00 |
|
Dander7BD
|
1952ff9aba
|
more fixes of potential bugs in Physics collision handling
|
2014-02-04 16:10:18 +01:00 |
|
lindaandersson
|
d364456189
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 16:08:53 +01:00 |
|
lindaandersson
|
d8c7220569
|
GL - added some testing things in player and more objects to the world
|
2014-02-04 16:08:28 +01:00 |
|
Dennis Andersen
|
de8c76f051
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:07:10 +01:00 |
|
Dennis Andersen
|
61178e2803
|
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
|
2014-02-04 16:06:59 +01:00 |
|
Dander7BD
|
9622d37d3f
|
bug fixes in Physics collision handling
|
2014-02-04 15:43:17 +01:00 |
|
lanariel
|
e13410dced
|
Fixed debug data, points in right direction
Matrix::m 0 index based, not math def
|
2014-02-04 15:06:50 +01:00 |
|
lanariel
|
97a3792bff
|
Anim Test Not working Joints
|
2014-02-04 14:59:51 +01:00 |
|
Pontus Fransson
|
b810fa1586
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 14:31:00 +01:00 |
|
Pontus Fransson
|
8834f6a2ec
|
GL - LevelLoader update.
|
2014-02-04 14:30:45 +01:00 |
|
Erik Persson
|
502d0c8586
|
GL - actually fixed respawning(turned off)
|
2014-02-04 14:07:13 +01:00 |
|
lindaandersson
|
ad16d51f75
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 14:02:03 +01:00 |
|
Dander7BD
|
15798bfca9
|
minor bug found and fixed in rebound
|
2014-02-04 14:00:33 +01:00 |
|
Erik Persson
|
bd9e4599cb
|
GL - fixed respawning and also fixed weapon
|
2014-02-04 13:58:48 +01:00 |
|
Dander7BD
|
9efa4fcb23
|
Commit error fix
for some odd reason Player.cpp change followed the last one
|
2014-02-04 13:08:03 +01:00 |
|
Dander7BD
|
54deef7f2b
|
Project file fixes for GL
|
2014-02-04 13:06:10 +01:00 |
|
lindaandersson
|
9d08ac7b98
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 11:54:44 +01:00 |
|
lindaandersson
|
f88e16c581
|
GL - merge
|
2014-02-04 11:53:40 +01:00 |
|
Erik Persson
|
e859df65d3
|
GL - compiles
|
2014-02-04 11:51:42 +01:00 |
|
lindaandersson
|
e2bac798c4
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 11:50:51 +01:00 |
|
lindaandersson
|
fa02814ca0
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 11:50:40 +01:00 |
|
lindaandersson
|
d54cffee8e
|
GL - camera follows player
|
2014-02-04 11:50:15 +01:00 |
|
Dander7BD
|
e39eb5fb4b
|
RigidBody update adjusted
Spherical and Simple
|
2014-02-04 11:48:50 +01:00 |
|
Pontus Fransson
|
2897305dd0
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 11:36:24 +01:00 |
|
Pontus Fransson
|
1261ed734f
|
GL - Updated level loader.
|
2014-02-04 11:36:10 +01:00 |