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

355 Commits

Author SHA1 Message Date
Robin Engman f8f656d7c9 Player now has better movement 
Something is "dragging" the player slightly, but will be fixed. Bumps up
and down, tweaking physical properties should fix it.
 2014-02-20 15:14:02 +01:00
dean11 8f3eb586c6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 12:44:24 +01:00
lindaandersson 50fc2fcc29 Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-20 11:59:44 +01:00
lindaandersson 1079b20e15 Updating player pos and RB, moved camera pos for testing 2014-02-20 11:59:26 +01:00
dean11 7ee63f887e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:58:08 +01:00
dean11 4150ba0fc3 GameLogic - Added default scael 1:1 2014-02-20 11:57:26 +01:00
dean11 8cf0087a95 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:57 +01:00
lindaandersson e6cd1f1e5f GameClient now objects say to client that they have moved! 2014-02-20 10:33:27 +01:00
lindaandersson dd397ec752 GameClient set onMoveFunc for all objects 2014-02-20 10:13:01 +01:00
dean11 641442854e GameServer - Added debug traps 2014-02-20 09:23:33 +01:00
dean11 208885d4eb Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 09:22:03 +01:00
lindaandersson 7b87707714 GmaeClient fix RBsphere radius 2014-02-20 09:21:38 +01:00
dean11 d93d900d40 GameServer - Misc 2014-02-20 09:14:42 +01:00
lindaandersson 0c0fde51b0 GameClient Correct scaling on drawn RB 2014-02-20 08:56:36 +01:00
lindaandersson 80b2a9edd7 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 08:44:03 +01:00
Dennis Andersen f872cfffd1 Added debug project to game server and some other stuff 2014-02-20 08:33:07 +01:00
Dennis Andersen 4ac5cdd147 GameServer - Painly merge with GameLogic 2014-02-19 22:44:31 +01:00
Dennis Andersen b5639bec90 GameServer - Some white spaces etc.. 2014-02-19 22:07:53 +01:00
Dander7BD 3b70e0baec Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient 2014-02-19 16:09:07 +01:00
lanariel 4697b85e3b Small fixes 2014-02-19 15:57:52 +01:00
lindaandersson 0876e5797a Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 15:54:01 +01:00
lindaandersson a2979a2bf5 GameClient - modified player Data and out commented physics 2014-02-19 15:53:28 +01:00
dean11 89b73cdf01 GameLogic - fixed wrong pointer cast 2014-02-19 15:52:16 +01:00
dean11 6409b051b4 GameServer - Added more feature to standalone server 2014-02-19 14:53:59 +01:00
Dander7BD f04a928d6e Merge remote-tracking branch 'origin/Physics' into GameClient 2014-02-19 14:01:46 +01:00
Robin Engman 3520062577 Implemented TurnLeft function 2014-02-19 13:59:59 +01:00
Robin Engman 0a9b522e15 Merge remote-tracking branch 'origin/GameLogic' into Physics 2014-02-19 13:50:33 +01:00
dean11 f0c581ca04 GameLogic - Added functions for relative rotation 2014-02-19 13:47:49 +01:00
lindaandersson d6d45392d3 Merge remote-tracking branch 'origin/GameServer' into GameClient 2014-02-19 13:13:05 +01:00
dean11 8a3cd796ca GameServer - Pontus found idiot bug that dennis made 2014-02-19 12:46:05 +01:00
lindaandersson 14deeeebca Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 12:09:50 +01:00
lindaandersson 932ef429c2 GameClient - removed hardcoding for lvl, use 2ofAll map for correct world. Init player gets wrong scale and isMyPlayer. Need to verify camera on client 2014-02-19 12:09:42 +01:00
Pontus Fransson f1cd73425c Removed old LevelLoader, it's now in a seperate project. 2014-02-19 11:38:36 +01:00
lindaandersson ad37095a80 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:31:14 +01:00
Pontus Fransson 6c19c12682 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 
Conflicts:
	Code/Game/GameLogic/LevelLoader/LevelLoader.cpp
	Code/Game/GameLogic/LevelLoader/LevelLoader.h
	Code/Game/GameLogic/LevelLoader/LevelParser.cpp
	Code/Game/GameLogic/LevelLoader/LevelParser.h
	Code/Game/GameLogic/LevelLoader/Loader.cpp
	Code/Game/GameLogic/LevelLoader/Loader.h
	Code/Game/GameLogic/LevelLoader/ObjectDefines.h
	Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
 2014-02-19 11:25:33 +01:00
Pontus Fransson 58117ad425 asd 2014-02-19 11:22:14 +01:00
dean11 65163447bb GameServer - Merged with Physics 2014-02-19 11:09:37 +01:00
Pontus Fransson 7f8c10292e Moved LevelLoader to a seperate lib project. 2014-02-19 11:00:16 +01:00
Robin Engman fa95e6b821 Linda fixing some lvl loading stuff 2014-02-19 10:55:59 +01:00
dean11 61350572c7 GameLogic - Merge with origin gamelogic 2014-02-19 10:47:14 +01:00
dean11 0e23bcfc82 GameLogic - Modified some names and cleand up some junk 2014-02-19 10:36:45 +01:00
Erik Persson c2ef8350cf GL - players created with unique ids 2014-02-19 10:15:52 +01:00
Dennis Andersen af15157283 GameLogic - Added default path to level data 2014-02-19 00:20:01 +01:00
Dennis Andersen 53c0c74c7c GameLogic - Merged with GameServer and fixed some merge errors 2014-02-18 21:50:51 +01:00
Dennis Andersen 8a0dbe969c GameLogic - Added filename to paramater when initiating a level, Also changed some string to wstrings 2014-02-18 21:24:21 +01:00
dean11 22f9daf0d8 Connection between server and client is stable 2014-02-18 16:38:08 +01:00
Pontus Fransson 86ef521abd LevelLoader - Added new CollisionGeometry_TriangleMesh. 2014-02-18 14:10:22 +01:00
Erik Persson be8b7537b5 GL - merging 2014-02-18 13:47:40 +01:00
dean11 222c203b69 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-18 11:44:23 +01:00
dean11 484b055338 GL - Call by reference instead 2014-02-18 11:44:02 +01:00
dean11 562f444193 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer 2014-02-18 11:34:46 +01:00
Erik Persson 06ddb86b17 GL - GetAllDynamicObjects , dennis order 2014-02-18 11:33:36 +01:00
dean11 2bc7c9f65f GameServer - added more features to object protocols 2014-02-17 15:11:12 +01:00
dean11 7395a0a495 Major cleanup 2014-02-17 10:38:11 +01:00
dean11 fb48b0b34c Merge branch 'Camera' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:11:08 +01:00
dean11 d96825816d Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:01:41 +01:00
Robin Engman a90f33d20e Jumpy jump 2014-02-17 06:44:29 +01:00
lindaandersson d32e614b00 GL - Hax to get the world model initiated. reading spawnpoints 2014-02-14 16:03:46 +01:00
Sam Mario Svensson 26fb7a5664 GL- Compile fel med spawnpoint fixat 2014-02-14 15:36:19 +01:00
Sam Mario Svensson 3051621f30 GL- levelLoader can now load a correct spawnpoint 2014-02-14 15:19:07 +01:00
lindaandersson 25b0162b59 GL - explosive crate testing 2014-02-14 13:54:50 +01:00
lindaandersson bab3af787c GL - merge with new physics movement 2014-02-14 13:54:28 +01:00
lindaandersson 8110b677ff GL - added spawnpoint array 2014-02-14 13:09:55 +01:00
Erik Persson 8b92c015ea Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 
Conflicts:
	Code/Game/GameLogic/Player.cpp
 2014-02-14 12:46:27 +01:00
Robin Engman f8e68b95b2 Temporary jump 2014-02-14 12:07:49 +01:00
Erik Persson 9fc8a8840f GL - fixed movement(pretty unstable but its working) 2014-02-14 12:03:29 +01:00
Robin Engman 61c49cf352 Merge with game logic 2014-02-14 11:54:28 +01:00
Robin Engman a42dfe96f1 Jump implemented 2014-02-14 11:52:44 +01:00
Erik Persson 8bbdb1156a Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-14 11:34:47 +01:00
Erik Persson 7791dc076e GL - static and dynamic objects can now set extraDamageOnCollision in constructor 2014-02-14 11:16:15 +01:00
lindaandersson 975894b037 GL - init objects 2014-02-14 11:11:49 +01:00
lindaandersson 9038277a2c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-14 11:07:11 +01:00
lindaandersson 1a01dbd760 GL - initiating objects 2014-02-14 11:07:03 +01:00
Erik Persson 8d8fa78da0 GL - fixed portal constructor 2014-02-14 11:04:01 +01:00
Erik Persson c5e4580ada GL - include error fixed 2014-02-14 10:59:33 +01:00
Erik Persson f14a83aef2 GL - Explosivebox now takes a float forceMagnitude instead of a vector 2014-02-14 10:57:24 +01:00
lindaandersson 50d07a102d GL - initiate lvl 2014-02-14 10:32:41 +01:00
lindaandersson 1fc6f16409 GL - rotation testing 2014-02-14 10:09:03 +01:00
Erik Persson 5defe7c0f7 GL - fixed compile errors 2014-02-14 10:08:29 +01:00
Erik Persson 59697bfcea GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction 2014-02-14 09:59:26 +01:00
Robin Engman ff951d2183 Moving fixed 
Jumping and waiting for camera is next
 2014-02-13 19:49:33 +01:00
lindaandersson 2dee9dd084 GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content. 2014-02-13 16:33:26 +01:00
Erik Persson bd6b531418 GL - added Portal and started on crystalformation 2014-02-13 09:58:25 +01:00
Sam Mario Svensson 573a0109e3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/GameLogicStates.h
	Code/Game/GameLogic/JumpPad.cpp
	Code/Game/GameLogic/JumpPad.h
 2014-02-12 15:03:40 +01:00
Sam Mario Svensson 64b2d688bd Försök till merge men det är cp 2014-02-12 14:48:58 +01:00
Erik Persson 6cbec3e2ac GL - jumppad testing 2014-02-12 14:45:10 +01:00
Erik Persson 14d492f22e changes in massdriver 2014-02-12 14:12:48 +01:00
lindaandersson 7c44e8ba17 GL - added jumppad model and rigidbody 2014-02-12 14:12:47 +01:00
Erik Persson b95e1d6b7a changes in massdriver 2014-02-12 14:00:53 +01:00
lindaandersson 97c3097fc7 GL - added jumppad model and rigidbody 2014-02-12 13:37:21 +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 e8536cc5d4 GL - removed before collision event, sending look and right dir to server 2014-02-12 13:11:35 +01:00
lindaandersson cc4e3f947c GL - playermovement fixed, can walk in diagonal directions 2014-02-12 12:16:16 +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
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
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