Commit Graph

30 Commits

Author SHA1 Message Date
Linda Andersson 1bf7e21fcc Added player color to client. Spawnpoint class but logic needs to be implemented. Added kills and deatch counting and message sending for it. 2014-02-27 11:35:32 +01:00
Pontus Fransson 0369d8cf19 Not finished Pickup system. 2014-02-25 14:36:54 +01:00
Pontus Fransson 7f8c10292e Moved LevelLoader to a seperate lib project. 2014-02-19 11:00:16 +01:00
dean11 7395a0a495 Major cleanup 2014-02-17 10:38:11 +01:00
Erik Persson f14a83aef2 GL - Explosivebox now takes a float forceMagnitude instead of a vector 2014-02-14 10:57:24 +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
Erik Persson bd6b531418 GL - added Portal and started on crystalformation 2014-02-13 09:58:25 +01:00
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
Erik Persson 4ad86ae83b GL - Added jumppad(implemented but not tested) 2014-02-04 16:24:48 +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
Sam Mario Svensson 91bf6ce901 GL- LevelFormat fix 2014-01-27 13:57:18 +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
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 0f5517398d GL - Update uml, LevelParser.h.cpp ObjectDefines.h 2014-01-24 09:00:59 +01:00
Dennis Andersen 6c3c234be1 GameLogic - pree-sprint merge 2014-01-20 15:47:52 +01:00
Erik Persson eaf0ae1479 GL - can now compile 2014-01-17 08:52:34 +01:00
lindaandersson 8557559b9b GL - going to merge 2014-01-15 11:57:36 +01:00
Erik Persson 059b3dd5e4 GameLogic - Basic game interface made (functions not yet implemented) 2014-01-10 12:33:15 +01:00
Dennis Andersen beb116e964 Fixed some threafing and stuff 2013-12-19 12:32:23 +01:00
Erik Persson 8173f3818d gamelogic update and added some level design elements
teammanager, team,
2013-12-18 08:30:58 +01:00
dean11 f29f50f830 Merged with Gamelogic branch and fixed errors and added features 2013-12-14 22:04:42 +01:00
Erik Persson 7817003db8 updated h.files
description, started with level concept
2013-12-13 11:09:09 +01:00
Erik Persson 8f36f64c4f updated AttatchmentMassDriver and CollisionManager
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.

CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
2013-12-12 12:16:13 +01:00
Linda Andersson 465ea1bd19 GL - soleved merge errors in project files 2013-12-10 11:50:35 +01:00
Erik Persson 4b9f2671bf updated weapon 2013-12-10 11:17:25 +01:00
Erik Persson 97e0b1298a added functionallity to player and weapon, started on the weapon design. 2013-12-10 09:57:05 +01:00
Linda Andersson 4134836405 GL - added client objects
-  no memory leaks in client
2013-12-09 11:05:47 +01:00
Linda Andersson e658071643 GL- open a red window from lancher project 2013-12-04 11:32:43 +01:00
dean11 a852e8eab4 Created the game modules 2013-12-03 12:07:37 +01:00
Renamed from Code/GameLogic/GameLogic.vcxproj (Browse further)