NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
665 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

594 Commits

Author SHA1 Message Date
Dennis Andersen 844aa37906 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameServer 2014-01-14 09:25:39 +01:00
Dennis Andersen 97cba4248d GameServer - Added more protocols. Divided the code in gamesession into several .cpp files 2014-01-14 09:25:22 +01:00
lindaandersson eb6ed13cce Merge remote-tracking branch 'origin/Graphics' into GameLogic 2014-01-14 09:25:16 +01:00
lindaandersson 04c5898f4e GL - sending string and createOBJ working 2014-01-14 09:24:55 +01:00
Dander7BD 8aa5ad7723 Revert "Work asssignment split line" 
This reverts commit 8ecd263318.
 2014-01-14 09:16:54 +01:00
Dander7BD cc68088298 linear coll. resp. fix add 
fix didn't cover all cases. Now it do
 2014-01-14 09:14:17 +01:00
Dander7BD 50b5b2dbf9 linear collision response fix 
moved improved version of Robin's implementation
 2014-01-14 09:12:37 +01:00
Dander7BD c1c3b5e6af angular collision response fix 
Incorrect formula found and corrected
 2014-01-14 09:02:46 +01:00
Dennis Andersen eb9360377d GameServer - Merged with other half of GameLogic 2014-01-13 12:50:27 +01:00
Dennis Andersen ce89e6bc98 GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions 2014-01-13 12:44:33 +01:00
lindaandersson 792f78c34a GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char* 2014-01-13 12:11:45 +01:00
Dander7BD 8ecd263318 Work asssignment split line 2014-01-13 10:25:20 +01:00
Dennis Andersen 2b5a5b2fbd GameServer - Merge with gamelogic 2014-01-10 23:36:03 +01:00
Erik Persson 059b3dd5e4 GameLogic - Basic game interface made (functions not yet implemented) 2014-01-10 12:33:15 +01:00
lindaandersson f6ba81cd44 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-10 10:48:29 +01:00
lindaandersson c541d032e7 GL - can move a obj on the client via the server 2014-01-10 10:47:54 +01:00
Erik Persson 586031aa94 GameLogic - making sure GameLogic uses the new physics api 2014-01-10 10:08:42 +01:00
Dennis Andersen 40892bfee5 Merge branch 'Network' of https://github.com/dean11/Danbias into GameServer 2014-01-10 09:28:32 +01:00
Dander7BD e575fff610 Physics proj .. show all files should be set to false 
That is how we in Physics rolls
 2014-01-10 08:53:20 +01:00
Dennis Andersen 7262535454 Added some more UML-stuff 2014-01-09 14:19:12 +01:00
Dennis Andersen a02a32c029 Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder 2014-01-09 14:18:01 +01:00
Erik Persson 52ba5602d5 GameLogic - player now using some of the new phys api 2014-01-09 13:06:18 +01:00
Erik Persson 48b9189a03 Revert "state" 
This reverts commit 4a07586076.
 2014-01-09 12:51:17 +01:00
Erik Persson 4a07586076 state 2014-01-09 12:43:32 +01:00
Dander7BD 8b85d1f539 Bug fixing 2014-01-09 11:48:21 +01:00
Dander7BD c13ed71cca post merge removed excess created files 
Gravity struct commit brought excess junk files
 2014-01-09 11:44:37 +01:00
Dander7BD 938447879f post merge + minor edits 
derepetifified code in struct Gravity
and some cosmetic consistency edits.
 2014-01-09 11:36:55 +01:00
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
Dander7BD 687ffa4f99 struct State::GetView() overload 
Can now provide an offset vector as argument
 2014-01-09 10:42:22 +01:00
lanariel 0a3d68a407 Small bug fix and include new SSAO shader 2014-01-09 01:08:49 +01:00
Dennis Andersen 42de421904 Master - Modified igore 2014-01-08 13:07:55 +01:00
Dennis Andersen 73302bf171 Added UML-documents 2014-01-08 12:45:48 +01:00
lanariel 7c567ec360 SSAO and frame counter 2014-01-08 07:01:59 +01:00
Dennis Andersen ed202a15a2 Worked over the holidays 2014-01-07 10:26:09 +01:00
Dennis Andersen 0065779205 Added comments where the physic generated errors due to big patch 2013-12-21 17:37:30 +01:00
Dander7BD fba52398c3 Merge remote-tracking branch 'origin/Physics' into Sprint2 2013-12-20 12:18:30 +01:00
Dander7BD 4d3032dc81 postmerge compile error fix 2013-12-20 12:13:12 +01:00
Dander7BD ca90b3ae3b OnPossibleCollision updated 2013-12-20 12:08:33 +01:00
Robin Engman a440cffb0e Added function to get delta time 
Now in local physics API
 2013-12-20 12:08:32 +01:00
Robin Engman 66e93fbdae SimpleRigid functions mirrored in SphericalRigid 
The functions added to SimpleRigidBody has been added to
SphericalRigidBody too.
 2013-12-20 12:08:31 +01:00
Dander7BD ec0f0e0d14 SimpleRigidBody::Predict(..) added 2013-12-20 12:08:30 +01:00
Dander7BD d163b7d8cf Partial SimpleRigidBody update end 2013-12-20 12:08:30 +01:00
Dander7BD 9a67e7ef3d RigidBody::Move(..) added 2013-12-20 12:08:29 +01:00
Dander7BD 604a17056c Partial SimpleRigid update 2013-12-20 12:08:28 +01:00
Dander7BD c4bbc09a97 CustomBodyState::ApplyForwarding(..) added 2013-12-20 12:08:28 +01:00
Dander7BD 9aa584acc7 RigidBody::Predict_Leapfrog(..) added 
needed for collision response rewinding/forwarding
 2013-12-20 12:08:27 +01:00
Dander7BD ec9f2379c7 Minor bug fixes in math librrary 2013-12-20 12:08:26 +01:00
Dander7BD bbc489eac9 RigidBody improved and Gimbal lock proofed 2013-12-20 12:08:25 +01:00
Dander7BD ff52977dcf Bug fixes 
including a hack
 2013-12-20 12:08:24 +01:00
Dander7BD 461fecd1d2 Bug fixing 
SimpleRigidBody::GetNormal returned wrong results.
Second bounce impulse in OnPossibleCollision, should be subtracted
instead of added.
 2013-12-20 12:08:24 +01:00
Dander7BD 9b9e549a5e bug fix in bool Intersect( const Box &box, const Sphere &sphere, Float4 &worldPointOfContact ) 2013-12-20 12:08:22 +01:00
Dander7BD 840f000ec9 Bug fix in API_Impl OnPossibleCollision(...) 2013-12-20 12:08:22 +01:00
Dander7BD 4ebb8cd9b8 Minor edit in CustomBodyState 2013-12-20 12:08:21 +01:00
Dander7BD 4e21e2b0c0 Renamed Formula::CollisionResponse::Impulse to.. 
.. Formula::CollisionResponse::Bounce
 2013-12-20 12:08:20 +01:00
Dander7BD 24418603ad ICustomBody::GetNormal returns Float4::null if.. 
.. no normal can be decided.
 2013-12-20 12:08:20 +01:00
Dander7BD 76c83add3d Added sanity check to SphericalRigidBody::GetNormalAt 2013-12-20 12:08:19 +01:00
Dander7BD 42418257cb CustomBodies now aware of it's scene 
+ other minor changes
 2013-12-20 12:08:18 +01:00
Robin Engman 59d5a3dc1e Created function for friction 2013-12-20 12:08:17 +01:00
Dander7BD 9cee69edd6 Extended friction content of the ICustomBody::State struct 2013-12-20 12:08:17 +01:00
Robin Engman 56dec6cf5d Added "alpha" friction 
Alpha means that the friction is not tested and most likely needs
tweaking.
 2013-12-20 12:08:16 +01:00
Dander7BD 09e55ddc30 SimpleRigidBody::GetNormalAt Done 
implemented by using RayVsPlane tests
 2013-12-20 12:07:46 +01:00
Dander7BD 5051a9e767 Major StateStruct and API update 2013-12-20 12:07:45 +01:00
Dander7BD 96bf20e5ae compile errors fixed 2013-12-20 12:07:43 +01:00
Dander7BD dbb0c38432 Big patch 
Loads of collision response related implementations/edits
 2013-12-20 12:07:43 +01:00
Robin Engman 9cdbe2c861 Added algorithms for collision stubs 2013-12-20 12:01:08 +01:00
Dander7BD e8952dc739 CollideAble implementations updated 2013-12-20 12:01:07 +01:00
Dander7BD 632570f66b Updated the BoxVsBox collision alghorithm 
and added overloaded
 2013-12-20 12:01:06 +01:00
Dander7BD a03568e19e Updated formula for BoxVsBox point of contact 
good enough approximation. Tested
 2013-12-20 12:01:05 +01:00
Dander7BD ec6cd72f3c SeperatingAxisTest_AxisAlignedVsTransformedBox overloaded 2013-12-20 12:01:05 +01:00
Dander7BD 4858f573e6 Added more collision subs 2013-12-20 12:01:04 +01:00
Robin Engman d8b323e230 Extractable collision point for SphereVSSphere 2013-12-20 12:01:03 +01:00
Dander7BD a3ced24fea Some compile error fixes 2013-12-20 12:01:02 +01:00
Robin Engman 61e1d20748 Fixed const problem 2013-12-20 12:01:02 +01:00
Robin Engman 5f305b7086 Oops 2013-12-20 11:59:38 +01:00
Robin Engman 283633c6c6 Added stub functions 
More funcitonallity for intersect functions.
 2013-12-20 11:59:37 +01:00
Dander7BD de0078265c Stub response to new ICollideAble method 
Stubbed: Box, BoxAxisAligned, Frustrum
Fully implemented: Line & Universe
 2013-12-20 11:59:36 +01:00
Dander7BD da996a5deb Added cirtual function to ICollideAble 
Overload of Intersects(...)
 2013-12-20 11:59:35 +01:00
Dander7BD c854b1af58 Stuff 2013-12-20 11:59:35 +01:00
Linda Andersson 15dc962709 Merge branch 'Graphics' of https://github.com/dean11/Danbias into GameLogic 2013-12-20 11:40:07 +01:00
Erik Persson d3721fcada last updates 
random stuff
 2013-12-20 11:10:36 +01:00
Dennis Andersen be39365a27 Gamelogic - Merged with existing stuff 2013-12-20 09:47:24 +01:00
Dennis Andersen 15d6ac8cf9 GameLogic - Final sprint2 merge 2013-12-20 09:42:02 +01:00
Linda Andersson ea5fc78817 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-20 09:04:30 +01:00
Linda Andersson 606cb10f8b GL - removed server include from gameLancher 2013-12-20 09:04:18 +01:00
Erik Persson f4232ca0b4 gamplay code in gamesession 2013-12-20 08:59:59 +01:00
Dennis Andersen 694d5576d7 GameLogic - Pre-merge with physics 2013-12-19 15:35:49 +01:00
Linda Andersson ecf1c5fc36 GL - delete timer 2013-12-19 14:32:52 +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 ea59c25119 GL - mergeing error 2013-12-19 13:49:46 +01:00
Linda Andersson bb61b83392 GL - merge 2013-12-19 13:46:01 +01:00
Dennis Andersen d68fd63b25 Added server launcher 2013-12-19 13:35:56 +01:00
Dennis Andersen 0570d76e24 Modified part of some player states 2013-12-19 12:41:37 +01:00
Dennis Andersen 934aa6e45a Merge 2013-12-19 12:34:59 +01:00
Dennis Andersen beb116e964 Fixed some threafing and stuff 2013-12-19 12:32:23 +01:00
Linda Andersson 27aad0d86f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-19 11:58:54 +01:00
Linda Andersson ba6f7114b5 GL - added id in object, vector 2013-12-19 11:58:42 +01:00
Erik Persson e68001da0e testing updated 
message to client about object creation, message to client about player
movement
 2013-12-19 11:46:11 +01:00
Linda Andersson 057dce0aca GL - merge errors 2013-12-19 10:31:59 +01:00
Linda Andersson 13430f31fc GL - merge and some more protocols 2013-12-19 10:22:32 +01:00
Erik Persson 0ea08fbd54 gamesession testing 2013-12-19 10:21:03 +01:00
lanariel 341e33ee78 Rebased Lights to Use World Coordinates 2013-12-18 20:36:41 +01:00
lanariel 3139585e7b Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics 
Conflicts:
	Code/OysterGraphics/DllInterfaces/GFXAPI.cpp
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/LightPass.hlsl
	Code/OysterGraphics/Shader/HLSL/Deffered Shaders/VertexGatherData.hlsl
	Code/Tester/MainTest.cpp
 2013-12-18 20:29:24 +01:00
lanariel 718b1ade2b Proper Lighting, supports Multiple Lights 2013-12-18 20:28:06 +01:00
Linda Andersson a4907c8e2e GL - control protocol added 2013-12-18 15:28:47 +01:00
Dennis Andersen 92b3525587 GameLogic - Cleanup after erik ;) 2013-12-18 13:12:11 +01:00
Dennis Andersen 33d045de1a GameLogic - Merge with Erik 2013-12-18 13:10:47 +01:00
Dennis Andersen 8721224d7c GameLogic - Added alot of functionality to Game related parts 2013-12-18 13:07:10 +01:00
Erik Persson f5490bf111 using a global id in object 2013-12-18 13:01:25 +01:00
Linda Andersson 0c98e2847d GL - added some protocols 2013-12-18 12:18:01 +01:00
Linda Andersson e16c939285 GL - using window manager, fixed consistent linking in danBiasGame 2013-12-18 10:47:30 +01:00
Dennis Andersen e9c5a49778 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 08:44:18 +01:00
Dennis Andersen 347b546566 GameLogic - some minor fixes 2013-12-18 08:44:10 +01:00
Erik Persson 2daf93987a team fix 2013-12-18 08:41:31 +01:00
Dennis Andersen 1eceb6095f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 08:37:55 +01:00
Dennis Andersen bf5cc69ff7 GameLogic - Added Postbox system to netsession 2013-12-18 08:37:45 +01:00
Erik Persson 4d7be753c5 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 08:32:20 +01:00
Erik Persson 8173f3818d gamelogic update and added some level design elements 
teammanager, team,
 2013-12-18 08:30:58 +01:00
Pontus Fransson d4e92d4bbe Network - Fixed clear string in Translator. 2013-12-18 00:21:00 +01:00
Pontus Fransson 745268eeed Network - Removed line so it doesn't causes error. 2013-12-18 00:15:21 +01:00
Pontus Fransson 623267ad1b Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic 2013-12-18 00:10:47 +01:00
Pontus Fransson fc8dba6610 Network - Fixed Unpackb. 
Changed Unpackb to "*buffer" instead of "buffer".
 2013-12-18 00:08:50 +01:00
Pontus Fransson e1d0150ef1 Network - OysterByte += should now work correctly. 2013-12-18 00:07:24 +01:00
Pontus Fransson 4df33b759c Network - char[] unpacking. 
Fixed correct unpacking on char[].
Fixed not clearing string in translator unpack function.
 2013-12-18 00:04:25 +01:00
Dennis 6f48e6a13a Deffered Render Update 2013-12-17 14:49:45 +01:00
Dennis Andersen 8700824d12 Gamlogic - Merge with Linda 2013-12-17 14:32:57 +01:00
Dennis Andersen 097fa1da34 GameLogic - Pre merge with Linda 2013-12-17 14:15:20 +01:00
Linda Andersson 9d722bced3 GL - recieve messages from server 2013-12-17 13:39:10 +01:00
Dennis Andersen 682a28513b Gamelogic - Merge with network 2013-12-17 11:35:34 +01:00
Pontus Fransson 7c029a5242 Network - Fixed bugs 2013-12-17 10:58:07 +01:00
dean11 8667e14afb Merged with Linda after merge conflicts 2013-12-17 10:28:44 +01:00
dean11 4650615a61 Gamelogic - Pre merge with Linda 2013-12-17 10:25:34 +01:00
Linda Andersson 5d1d64bebb GL - trying to send move protocol 2013-12-17 10:07:46 +01:00
Pontus Fransson cbf3c7db8f asd 2013-12-17 09:05:49 +01:00
Pontus Fransson f31da90830 Network - Connection set blocking to true while connecting. 2013-12-17 09:05:32 +01:00
Pontus Fransson 23a05bf431 Network - OysterByte += operator 2013-12-17 08:45:47 +01:00
dean11 abc94e9acb Nothing important done 2013-12-17 00:51:42 +01:00
Pontus Fransson e4e0e1c189 Network - Fixed delay loading dll. 2013-12-16 19:58:31 +01:00
Linda Andersson 3ee25f0112 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-16 11:08:22 +01:00
Linda Andersson dc3221ee11 GL - set pos function for C_models 2013-12-16 11:08:10 +01:00
dean11 ec3c5f1290 Gamelogic - Added threading functionality to NetworkClient 2013-12-16 11:05:24 +01:00
Sam Mario Svensson 1c8f9c7801 Fixed link errors with dll files 2013-12-16 11:04:21 +01:00
dean11 b351a7bac4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2013-12-16 10:02:41 +01:00
dean11 6bfe7711ab Gamelogic - Modified gameprotocol id:s 2013-12-16 10:02:30 +01:00
Linda Andersson b60166a6e8 GL - connect to server, need right IP 2013-12-16 09:55:51 +01:00
dean11 0d5b84a7dd Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic 2013-12-16 09:54:05 +01:00
dean11 7cda07507a GameLogic - Pre merge with Netowkr 2013-12-16 09:50:23 +01:00
Pontus Fransson 8a8cfcc5d6 Network - Forgot to use Initiateclient(). 2013-12-16 09:48:41 +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
Pontus Fransson 0c6badb749 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into Network 2013-12-16 09:11:18 +01:00
dean11 34d79d1207 Gamelogic - Forgot some stuff 2013-12-16 09:09:54 +01:00