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 |
Erik Persson
|
3bf9f59f5a
|
GL - Player dies and respawns
|
2014-02-04 11:13:16 +01:00 |
lindaandersson
|
07e8624807
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 10:39:09 +01:00 |
lindaandersson
|
00400a7d32
|
GL - camera testing
|
2014-02-04 10:38:59 +01:00 |
Dander7BD
|
42cb1dab1d
|
API::SimpleBodyDescription API::SphericalBodyDescription fix
3 coeffs were not saved in factory constructor
|
2014-02-04 10:32:43 +01:00 |
lindaandersson
|
fcadd5b4c3
|
GL - testing physics
|
2014-02-04 10:29:02 +01:00 |
Dander7BD
|
9817f844ef
|
Rebound adjustment trial
Rebound had a strong friction-like effect. Testing to see if it works
better if applied before the leapfrog update
|
2014-02-04 10:23:14 +01:00 |
lindaandersson
|
6e9423670f
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 08:56:32 +01:00 |
Dander7BD
|
d4bd72bb4a
|
Friction fix
special case; no movement
special case; movement directly into surface
.. dealt with
|
2014-02-04 08:55:57 +01:00 |
Pontus Fransson
|
50d28a5784
|
Misc - Still having problems with template with eventhandler.
|
2014-02-04 08:46:20 +01:00 |
lindaandersson
|
1f28c05983
|
GL - added jump
|
2014-02-03 16:30:47 +01:00 |
lindaandersson
|
03385f486b
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-03 16:22:11 +01:00 |
lindaandersson
|
cf73524e3b
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-03 16:21:57 +01:00 |
lindaandersson
|
e21cfe4cd4
|
GL - merge with Erik
|
2014-02-03 16:21:48 +01:00 |
Erik Persson
|
2c3b1e5038
|
GL - using real dmg algorithm
|
2014-02-03 16:20:50 +01:00 |
Dander7BD
|
358cddfd9a
|
SnapAngularAxis fix
floating point error there acos param could be slightly higher than 1.
Caused it to return undefined.
A clamp ought to fix it.
|
2014-02-03 16:20:16 +01:00 |
lindaandersson
|
ab962eea99
|
GL - added error check
|
2014-02-03 16:20:05 +01:00 |
Erik Persson
|
7f29b62c6f
|
GL - YOU CAN NOW SHOOT STUFF YAAAAY
|
2014-02-03 16:19:24 +01:00 |
lindaandersson
|
c08c3d2b53
|
Merge branch 'Physics' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-03 15:52:15 +01:00 |