Merge branch 'master' of https://github.com/shaswata56/Taos-Adventure

shaswata56 · Jan 23, 2019 · f381871 · f381871
2 parents efae45d + ebdb992
commit f381871
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/Header/physX.hpp b/Header/physX.hpp
@@ -8,7 +8,7 @@ float velocityY = 0;
 float accelerationX = 0;
 float accelerationY = 0;
 float gravity = 1.4;
-int pressUpCount=0;
+int pressUpCount = 0;
 
 void updateMovement()
 {

diff --git a/Header/sceneManger.hpp b/Header/sceneManger.hpp
@@ -12,7 +12,7 @@
 
 int updateScene() {
     RenderWindow app(VideoMode(1200,800), "Pos:", Style::Close);
-    app.setFramerateLimit(60);
+    app.setFramerateLimit(45);
     app.setVerticalSyncEnabled(false);
     currentScene = mainMenu;
     Font AmaticB;

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
    #                                                      Tao's  Adventure  [![CodeFactor](https://www.codefactor.io/repository/github/shaswata56/taos-adventure/badge)](https://www.codefactor.io/repository/github/shaswata56/taos-adventure)
 
-   Project: 2 | SWE-1/2 | Group: 17
+   Project: 2 | SUST SWE-1/2 | Group: 17
 
    [Shakirul Hasan Khan](https://github.com/KhanShaheb34) – 2017831034
 

diff --git a/Scenes/menu.hpp b/Scenes/menu.hpp
@@ -38,14 +38,10 @@ void menu(RenderWindow &app){
         menuStarted = false;
         mainbg.play();
     }
-    //  Mouse pointer location viewer
     string str;
-    str.append(to_string(Mouse::getPosition(app).x));
-    str.append(",");
-    str.append(to_string(Mouse::getPosition(app).y));
+    str.append("Taos-Adventure");
     app.setTitle(str);
-
-
+
     if(Mouse::isButtonPressed(Mouse::Left)){
         Vector2i mousePosition = Mouse::getPosition(app);
         if(mousePosition.x >= 545 && mousePosition.x <= 690 && mousePosition.y >= 400 && mousePosition.y <= 550)

diff --git a/Source/Taos-Adventure.cpp b/Source/Taos-Adventure.cpp
@@ -2,7 +2,6 @@
 
 int main()
 {
-    if(updateScene() == 1)
-    	main();
+    updateScene();
     return 0;
 }
diff --git a/osx-build.sh b/osx-build.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+g++ -framework sfml-window -framework sfml-graphics -framework sfml-system -framework sfml-audio Source/Taos-Adventure.cpp -o Taos-Adventure
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		g++ -framework sfml-window -framework sfml-graphics -framework sfml-system -framework sfml-audio Source/Taos-Adventure.cpp -o Taos-Adventure