Dander7BD
|
c39e2fe791
|
Merge remote-tracking branch 'origin/PhysicsStructs' into Verifying-Gravity-struct
Conflicts:
Bin/Content/Shaders/LightPass.cso
Code/GamePhysics/PhysicsStructs-Impl.h
|
2014-01-09 11:03:25 +01:00 |
Dennis Andersen
|
42de421904
|
Master - Modified igore
|
2014-01-08 13:07:55 +01:00 |
|
Dennis Andersen
|
ed202a15a2
|
Worked over the holidays
|
2014-01-07 10:26:09 +01:00 |
Linda Andersson
|
59ba530761
|
GL - merge error
|
2013-12-20 11:27:49 +01:00 |
|
Linda Andersson
|
16715f3f2a
|
GL - push before merge
|
2013-12-20 11:27:04 +01:00 |
Erik Persson
|
d3721fcada
|
last updates
random stuff
|
2013-12-20 11:10:36 +01:00 |
|
Dennis Andersen
|
694d5576d7
|
GameLogic - Pre-merge with physics
|
2013-12-19 15:35:49 +01:00 |
Tobias Grundel
|
855860d454
|
Gravity struct
Unions are the devil's work, but now there's GravityWell, Directed and
DirectedField structs implemented in PhysicsStructs
|
2013-12-19 14:30:16 +01:00 |
|
Linda Andersson
|
fa1473455f
|
GL - added C_obj files, client obj in game state to send input
|
2013-12-16 09:45:12 +01:00 |
|
dean11
|
f29f50f830
|
Merged with Gamelogic branch and fixed errors and added features
|
2013-12-14 22:04:42 +01:00 |
|
dean11
|
8b1c2b91e8
|
Fixed some craches and stuff
|
2013-12-13 23:47:16 +01:00 |
|
Linda Andersson
|
7c1d19946d
|
GL - Connection to network in clinet
|
2013-12-13 12:02:49 +01:00 |
|
Erik Persson
|
c801ab829a
|
Merge remote-tracking branch 'origin/Physics' into GameLogic
Conflicts:
Bin/Content/Shaders/TextureDebug.cso
|
2013-12-12 10:10:52 +01:00 |
Robin Engman
|
c740bd5935
|
Added some data to PhysicsAPI
GetRigidLinearVelocity() and void* as reference to game object.
|
2013-12-12 10:02:35 +01:00 |
|
Erik Persson
|
2424b51c3e
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
Conflicts:
Bin/Content/Shaders/DebugVertex.cso
|
2013-12-12 09:39:27 +01:00 |
|
Erik Persson
|
e11d7d94f7
|
updated the weapon system, collisionManager and redid the "object" heirarki
|
2013-12-12 09:36:14 +01:00 |
|
Linda Andersson
|
38a1602d3f
|
GL - merge with graphics api. Lobby and game state.
|
2013-12-09 09:23:39 +01:00 |
|
dean11
|
64a8089e54
|
GameLogic - Worked on server
|
2013-12-04 11:37:26 +01:00 |
lanariel
|
ce294cd1d7
|
Forgot to add a folder
|
2013-12-04 09:43:43 +01:00 |
|
dean11
|
a852e8eab4
|
Created the game modules
|
2013-12-03 12:07:37 +01:00 |