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

293 Commits

Author SHA1 Message Date
lindaandersson 7b87707714 GmaeClient fix RBsphere radius 2014-02-20 09:21:38 +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