Merge branch 'master' of https://github.com/TheArzhel/orBit

Author: AitorSimona

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Andres Ricardo Saladrigas Perez
+Copyright (c) 2018 Andres Ricardo Saladrigas Perez and Aitor Simona Bouzas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,16 +1,23 @@
 # orBit
 
 orBit is a singleplayer platfomer game made by Andres Saladrigas and Aitor Simona, two students od second year of Video Game Design and Development degree in UPC Barcelona, Spain.
-the gmae includes two levels, with usual mechanics. player can move right, left, jump and double jump
+The gmae includes two levels, with usual mechanics. player can move right, left, jump and double jump
 The game has been made using C++, using SDL and pugi libraries. The maps have been made using Tiled portable V0.17.
 
+## Installation
+Decompress the .zip file in any directory. Open the file directoy and double click on the executable.
+
 ## Controls
 ### Player movement:
 
-- A: move to the left;
+- A: move to the left
 
 - D: move to the right
 
+- W: while in GodMode going up
+
+- D: while in GodMode going down
+
 - SPACE: jump
 
 - SPACE in mid air: doble jump
@@ -20,8 +27,9 @@ The game has been made using C++, using SDL and pugi libraries. The maps have be
 - F2: start from th beginning of current level
 - F5: save current state
 - F6: Load the previous state
-- F9: view collider
-- F10: GodMode
+- F9: view collider and pathfinding
+- F10: GodMode (allows to fly)
+- F11: Enable/Disable FPS cap to 30
 - 1: Go to 1st Stage
 - 2: Go to 2nd Stage
 
@@ -56,12 +64,12 @@ https://www.bfxr.net/
 
 ## License
 
-© Andrés Ricardo Saladrigas Pérez
+© Andrés Ricardo Saladrigas Pérez and Aitor Simona Bouzas
 
 Licensed under the [MIT License](LICENSE.txt)
 
 
-## Innovation
+## Innovation First Assignment
 
 ### Additional fetures added
 
@@ -71,9 +79,51 @@ Licensed under the [MIT License](LICENSE.txt)
 
 - Checkpoint collider: creating checkpoints to save progress. If player dies he will start from checkpoints
 
-- Animations on Tiled: all animations are in Tiled. Inside folder Game/animation. player animation is a xml file we read to interpret data
+- Player animations on Tiled: player animations are in Tiled. Inside folder Game/animation. player animation is a xml file we read to interpret data
 
 - Camera: Only tiles inside the camera are printed 
 
--Colliders: Only colliders that are in camera are checked in module collisions Update
+- Colliders: Only colliders that are in camera are checked in module collisions Update
+
+## Innovation Second Assignment
+
+### Additional fetures added
+
+- Collisions: Only colliders that are near an entity are checked. Update in module collisions.
+
+- Enemies Update Area: enemies update just when the enemy is in the player depth of field.
+
+- Enemies animations on Tiled: animations are loaded from a tmx defined in tiled.
+
+- Enemies position on Tiled: enemies position defined in tiled and loaded from tmx
+
+- FX: implemented sound effects to player.
+
+## Bugs fixed
+
+- Parallax based on camera: parallax now moves according to camera, not to player
+
+- Player collider: player collider smaller.
+
+- Collision: colliders are not changing Y position of the player.
+
+## Task List
+
+- Implement flying enemy  (Andres)
+- Implement ground Enemy  (Andres)
+- Implement entity module (Aitor)
+- Player to entity 	    (Aitor)
+- Save enemies states     (Andres)
+- Load enemies states     (Andres)
+- Pathfinding enemies     (Aitor)
+- Pathfinding module      (Aitor)
+- Entity UML 		    (Andres)
+- Framerate Control 	    (Aitor)
+- Debug key FPS 		    (Aitor)
+- Brofiler                (Aitor)
+- Debug GodMode           (Aitor)
+- README                  (Andres)
+- Title Window            (Andres)
+
+