Permalink
Browse files

Merge branch 'next' of https://github.com/blackberry/GamePlay into next

  • Loading branch information...
2 parents 4a51e46 + 8805a4d commit 8210f1512183a9e0a83da5851cd28961a17961a4 Adam Blake committed Mar 22, 2013
Showing 2,750 changed files with 29,897 additions and 442,106 deletions.
View
Oops, something went wrong.
View
@@ -1,5 +1,8 @@
## v1.7.0
+
- Adds a lua function "convert(object, className)" that will convert a gameplay userdata object to another class type by changing the metatable. (For example: This lets you convert Control to Button in lua)
+- Repo directory restructure dropping gameplay- prefix on many folders and files.
+- Removed pre-compiled api/html docs to reduce repository bloat.
## v1.6.0
View
@@ -22,12 +22,8 @@ endif()
add_subdirectory(gameplay)
# gameplay samples
-add_subdirectory(gameplay-samples)
+add_subdirectory(samples)
-# gameplay samples
-add_subdirectory(gameplay-tests)
-# gameplay encoder (See gameplay/bin)
-#add_subdirectory(gameplay-encoder)
View
@@ -0,0 +1,3 @@
+This folder is used to generate the doxygen api docs.
+
+
File renamed without changes.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
View
@@ -1,19 +0,0 @@
-## GamePlay External Dependencies
-
-A pre-built version of all required external dependencies is included here for convenience. However, you may at some point wish to rebuild some or all of the external depencies if for example you want to target a different processor, build with a different character encoding, etc.
-
-Each external library folder includes a 'README.md' file that lists the current version of the external library that is expected by GamePlay, so ensure you grab the correct source code version when building libraries.
-
-Generally you should build external libraries in Release mode, not Debug, unless you have a specific need to debug the third party libraries.
-
-Platform-specific instructions are below.
-
-## Windows (Microsoft Visual Studio)
-
-1. Select the character encoding to match GamePlay libraries (Unicode by default)
-
-2. Turn off Whole Program Optimization on General page
-
-3. Make sure Multi-threaded DLL (/MD) is specified on C/C++ -> Code Generation page
-
-4. Make sure the "Debug Information Format" option is cleared (no /Zx option specified on command-line) on the C/C++ -> General page
@@ -1,5 +0,0 @@
-## Bullet Physics Library
-
-http://code.google.com/p/bullet/
-
-Version: 2.79
Oops, something went wrong.

0 comments on commit 8210f15

Please sign in to comment.