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

491 Commits

Author SHA1 Message Date
lindaandersson c87bab8808 GL - started using the lvl format. Objects on client have pos, rot and scale (not verified) 2014-02-10 14:00:14 +01:00
Robin Engman 05aa3cc9e9 Added on move functionality 2014-02-10 13:55:01 +01:00
Robin Engman e5e99924d9 Updates for objects 2014-02-10 13:25:28 +01:00
Dander7BD 0153be16d5 Added VS Filter Camera 2014-02-10 13:03:21 +01:00
Dander7BD 800d5d0505 Camera_Basic stuff 2014-02-10 13:01:46 +01:00
Robin Engman ba0d6ca73a Amazing merge with server 2014-02-10 12:42:31 +01:00
Dander7BD da58165645 Added Basic camera 2014-02-10 12:02:48 +01:00
Robin Engman 427ec3b716 Major overhaul fix 2014-02-10 10:52:08 +01:00
Robin Engman 99146430a4 Major overhaul 2014-02-09 21:24:09 +01:00
Dennis Andersen 14bf3ede86 Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. 2014-02-09 18:58:14 +01:00
Dennis Andersen 4abfdd70fe Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors.. 2014-02-09 18:58:07 +01:00
Dennis Andersen 310ed3dfc5 GameServer - Multiplayer now working properly 2014-02-09 16:42:26 +01:00
Robin Engman 92447a6352 Very cool stuff 2014-02-07 16:01:43 +01:00
Robin Engman ab9f81ac60 Collisions work better 
Still needs polishing
 2014-02-07 15:38:53 +01:00
Pontus Fransson 0c4f70e400 GL - Updated loadLevelHeader() .Added Cylinder bounding volume. 2014-02-07 15:20:34 +01:00
Pontus Fransson fef40f58f9 GL - Fixed memory leaks in LevelLoader. 2014-02-07 14:44:25 +01:00
Pontus Fransson 9bdf258c5d GL - Updated LevelLoader 2.0. Bounding volume 1.0 
The ObjectSpecialType enum is not correct. It has to be updated.
 2014-02-07 14:12:54 +01:00
Robin Engman 1633129a2c Commit to Dennis 2014-02-07 13:09:44 +01:00
Robin Engman b225c53611 More cool stuff 2014-02-07 11:43:18 +01:00
Robin Engman f372d3e05b Some cool stuff 2014-02-06 21:15:28 +01:00
lindaandersson 81d43b59c0 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:54:56 +01:00
lindaandersson 91db71fe0e GL - 20 boxes and a house 2014-02-05 15:54:48 +01:00
Pontus Fransson a3cea997ba Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-05 15:47:00 +01:00
Pontus Fransson b39a670347 GL - Updated LevelLoader, works with Fredricks level editor. 2014-02-05 15:46:45 +01:00
Dennis Andersen 201a07f0dc GameServer - Merged with GameLogic 2014-02-05 15:16:31 +01:00
lindaandersson 70a2cf27e3 GL - almost ok, at least on the top of the world 2014-02-05 11:53:38 +01:00
lindaandersson 426444ca34 GL - added more boxes and weaponfunctionality 2014-02-05 11:46:04 +01:00
lindaandersson 6818dda2b9 GL - testing 2014-02-05 09:06:33 +01:00
Dennis Andersen db822fa832 GameServer - Merged with gamelogic 2014-02-04 22:33:39 +01:00
Dennis Andersen b7f550859d GameServer - Merge with GameLogic 2014-02-04 22:13:07 +01:00
lindaandersson b43902d31e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-04 16:39:11 +01:00
lindaandersson ec4d34b131 GL - added error checking 2014-02-04 16:39:01 +01:00
Erik Persson 4ad86ae83b GL - Added jumppad(implemented but not tested) 2014-02-04 16:24:48 +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
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
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 f88e16c581 GL - merge 2014-02-04 11:53:40 +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
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 00400a7d32 GL - camera testing 2014-02-04 10:38:59 +01:00
lindaandersson fcadd5b4c3 GL - testing physics 2014-02-04 10:29:02 +01:00
lindaandersson 1f28c05983 GL - added jump 2014-02-03 16:30:47 +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
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 a3886c4f1f GL - added models and started to fix camera movement 2014-02-03 15:52:00 +01:00
Erik Persson d77b3d92d8 GL - using movetolimbo in massdriver pickup functionallity 2014-02-03 15:45:48 +01:00
Erik Persson 99b041f165 GL - first implementation of weapons forcepull with pickup functionallity 2014-02-03 15:32:58 +01:00
Pontus Fransson e7fee8b2e7 GL - Updated LevelLoader. Added lights. 
Added lights.

Changed the return type to vector<SmartPointer<ObjectTypeHeader>>

Hid the LevelParser from the outside.
 2014-02-03 14:50:27 +01:00
Erik Persson 8f234611d2 GL - mergeissues fixed 2014-02-03 10:48:12 +01:00
Erik Persson ef71b365ab asd 2014-02-03 10:42:40 +01:00
Dennis Andersen a673e64694 GameServer - Pre-merge with graphic 2014-01-31 22:52:52 +01:00
Dennis Andersen 5aede62af6 Gameserver - Merge with gamelogic 2014-01-31 22:36:43 +01:00
lindaandersson 5b263caccd GL - merge with GL 2014-01-31 16:42:25 +01:00
lindaandersson e327f64702 GL - can play with two characters 2014-01-31 16:33:16 +01:00
Pontus Fransson 6f264f5e7b Misc - EventHandler fixed all errors. 2014-01-31 15:38:12 +01:00
lindaandersson 7b503bcb52 GL - working with snap 2014-01-31 15:17:09 +01:00
Pontus Fransson d5f285c089 Misc - Test 2014-01-31 14:31:27 +01:00
Erik Persson 16f535bfa3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/AttatchmentMassDriver.cpp
	Code/Game/GameLogic/Game_PlayerData.cpp
	Code/Game/GameLogic/Level.cpp
 2014-01-31 14:16:32 +01:00
Erik Persson b753387649 asd 2014-01-31 14:14:20 +01:00
Erik Persson 16a342da49 GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network 2014-01-31 14:05:52 +01:00
lindaandersson 57c230d458 GL - will merge with physics 2014-01-31 13:56:22 +01:00
Pontus Fransson 8ee8374169 Misc - EventHandler 2014-01-31 11:28:01 +01:00
Pontus Fransson e3376eba7c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-31 11:11:48 +01:00
Pontus Fransson da9b615994 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
 2014-01-31 11:10:35 +01:00
Dennis Andersen 21cb7731b7 Merge with GL 2014-01-31 11:03:45 +01:00
lindaandersson fa7f400c71 GL - test this robin 2014-01-31 10:58:03 +01:00
Dennis Andersen c9c562fda6 GameServer - Added some functionality in windowshell 2014-01-31 10:50:38 +01:00
Pontus Fransson e718048f7f GL - Lan State 2014-01-31 10:49:52 +01:00
lindaandersson 4df6b849a6 GL - working with new models and server 2014-01-31 09:39:44 +01:00
Dennis Andersen 34b6b29fc4 GameLogic - Merged with GL 2014-01-31 09:24:16 +01:00
Erik Persson 31feccf284 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
	Code/Game/GameLogic/Game.cpp
 2014-01-31 09:17:54 +01:00
lindaandersson a6ff6eba42 GL - merge with server 2014-01-31 09:14:55 +01:00
Erik Persson c30db71e94 GL - more testing and changes to the level and using the physics API 2014-01-31 09:12:15 +01:00
Dennis Andersen 40f0fe61f0 GameServer - Fixed Protocols not recieveing properly and fixed the resource loader. 2014-01-31 08:41:08 +01:00
Pontus Fransson cec022b381 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 23:24:16 +01:00
Pontus Fransson 3c1eed0f3f GL - Added LanMenuState 2014-01-30 23:23:37 +01:00
lindaandersson bb8e92ec36 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 15:20:44 +01:00
lindaandersson 0aa39275e3 GL - only client with server update server. Update recieverfunction 2014-01-30 15:20:35 +01:00
Erik Persson ae6a570a12 GL - trying to make walking nice 2014-01-30 15:12:53 +01:00
Sam Mario Svensson 4167b6a93b GL- merge fix 2014-01-30 15:02:35 +01:00
lindaandersson 2bb2d0cd56 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 14:58:30 +01:00
lindaandersson 713dc269d1 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 14:18:00 +01:00
lindaandersson 05e24d0514 GL - uppdate server 2014-01-30 14:17:50 +01:00
Dennis Andersen 09f39ec26d GameServer - Added acces directly to clients in network session 2014-01-30 14:15:25 +01:00
Sam Mario Svensson 261421af21 Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic 2014-01-30 13:44:18 +01:00
Sam Mario Svensson c78bbba3eb GL- Removed commentet unnecessary code 2014-01-30 13:33:59 +01:00
lindaandersson 2a69af5c9f GL - merge 2014-01-30 12:01:48 +01:00
lindaandersson 1ccf98e3eb GL - added loginstate 2014-01-30 11:58:44 +01:00
lindaandersson d41ddca45d Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameLogic 2014-01-30 11:13:42 +01:00
Erik Persson 323b7322fa GL - testing 2014-01-30 11:11:45 +01:00
Dennis Andersen 05740665da GameServer - Fixed a small error regarding not reaching some data 2014-01-30 11:11:04 +01:00
lindaandersson a249e7ede9 GL - merge with new serverAPI 2014-01-30 10:57:44 +01:00
lindaandersson 09693c7f35 GL - merge 2014-01-30 09:40:58 +01:00
lindaandersson 7d9d8e4615 GL - added jump 2014-01-30 09:07:56 +01:00
Dennis Andersen fa29cd7307 GameServer - Merged with GameLogic 2014-01-30 00:19:00 +01:00
lindaandersson 44ba45bcc2 GL - added setCollisionfunc to object 2014-01-29 16:01:56 +01:00
Dennis Andersen 1e89bb4e30 Fixed protocol messaging. Known crash when recieveing protocol on server after a while... 2014-01-29 15:01:14 +01:00
lindaandersson 446bdd412b GL - updated constructors to set before and after collision response functions 2014-01-29 14:33:21 +01:00
lindaandersson 16334ea2db GL - collision working, going to merge with physics 2014-01-29 13:18:17 +01:00
Dennis Andersen 36f057d2cc Broekn branch not broekn more 2014-01-29 10:18:01 +01:00
Sam Mario Svensson f968adebeb GL - LevelLoader = done and done 2014-01-28 16:15:10 +01:00
lindaandersson 3b552d5361 GL - change gamelogic to use the new physics 2014-01-28 15:44:32 +01:00
lindaandersson a56fcbcb9b GL - can send object position from level objects, gravity and frustrum problems. 2014-01-28 15:04:25 +01:00
Sam Mario Svensson 2b63563a9b Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 2014-01-28 11:30:59 +01:00
Sam Mario Svensson d2ebad7445 GL - Fixed ParseFunction so now we only have 1 + specialcases functions instead of 1 function for every case 2014-01-28 11:29:35 +01:00
Pontus Fransson 4de1c1aafd GL - More Object structs, LevelLoader api comments. 
Changed the LevelParser to use the new functions from ParserFunctions.
Might need to cast something to (void*).
 2014-01-28 11:27:29 +01:00
Dennis Andersen 91e825dbfb Broekn stuff to tobias 2014-01-28 09:00:02 +01:00
Sam Mario Svensson dd2b214122 GL- la in memcpy för parsing i parseFunctions 2014-01-27 14:57:18 +01:00
Erik Persson e11dc6551c GL - ? 2014-01-27 14:45:19 +01:00
lindaandersson a8dbf2a4c9 GL - added test box to level 2014-01-27 14:43:39 +01:00
lindaandersson 3896514bae GL - mergecommit 2014-01-27 14:02:37 +01:00
Sam Mario Svensson 91bf6ce901 GL- LevelFormat fix 2014-01-27 13:57:18 +01:00
lindaandersson 4085a5f5e2 GL - added shot protocol 2014-01-27 13:56:31 +01:00
Erik Persson 1ed1bab751 Created test box that should now be shot at by the player 2014-01-27 13:55:09 +01:00
lindaandersson 5b984db9ba GL - gameState merge 2014-01-27 13:25:09 +01:00
Sam Mario Svensson d6432b2c73 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 2014-01-27 10:16:25 +01:00
Sam Mario Svensson 1748fe323a GL - Added Parsing functions for levelLoader and moved Packing classes to misc 2014-01-27 10:15:39 +01:00
Pontus Fransson e188794aa3 GL - Load level in LevelParser 2014-01-27 10:14:02 +01:00
Erik Persson 74ac5e2d31 Updated creation of objects 2014-01-27 08:54:25 +01:00
Sam Mario Svensson 3c1d66e3f8 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat 
Conflicts:
	Code/Dokumentation/LevelLoader.uxf
	Code/Game/GameLogic/GameLogic.vcxproj
 2014-01-24 10:42:19 +01:00
Sam Mario Svensson c84ed645f0 GameLogic - implementation of LevelLoader 2014-01-24 10:22:18 +01:00
Pontus Fransson aaf3bf30f9 GL - LevelParser half way implemented. 2014-01-24 10:01:58 +01:00
Pontus Fransson 0f5517398d GL - Update uml, LevelParser.h.cpp ObjectDefines.h 2014-01-24 09:00:59 +01:00
lindaandersson fb2cf714c6 GL - sending dir to server, forward and backward walking works 2014-01-23 14:28:53 +01:00
lindaandersson 07e5519850 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-23 09:25:02 +01:00
lindaandersson 8c297d1e9b GL - starting to send lookdir to server 2014-01-23 09:24:55 +01:00
Erik Persson bd739f8acb GL - Creation of objects kinda sorted 2014-01-23 09:14:04 +01:00
Erik Persson 121fd51c45 GL collision with level should worm 2014-01-23 08:57:46 +01:00
lindaandersson 3f144289ec GL - merge with gameserver, crash on collision in gameLogic 2014-01-23 08:30:26 +01:00
lindaandersson a591903d8f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-23 08:25:10 +01:00
lindaandersson f657a58a4f GL - adding a camera on the client 2014-01-23 08:24:35 +01:00
Erik Persson 6a888cb154 GL - adjusting collisionManager 2014-01-22 15:47:44 +01:00
Dennis Andersen 22a5db97f8 Added final protocols, and a bit of support for them on server side 2014-01-22 15:22:52 +01:00
Erik Persson ce80e8155c GL - formatting mistake 2014-01-22 14:39:10 +01:00
Erik Persson 43eac4cbe3 moved ForcePushAction for massdriver to collisionManager 2014-01-22 14:26:45 +01:00
Erik Persson 80204ecbe3 GL - Massdriver usage of applyeffect 2014-01-22 13:02:13 +01:00
Erik Persson 954de26b43 GL - mergeproblems 2014-01-21 16:11:02 +01:00
Erik Persson 0aae9de92b blah 2014-01-21 16:10:07 +01:00
Erik Persson ebaa668382 Major updates to Collision handling with the class CollitionManager. changes started on the massdriver 2014-01-21 16:09:39 +01:00
lindaandersson 8792aab992 GL - merge with gameServer 2014-01-21 14:36:46 +01:00
Dennis Andersen 50c09547f3 GameServer - Added protocols and stuff 2014-01-21 14:32:42 +01:00
lindaandersson 561418c427 GL - gravity working 2014-01-21 14:28:27 +01:00
lindaandersson 06d468299a GL - linking problem fix 2014-01-21 10:37:45 +01:00
Dennis Andersen f7f59e8ac8 GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client 2014-01-21 09:52:48 +01:00
Dennis Andersen 0a41d20099 GameLogic - Merged with graphics 2014-01-20 16:36:25 +01:00
Dennis Andersen 386b27e2f7 GameLogic - Merge with sprint2.5 2014-01-20 16:17:01 +01:00
Dennis Andersen 1a3c63cda9 GameLogic - fixed some minor merging errors 2014-01-20 16:02:26 +01:00
Dennis Andersen ab2a3a3892 GameLogic - fixed some minor merging errors 2014-01-20 16:01:54 +01:00
Dennis Andersen 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +01:00
lindaandersson a1128986d5 Merge with Gamle Logic 2014-01-20 11:59:43 +01:00
Erik Persson ce4c57bab3 GL - player inherits dynamicobject instead of object 2014-01-20 08:40:41 +01:00
Erik Persson eaf0ae1479 GL - can now compile 2014-01-17 08:52:34 +01:00
lindaandersson 7b2be02113 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-01-16 12:26:33 +01:00
lindaandersson a168328a44 GL - movement with physics working!! 2014-01-16 12:26:14 +01:00
Erik Persson d08e999f07 Create level and initiate it with a rigidbody etc 2014-01-16 12:08:24 +01:00
Erik Persson 225d8912da GL - make rigidbody level 2014-01-16 11:40:29 +01:00
Erik Persson 0080a9f6f2 small name changes 2014-01-16 11:17:19 +01:00
Erik Persson 567fa229eb small name changes 2014-01-16 11:07:45 +01:00
lindaandersson aac92bc20e GL- send new player pos to client 2014-01-16 09:30:16 +01:00
lindaandersson 0c8783ba84 GL - merge done 2014-01-15 12:02:52 +01:00
lindaandersson 8557559b9b GL - going to merge 2014-01-15 11:57:36 +01:00
Dennis Andersen 5f00aa7af7 GL - Merge with origin/Gamelogic 2014-01-15 11:45:34 +01:00
Erik Persson 208482b0ce GL merge error 2014-01-15 11:25:59 +01:00
Dennis Andersen ceac5ce31d Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic 2014-01-15 11:03:25 +01:00
lindaandersson 9a32c44e49 GL - Merge branch 'GameLogic' 2014-01-15 08:19:35 +01:00
lindaandersson 0ffe26c134 GL - Merge client with gameserver 2014-01-15 08:18:06 +01:00
Dennis Andersen 54babfc7c7 Gameserver - Merged with Gamelogic 2014-01-14 10:38:35 +01:00
Erik Persson 4c1be4d807 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/Game.cpp
 2014-01-14 10:33:08 +01:00
Dennis Andersen 87b8c0c7bb Gameserver - Merged with Gamelogic 2014-01-14 10:29:39 +01:00
Erik Persson 54240b217c GameLogic - game interface updated(not finnished) 
förlåt dennis
 2014-01-14 10:28:12 +01:00
lindaandersson 32e64c0dbb GL - moved reciever struct to a separate file 2014-01-14 10:25:49 +01:00
Dennis Andersen 82de85d1ac Fixed minor server network bug, modified shader to get visual 2014-01-14 10:15:50 +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 04c5898f4e GL - sending string and createOBJ working 2014-01-14 09:24:55 +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
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 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
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
Dennis Andersen 0065779205 Added comments where the physic generated errors due to big patch 2013-12-21 17:37:30 +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
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
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
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
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
Linda Andersson dc3221ee11 GL - set pos function for C_models 2013-12-16 11:08:10 +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 7cda07507a GameLogic - Pre merge with Netowkr 2013-12-16 09:50:23 +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 34d79d1207 Gamelogic - Forgot some stuff 2013-12-16 09:09:54 +01:00
dean11 9eb8fcba40 Gamelogic - Publication to others... 2013-12-16 09:00:11 +01:00