NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 92b3525587 GameLogic - Cleanup after erik ;) Dennis Andersen 2013-12-18 13:12:11 +0100
  • 33d045de1a GameLogic - Merge with Erik Dennis Andersen 2013-12-18 13:10:47 +0100
  • 8721224d7c GameLogic - Added alot of functionality to Game related parts Dennis Andersen 2013-12-18 13:07:10 +0100
  • f5490bf111 using a global id in object Erik Persson 2013-12-18 13:01:13 +0100
  • 0c98e2847d GL - added some protocols Linda Andersson 2013-12-18 12:18:01 +0100
  • e16c939285 GL - using window manager, fixed consistent linking in danBiasGame Linda Andersson 2013-12-18 10:47:30 +0100
  • e9c5a49778 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Dennis Andersen 2013-12-18 08:44:18 +0100
  • 347b546566 GameLogic - some minor fixes Dennis Andersen 2013-12-18 08:44:10 +0100
  • 2daf93987a team fix Erik Persson 2013-12-18 08:41:31 +0100
  • 1eceb6095f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Dennis Andersen 2013-12-18 08:37:55 +0100
  • bf5cc69ff7 GameLogic - Added Postbox system to netsession Dennis Andersen 2013-12-18 08:37:45 +0100
  • 4d7be753c5 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2013-12-18 08:32:20 +0100
  • 8173f3818d gamelogic update and added some level design elements Erik Persson 2013-12-18 08:30:58 +0100
  • d4e92d4bbe Network - Fixed clear string in Translator. Pontus Fransson 2013-12-18 00:21:00 +0100
  • 745268eeed Network - Removed line so it doesn't causes error. Pontus Fransson 2013-12-18 00:15:21 +0100
  • 623267ad1b Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2013-12-18 00:10:47 +0100
  • fc8dba6610 Network - Fixed Unpackb. Pontus Fransson 2013-12-18 00:08:50 +0100
  • e1d0150ef1 Network - OysterByte += should now work correctly. Pontus Fransson 2013-12-18 00:07:24 +0100
  • 4df33b759c Network - char[] unpacking. Pontus Fransson 2013-12-18 00:04:25 +0100
  • 6f48e6a13a Deffered Render Update Dennis 2013-12-17 14:49:45 +0100
  • 8700824d12 Gamlogic - Merge with Linda Dennis Andersen 2013-12-17 14:32:57 +0100
  • 097fa1da34 GameLogic - Pre merge with Linda Dennis Andersen 2013-12-17 14:15:20 +0100
  • 9d722bced3 GL - recieve messages from server Linda Andersson 2013-12-17 13:39:10 +0100
  • 682a28513b Gamelogic - Merge with network Dennis Andersen 2013-12-17 11:35:34 +0100
  • 7c029a5242 Network - Fixed bugs Pontus Fransson 2013-12-17 10:58:07 +0100
  • 8667e14afb Merged with Linda after merge conflicts dean11 2013-12-17 10:28:44 +0100
  • 4650615a61 Gamelogic - Pre merge with Linda dean11 2013-12-17 10:25:34 +0100
  • 5d1d64bebb GL - trying to send move protocol Linda Andersson 2013-12-17 10:07:46 +0100
  • cbf3c7db8f asd Pontus Fransson 2013-12-17 09:05:49 +0100
  • f31da90830 Network - Connection set blocking to true while connecting. Pontus Fransson 2013-12-17 09:05:32 +0100
  • 23a05bf431 Network - OysterByte += operator Pontus Fransson 2013-12-17 08:45:47 +0100
  • abc94e9acb Nothing important done dean11 2013-12-17 00:51:42 +0100
  • 3ffbb9525d Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-17 00:47:06 +0100
  • e4e0e1c189 Network - Fixed delay loading dll. Pontus Fransson 2013-12-16 19:58:31 +0100
  • 3ee25f0112 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2013-12-16 11:08:22 +0100
  • dc3221ee11 GL - set pos function for C_models Linda Andersson 2013-12-16 11:08:10 +0100
  • ca8df00e34 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-16 11:05:57 +0100
  • ec3c5f1290 Gamelogic - Added threading functionality to NetworkClient dean11 2013-12-16 11:05:24 +0100
  • 1c8f9c7801 Fixed link errors with dll files Sam Mario Svensson 2013-12-16 11:04:00 +0100
  • 77bc6050fc Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2013-12-16 10:04:27 +0100
  • f5b806a512 launcher include Erik Persson 2013-12-16 10:03:30 +0100
  • b351a7bac4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-16 10:02:41 +0100
  • 6bfe7711ab Gamelogic - Modified gameprotocol id:s dean11 2013-12-16 10:02:30 +0100
  • b60166a6e8 GL - connect to server, need right IP Linda Andersson 2013-12-16 09:55:51 +0100
  • 0d5b84a7dd Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-16 09:54:05 +0100
  • 7cda07507a GameLogic - Pre merge with Netowkr dean11 2013-12-16 09:50:23 +0100
  • 8a8cfcc5d6 Network - Forgot to use Initiateclient(). Pontus Fransson 2013-12-16 09:48:41 +0100
  • fa1473455f GL - added C_obj files, client obj in game state to send input Linda Andersson 2013-12-16 09:45:12 +0100
  • 6f979b1044 Network - Merge with gamelogic Pontus Fransson 2013-12-16 09:15:13 +0100
  • 0c6badb749 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-12-16 09:11:18 +0100
  • 34d79d1207 Gamelogic - Forgot some stuff dean11 2013-12-16 09:09:54 +0100
  • 3a752f6b95 Network - Merge with gamelogic Pontus Fransson 2013-12-16 09:09:48 +0100
  • 9eb8fcba40 Gamelogic - Publication to others... dean11 2013-12-16 09:00:11 +0100
  • 7acb3a3613 Network - Pontus Fransson 2013-12-16 08:59:38 +0100
  • 17aa38d865 GameLogic - Merge with network, resolved 2 merging errors dean11 2013-12-14 22:54:24 +0100
  • f29f50f830 Merged with Gamelogic branch and fixed errors and added features dean11 2013-12-14 22:04:42 +0100
  • 8b1c2b91e8 Fixed some craches and stuff dean11 2013-12-13 23:47:16 +0100
  • c41f5dda3f Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2013-12-13 12:03:04 +0100
  • 7c1d19946d GL - Connection to network in clinet Linda Andersson 2013-12-13 12:02:49 +0100
  • f1f9f4d20a added include string in level.h Erik Persson 2013-12-13 11:11:51 +0100
  • 7817003db8 updated h.files Erik Persson 2013-12-13 11:06:03 +0100
  • 94ccd91828 Network - Added comments Pontus Fransson 2013-12-13 08:23:54 +0100
  • 2ddb984a2b Network - Fixed bugg, and small fixed Pontus Fransson 2013-12-13 08:17:05 +0100
  • 4617523f8b Gamelogic - Commit because branch switch dean11 2013-12-12 20:32:54 +0100
  • 092f83a084 Network - Id on client and == operator. Pontus Fransson 2013-12-12 15:33:11 +0100
  • a3e4262c08 Merge with Other part of gamelogic(DanbiasGame) dean11 2013-12-12 14:44:06 +0100
  • 71d31db884 GAMELOGIC - Fixed a minor major huge issue with no problems dean11 2013-12-12 14:37:35 +0100
  • 42fa756866 GameLogic - Merge with util fixed dean11 2013-12-12 14:29:56 +0100
  • 94651ec77a Network - Added stop in listener destructor. Pontus Fransson 2013-12-12 14:14:48 +0100
  • 693b9df928 Some wierd stuff is going on here dean11 2013-12-12 12:54:08 +0100
  • d0bd60c856 Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-12 12:23:55 +0100
  • c661d26d2a Network - Not deleting smart pointers anymore. Pontus Fransson 2013-12-12 12:23:35 +0100
  • c63e9f1c08 Some comments on the massdriver and player Erik Persson 2013-12-12 12:21:19 +0100
  • a5ee468795 Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-12 12:17:52 +0100
  • 9b9a92556a Pre-merge with network, (again) dean11 2013-12-12 12:17:39 +0100
  • 8f36f64c4f updated AttatchmentMassDriver and CollisionManager Erik Persson 2013-12-12 12:16:13 +0100
  • e9b41f8cb8 Network - Fixed copy construct Pontus Fransson 2013-12-12 12:14:53 +0100
  • 2ea252919a Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-12 10:37:40 +0100
  • af7f0e01a8 Pre-network merge, (again) dean11 2013-12-12 10:36:55 +0100
  • 49cfbbebd5 Network - Changed to CustomProtocolObject on send. Pontus Fransson 2013-12-12 10:32:43 +0100
  • c801ab829a Merge remote-tracking branch 'origin/Physics' into GameLogic Erik Persson 2013-12-12 10:10:52 +0100
  • c740bd5935 Added some data to PhysicsAPI Robin Engman 2013-12-12 10:02:35 +0100
  • 2424b51c3e Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2013-12-12 09:39:27 +0100
  • 0adb831f7a Merge branch 'Network' of https://github.com/dean11/Danbias into GameLogic dean11 2013-12-12 09:36:30 +0100
  • e11d7d94f7 updated the weapon system, collisionManager and redid the "object" heirarki Erik Persson 2013-12-12 09:36:14 +0100
  • fd3776a53b GameLogic - Pre-network merge dean11 2013-12-12 09:33:59 +0100
  • 04436258a5 Network - Non-blocking Pontus Fransson 2013-12-12 09:24:57 +0100
  • bbe59836da Merge branch 'Network' of https://github.com/dean11/Danbias into Network Pontus Fransson 2013-12-11 21:45:51 +0100
  • 5a3188d5f6 Network - NetworkServer, NetworkClient, Translator Pontus Fransson 2013-12-11 21:45:43 +0100
  • 22665bc44b GL - started using network and protocols for sending/recieveing Linda Andersson 2013-12-11 12:14:00 +0100
  • bb789faa67 GL - merge with network - fixed dependencies in launcher project Linda Andersson 2013-12-11 09:00:36 +0100
  • d95d771c43 Network - Merged with Gamelogic dean11 2013-12-10 14:00:20 +0100
  • eb0b5ec0ee Network - Removing old gamelogic stuff before replacing them with new stuff dean11 2013-12-10 13:38:25 +0100
  • 465ea1bd19 GL - soleved merge errors in project files Linda Andersson 2013-12-10 11:50:35 +0100
  • 78f20e04a1 GL - moved object files to Obj Linda Andersson 2013-12-10 11:27:20 +0100
  • f0181ad9f4 GL - fixed defines in headers - more structure for states Linda Andersson 2013-12-10 11:26:18 +0100
  • 4b9f2671bf updated weapon Erik Persson 2013-12-10 11:17:25 +0100
  • 58c3371edd Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Erik Persson 2013-12-10 09:57:13 +0100
  • 97e0b1298a added functionallity to player and weapon, started on the weapon design. Erik Persson 2013-12-10 09:57:05 +0100
  • e06ee31754 Network - First basic API. Pontus Fransson 2013-12-10 08:32:08 +0100