Fix merge conflicts

CHANGES.md

@@ -1,7 +1,3 @@
-## v4.0.0
-
-- TODO
-
 ## v3.0.0
 
 - Adds support for Visual Studio 2015.
@@ -19,16 +15,20 @@
 - Adds support for cubemap textures.
 - Adds support for font kerning.
 - Adds support for Android x86.
+- Adds support for CMake on MacOSX.
 - Adds support for gamepads on Android.
 - Adds supoprt for Android extensions through custom native activity.
 - Adds water sample to browser.
 - Adds audio player sample to browser. 
 - Adds GamePlay-deps repository for cross-platform Cmake dependency builds.
+- Adds map/unmap buffer for Mesh and MeshPart.
 - Fixes to Scene Graph for merging Drawables on Node.
 - Fixes from setUserPointer to setUserObject(Ref*)
 - Fixes for virtual gamepad scaling.
 - Fixes Image to support grayscale PNGs.
 - Fixes Android to build with arm instead of thumb.
+- Fixes Android crash when gamepads disconnected.
+- Fixes for lua script bindings.
 
 ## v2.0.0
 

README.md

@@ -1,12 +1,12 @@
 <img src="https://raw.githubusercontent.com/gameplay3d/GamePlay/master/gameplay/res/icon.png" width=100/>
 
-## GamePlay v3.1.0
+## GamePlay v3.0.0
 
 GamePlay is an open-source, cross-platform, C++ game framework/engine for creating 2D/3D mobile and desktop games.
 
 - [Website](http://www.gameplay3d.io/)
 - [Wiki](https://github.com/gameplay3d/GamePlay/wiki)
-- [API Reference](http://gameplay3d.github.io/GamePlay/api/index.html)
+- [API](http://gameplay3d.github.io/GamePlay/api/index.html)
 - [Development Guide](https://github.com/gameplay3d/GamePlay/wiki#wiki-Development_Guide)
 - [Community Group](https://groups.google.com/d/forum/gameplay3d-developers)
 
@@ -17,9 +17,6 @@ GamePlay is an open-source, cross-platform, C++ game framework/engine for creati
 - [iOS](https://github.com/gameplay3d/GamePlay/wiki/Xcode-Setup)
 - [Android](https://github.com/gameplay3d/GamePlay/wiki/Android-NDK-Setup)
 
-## Roadmap for 'next' branch
-- [backlog](https://github.com/gameplay3d/GamePlay/issues?q=is%3Aopen+is%3Aissue+no%3Amilestone)
-
 ## License
 Open-source under [Apache 2.0 license](http://www.tldrlegal.com/license/apache-license-2.0-%28apache-2.0%29).
 

gameplay/src/gameplay.dox

@@ -2,17 +2,17 @@
  *
  * \section intro Introduction
  *
- * The gameplay framework is a cross-platform, C++, 3D game framework that includes a runtime library, tools,
+ * The gameplay framework is a cross-platform, C++, 2D/3D game framework that includes a runtime library, tools,
  * and learning content that allows indie developers to write games for mobile and desktop platforms
  * without worrying about platform details.
  *
  * \section License
  *
- * The project is open sourced under the Apache 2.0 license.
+ * The project is open-source under the Apache 2.0 license.
  *
  * \section Project Features
  *
- * The framework offers a well-defined, 3D game framework that's designed to get the most out of today's mobile and desktop platforms. 
+ * The framework offers a well-defined, 2D/3D game framework that's designed to get the most out of today's mobile and desktop platforms. 
  * Its purpose is to help you create stunning, world-class, games that harness the power and performance of the platform without
  * being concerned about the platform details. This is accomplished through a set of C++ classes that
  * are built on top of the OS, providing access to the hardware, graphics, and audio libraries

install.bat

@@ -7,7 +7,7 @@ REM
 REM Helps prevent repo bloat due to large binary files
 REM
 
-set prefix=https://github.com/gameplay3d/GamePlay/releases/download/v4.0.0
+set prefix=https://github.com/gameplay3d/GamePlay/releases/download/v3.0.0
 
 set filename=gameplay-deps
 

install.sh

@@ -7,7 +7,7 @@
 # Helps prevent repo bloat due to large binary files
 #
 
-prefix=https://github.com/gameplay3d/GamePlay/releases/download/v4.0.0
+prefix=https://github.com/gameplay3d/GamePlay/releases/download/v3.0.0
 
 filename=gameplay-deps
 

samples/browser/src/SpriteSample.cpp

@@ -51,11 +51,18 @@ void SpriteSample::initialize()
     _playerAnimation->play("idle");
 
     // Setup player text
-    Node* playerTextNode = _playerNode->findNode("text");
+    Node* playerTextNode = _scene->findNode("text");
+    playerTextNode->addRef();
+    _scene->removeNode(playerTextNode);
+    //XXX This is because SceneLoader doesn't support loading child nodes for other nodes
+    _playerNode->addChild(playerTextNode);
+
     playerTextNode->translateY(_playerSprite->getHeight());
     Text* playerText = dynamic_cast<Text*>(playerTextNode->getDrawable());
     playerText->setJustify(Font::ALIGN_TOP_HCENTER);
     playerText->setWidth(_playerSprite->getWidth());
+    SAFE_RELEASE(playerTextNode);
+
 
     // Custom Effect in sprite
     Effect* waterEffect = Effect::createFromFile("res/shaders/sprite.vert", "res/common/sprites/water2d.frag");