Permalink
Browse files

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

Conflicts:
	bin/windows/gameplay-encoder.exe
  • Loading branch information...
2 parents c03bf9a + 4a0524e commit 23f33e75a59a2c6ddd56e4c29aef1ed30b63e968 @sgrenier sgrenier committed Oct 22, 2012
Showing with 786 additions and 178 deletions.
  1. +11 −11 CHANGES.md
  2. +9 −2 CMakeLists.txt
  3. +1 −1 README.md
  4. BIN bin/linux/gameplay-encoder
  5. BIN bin/macosx/gameplay-encoder
  6. BIN external-deps/bullet/lib/linux/{ → x64}/libBulletCollision.a
  7. BIN external-deps/bullet/lib/linux/{ → x64}/libBulletDynamics.a
  8. BIN external-deps/bullet/lib/linux/{ → x64}/libLinearMath.a
  9. BIN external-deps/bullet/lib/linux/x86/libBulletCollision.a
  10. BIN external-deps/bullet/lib/linux/x86/libBulletDynamics.a
  11. BIN external-deps/bullet/lib/linux/x86/libLinearMath.a
  12. BIN external-deps/collada-dom/lib/linux/{ → x64}/libcollada14dom.a
  13. BIN external-deps/collada-dom/lib/linux/x86/libcollada14dom.a
  14. BIN external-deps/freetype2/lib/linux/{ → x64}/libfreetype.a
  15. BIN external-deps/freetype2/lib/linux/x86/libfreetype.a
  16. BIN external-deps/glew/lib/linux/{ → x64}/libGLEW.a
  17. BIN external-deps/glew/lib/linux/x86/libGLEW.a
  18. BIN external-deps/libpng/lib/linux/{ → x64}/libpng.a
  19. BIN external-deps/libpng/lib/linux/x86/libpng.a
  20. BIN external-deps/lua/lib/linux/{ → x64}/liblua.a
  21. BIN external-deps/lua/lib/linux/x86/liblua.a
  22. BIN external-deps/oggvorbis/lib/linux/{ → x64}/libogg.a
  23. BIN external-deps/oggvorbis/lib/linux/{ → x64}/libvorbis.a
  24. BIN external-deps/oggvorbis/lib/linux/x86/libogg.a
  25. BIN external-deps/oggvorbis/lib/linux/x86/libvorbis.a
  26. BIN external-deps/openal/lib/linux/{ → x64}/libopenal.a
  27. BIN external-deps/openal/lib/linux/x86/libopenal.a
  28. BIN external-deps/zlib/lib/linux/{ → x64}/libz.a
  29. BIN external-deps/zlib/lib/linux/x86/libz.a
  30. +5 −4 gameplay-encoder/CMakeLists.txt
  31. +1 −1 gameplay-encoder/README.md
  32. +3 −3 gameplay-encoder/gameplay-bundle.txt
  33. +1 −1 gameplay-encoder/src/Animation.cpp
  34. +2 −2 gameplay-encoder/src/AnimationChannel.cpp
  35. +1 −1 gameplay-encoder/src/Animations.cpp
  36. +1 −7 gameplay-encoder/src/FileIO.cpp
  37. +2 −3 gameplay-encoder/src/FileIO.h
  38. +3 −3 gameplay-encoder/src/GPBFile.cpp
  39. +2 −2 gameplay-encoder/src/Mesh.cpp
  40. +2 −2 gameplay-encoder/src/MeshSkin.cpp
  41. +2 −2 gameplay-encoder/src/Object.h
  42. +1 −1 gameplay-encoder/src/ReferenceTable.cpp
  43. +6 −6 gameplay-samples/CMakeLists.txt
  44. +2 −2 gameplay-samples/sample01-longboard/android/jni/Android.mk
  45. +2 −2 gameplay-samples/sample02-spaceship/android/jni/Android.mk
  46. +2 −2 gameplay-samples/sample03-character/android/jni/Android.mk
  47. +2 −2 gameplay-samples/sample04-particles/android/jni/Android.mk
  48. +1 −1 gameplay-samples/sample05-lua/android/jni/Android.mk
  49. +1 −1 gameplay-samples/sample05-lua/src/LuaGame.h
  50. +6 −6 gameplay-samples/sample06-racer/android/jni/Android.mk
  51. +1 −1 gameplay-samples/sample06-racer/src/RacerGame.h
  52. +8 −2 gameplay-template/gameplay-template-CMakeLists.txt
  53. +30 −30 gameplay-tests/CMakeLists.txt
  54. +1 −1 gameplay-tests/src/Audio3DTest.cpp
  55. +1 −1 gameplay-tests/src/TestsGame.cpp
  56. +13 −13 gameplay/CMakeLists.txt
  57. +1 −1 gameplay/src/AnimationClip.cpp
  58. +1 −1 gameplay/src/AnimationTarget.h
  59. +1 −1 gameplay/src/Bundle.h
  60. +1 −1 gameplay/src/Button.h
  61. +1 −1 gameplay/src/CheckBox.h
  62. +16 −14 gameplay/src/Container.cpp
  63. +11 −3 gameplay/src/Container.h
  64. +2 −2 gameplay/src/Effect.cpp
  65. +1 −4 gameplay/src/FileSystem.cpp
  66. +8 −1 gameplay/src/FileSystem.h
  67. +1 −1 gameplay/src/Form.cpp
  68. +1 −1 gameplay/src/Form.h
  69. +1 −1 gameplay/src/Gamepad.h
  70. +1 −1 gameplay/src/Joystick.h
  71. +1 −1 gameplay/src/Label.h
  72. +1 −1 gameplay/src/Logger.cpp
  73. +1 −1 gameplay/src/Matrix.h
  74. +1 −1 gameplay/src/Node.cpp
  75. +1 −1 gameplay/src/Node.h
  76. +3 −3 gameplay/src/PhysicsCharacter.cpp
  77. +1 −1 gameplay/src/PhysicsCollisionObject.h
  78. +1 −1 gameplay/src/PhysicsController.cpp
  79. +10 −0 gameplay/src/PhysicsRigidBody.cpp
  80. +72 −3 gameplay/src/PhysicsRigidBody.h
  81. +38 −0 gameplay/src/PhysicsRigidBody.inl
  82. +1 −1 gameplay/src/PhysicsVehicleWheel.h
  83. +6 −9 gameplay/src/PlatformBlackBerry.cpp
  84. +1 −1 gameplay/src/Quaternion.cpp
  85. +1 −1 gameplay/src/RadioButton.h
  86. +1 −1 gameplay/src/RenderState.cpp
  87. +2 −0 gameplay/src/ScriptController.cpp
  88. +1 −1 gameplay/src/ScriptController.h
  89. +1 −1 gameplay/src/Slider.h
  90. +37 −0 gameplay/src/lua/lua_FileSystem.cpp
  91. +1 −0 gameplay/src/lua/lua_FileSystem.h
  92. +229 −0 gameplay/src/lua/lua_PhysicsRigidBody.cpp
  93. +4 −0 gameplay/src/lua/lua_PhysicsRigidBody.h
  94. +199 −1 gameplay/src/lua/lua_PhysicsRigidBodyParameters.cpp
  95. +2 −0 gameplay/src/lua/lua_PhysicsRigidBodyParameters.h
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
View
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
View
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 23f33e7

Please sign in to comment.