Index: code/branches/tgidronFS16/src/modules/hover/Hover.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/Hover.cc	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/hover/Hover.cc	(revision 11192)
@@ -64,4 +64,6 @@
         cellHeight = 0;
 
+        bShowLevel = false;
+
         totFlags = 0;
 
@@ -80,4 +82,17 @@
             cellSize = this->origin_->getCellSize();
             cellHeight = this->origin_->getCellHeight();
+
+            /*
+            bool occupiedCells[numCells][numCells];
+
+            for(int i = 0; i < numCells; i++)
+            {
+                for(int j = 0; j < numCells; j++)
+                {
+                    occupiedCells[i][j] = false;
+                }
+            }
+            occupiedCells[0][0] = true;
+            */
 
             MazeGenerator generator(numCells);
@@ -93,4 +108,16 @@
                 (new HoverWall(origin_->getContext()))->init(i+1,      0,        cellSize, cellHeight, 2);
                 (new HoverWall(origin_->getContext()))->init(i+1,      numCells, cellSize, cellHeight, 2);
+            }
+
+
+            //Ground
+            for(int i = 0; i<numCells; i++){
+                for(int j = 0; j<numCells; j++){
+                    StaticEntity* groundCell = new StaticEntity(origin_->getContext());
+
+                    groundCell->addTemplate(origin_->getGroundTemplate());
+                    groundCell->setPosition(get3dCoordinates(i,j,-60));
+                }
+
             }
 
@@ -112,5 +139,106 @@
             }
 
-            //Generate 5 flags randomly (test only 1 flag)
+            createFlags();
+
+            //Generate 3 PickupSpawners randomly (destroy hover pickup)
+            for (int i = 0; i<3; i++)
+            {
+                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
+
+                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 0.0f));
+                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplate());
+                pickupSpawner->setMaxSpawnedItems(3);
+                pickupSpawner->setRespawnTime(30);
+                pickupSpawner->setTriggerDistance(40);
+                // Add pickup spawner to the pickup spawner list
+                pickupSpawners_.push_back(pickupSpawner);
+            }
+            
+            //Generate 3 PickupSpawners randomly (speed pickup)
+            for (int i = 0; i<3; i++)
+            {
+                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
+
+                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 0.0f));
+                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateSpeed());
+                pickupSpawner->setMaxSpawnedItems(3);
+                pickupSpawner->setRespawnTime(30);
+                pickupSpawner->setTriggerDistance(40);
+                // Add pickup spawner to the pickup spawner list
+                pickupSpawners_.push_back(pickupSpawner);
+            }
+
+            //Generate 3 PickupSpawners randomly (shrink pickup)
+            for (int i = 0; i<3; i++)
+            {
+                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
+
+                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 0.0f));
+                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateShrink());
+                pickupSpawner->setMaxSpawnedItems(3);
+                pickupSpawner->setRespawnTime(30);
+                pickupSpawner->setTriggerDistance(40);
+                // Add pickup spawner to the pickup spawner list
+                pickupSpawners_.push_back(pickupSpawner);
+            }
+
+            //*****************************************************************************
+
+            //Generate destroyable crates randomly on field
+
+            for (int i = 0; i<10; i++){
+
+                Pawn* crate = new Pawn(origin_->getContext());
+
+                crate->addTemplate(origin_->getObstacleTemplate());  
+                crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 43.0f));
+
+
+            }    
+            
+
+
+
+             //If no lives are left, end game
+            if(lives <= 0)
+            {
+                GSLevel::startMainMenu();
+            }
+            // Debug
+            orxout() << this->origin_->getPickupTemplate() << endl;
+            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
+
+
+            orxout() << this->origin_->getPickupTemplateSpeed() << endl;
+            orxout() << this->origin_->getPickupRepresentationTemplateSpeed() << endl;
+
+            orxout() << this->origin_->getObstacleTemplate() << endl;
+            //orxout() << crate->getPosition() << endl;
+        }
+    }
+
+
+    // Start new level
+    void Hover::createFlags()
+    {
+        //Generate 5 flags randomly (test only 1 flag)
+
+          /*  do
+            {
+                int i = 0;
+
+                HoverFlag* flag = new HoverFlag(origin_->getContext());
+                int x = rand()%numCells;
+                int y = rand()%numCells;
+                flag->init(x, y, cellSize);
+                flags_.push_back(flag);
+
+                occupiedCells[x][y] = true;
+
+                i++;
+
+            }while( i<5 || occupiedCells[x][y] == true);
+            */
+
             for ( int i = 0; i < 5; i++ )
             {
@@ -118,90 +246,12 @@
                 flag->init(rand()%numCells, rand()%numCells, cellSize);
                 flags_.push_back(flag);
-            }
+
             
 
-            //Generate 3 PickupSpawners randomly (destroy hover pickup)
-            for (int i = 0; i<3; i++)
-            {
-                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
-
-                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
-                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplate());
-                pickupSpawner->setMaxSpawnedItems(3);
-                pickupSpawner->setRespawnTime(30);
-                pickupSpawner->setTriggerDistance(5);
-                // Add pickup spawner to the pickup spawner list
-                pickupSpawners_.push_back(pickupSpawner);
-            }
-            
-            //Generate 3 PickupSpawners randomly (speed pickup)
-            for (int i = 0; i<3; i++)
-            {
-                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
-
-                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
-                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateSpeed());
-                pickupSpawner->setMaxSpawnedItems(3);
-                pickupSpawner->setRespawnTime(30);
-                pickupSpawner->setTriggerDistance(5);
-                // Add pickup spawner to the pickup spawner list
-                pickupSpawners_.push_back(pickupSpawner);
-            }
-
-            //Generate 3 PickupSpawners randomly (shrink pickup)
-            for (int i = 0; i<3; i++)
-            {
-                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
-
-                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
-                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateShrink());
-                pickupSpawner->setMaxSpawnedItems(3);
-                pickupSpawner->setRespawnTime(30);
-                pickupSpawner->setTriggerDistance(5);
-                // Add pickup spawner to the pickup spawner list
-                pickupSpawners_.push_back(pickupSpawner);
-            }
-
-            //*****************************************************************************
-
-            //Generate a destroyable crate randomly on field
-
-            Pawn* crate = new Pawn(origin_->getContext());
-
-            
-            crate->addTemplate(origin_->getObstacleTemplate());  
-            crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
-            //ate->setInitialHealth(100.0f);
-            
-
-
-
-             //If no lives are left, end game
-            if(lives <= 0)
-            {
-                GSLevel::startMainMenu();
-            }
-            // Debug
-            orxout() << this->origin_->getPickupTemplate() << endl;
-            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
-
-            orxout() << this->origin_->getPickupTemplateSpeed() << endl;
-            orxout() << this->origin_->getPickupRepresentationTemplateSpeed() << endl;
-
-            orxout() << this->origin_->getObstacleTemplate() << endl;
-            orxout() << crate->getPosition() << endl;
-        }
-    }
-
-
-    // Start new level
-    void Hover::newLevel()
-    {
-        //Generate 5 flags randomly (test only 1 flag)
-            for ( int i = 0; i < 5; i++ )
-            {
-                HoverFlag* flag = new HoverFlag(origin_->getContext());
-                flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flags_.push_back(flag);
+                if(flags_[i]->getPosition() == get3dCoordinates(0,0,-60))
+                {
+                    flags_[i]->destroyLater();
+                    flags_.erase(flags_.begin()+i);
+                }
             }
             
@@ -245,5 +295,7 @@
             lives++;
         }
-        newLevel();
+        createFlags();
+        toggleShowLevel();
+        showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&Hover::toggleShowLevel, this)));
 
     }
Index: code/branches/tgidronFS16/src/modules/hover/Hover.h
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/Hover.h	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/hover/Hover.h	(revision 11192)
@@ -58,5 +58,5 @@
 
             void start();
-            void newLevel();
+            void createFlags();
             void levelUp();
             void endLevel();
@@ -77,4 +77,6 @@
                 { return this->level; }
 
+            bool bShowLevel;
+
         private:
 
@@ -94,5 +96,8 @@
 
             std::vector<PickupSpawner*> pickupSpawners_;
-            
+
+            void toggleShowLevel(){bShowLevel = !bShowLevel;}
+
+            Timer showLevelTimer;
     };
 }
Index: code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc	(revision 11192)
@@ -73,4 +73,5 @@
         XMLPortParam(HoverOrigin, "pickuptemplateshrink", setPickupTemplateShrink, getPickupTemplateShrink, xmlelement, mode);
         XMLPortParam(HoverOrigin, "pickuprepresentationtemplateshrink", setPickupRepresentationTemplateShrink, getPickupRepresentationTemplateShrink, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "groundtemplate", setGroundTemplate, getGroundTemplate, xmlelement, mode);
     }
 
Index: code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h	(revision 11192)
@@ -110,4 +110,11 @@
                 { return this->obstacleTemplate_; }        
 
+            //get and set for ground template
+
+            inline void setGroundTemplate(std::string groundTemplate)
+                { this->groundTemplate_ = groundTemplate; }
+            inline std::string getGroundTemplate() const
+                { return this->groundTemplate_; }  
+
         private:
             void checkGametype();
@@ -132,4 +139,7 @@
             //Template for crate obstacle
             std::string obstacleTemplate_;
+
+            //Template for ground cell
+            std::string groundTemplate_;
     };
 }
Index: code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.cc	(revision 11192)
@@ -85,6 +85,15 @@
                 this->setColour(ColourValue(1, 1, 1, 1));
                 this->setCaption(level);
+                
             }
             
+            if(this->hoverGame_->bShowLevel)
+                {
+                    setTextSize(0.2);
+                    setPosition(Vector2(0.3, 0.55));
+                    std::stringstream sstm;
+                    sstm << "Level " << level;
+                    this->setCaption(sstm.str());
+                }
     }
 
Index: code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/hover/TFlagsLivesLevelHUD.h	(revision 11192)
@@ -85,4 +85,5 @@
                 { return this->totLevel_; }
 
+
         private:
             Hover* hoverGame_;
Index: code/branches/tgidronFS16/src/modules/invader/Invader.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/invader/Invader.cc	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/invader/Invader.cc	(revision 11192)
@@ -71,5 +71,5 @@
         // spawn enemy every 3.5 seconds
         enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
-        comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&Invader::comboControll, this)));
+        comboTimer.setTimer(3.0f, false, createExecutor(createFunctor(&Invader::comboControll, this)));
         this->setHUDTemplate("InvaderHUD");
     }
Index: code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.cc	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.cc	(revision 11192)
@@ -85,4 +85,5 @@
         XMLPortParam(HsW01, "projectileMesh", setMesh, getMesh, xmlelement, mode);
         XMLPortParam(HsW01, "sound", setSound, getSound, xmlelement, mode);
+        XMLPortParam(HsW01, "speed", setSpeed, getSpeed, xmlelement, mode);
     }
 
Index: code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.h
===================================================================
--- code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.h	(revision 11184)
+++ code/branches/tgidronFS16/src/modules/weapons/weaponmodes/HsW01.h	(revision 11192)
@@ -112,4 +112,20 @@
             void muzzleflash();
 
+            /**
+            @brief Set the firing speed.
+            @param speed The speed of the shot
+            */
+
+            void setSpeed(const float speed)
+                { this->speed_ = speed; }
+
+            /**
+            @brief Get the firing speed.
+            @return Returns the speed of the shot
+            */
+
+            const float getSpeed() const
+                { return this->speed_; }
+
             std::string material_; //!< The material.
             std::string mesh_; //!< The mesh.
