Permalink
Switch branches/tags
Commits on Dec 10, 2013
  1. Merge liquidfun

    stewartmiles committed Dec 10, 2013
  2. Merge googletest

    stewartmiles committed Dec 10, 2013
  3. Merge freeglut

    stewartmiles committed Dec 10, 2013
  4. Merge "Updated links to videos in LiquidFun documentation." into ub-g…

    wolffg authored and Android (Google) Code Review committed Dec 10, 2013
    …ames-master
  5. Updated links to videos in LiquidFun documentation.

    stewartmiles committed Dec 10, 2013
    In addition, added Google analytics script to all doxygen generated pages.
    Tested:
    Browsed the site locally.
    
    Bug: 11877113
    Change-Id: I48ebfca4f7ffe77a553ef84a3e21acb23eeeb543
  6. Change package names from .fpg. to .fpl..

    stewartmiles committed Dec 10, 2013
    Tested:
    No functional change, verified everything still builds and Testbed deploys and
    runs on a Nexus 10.
    
    Change-Id: I8a357432b8f048a14eee0b53d7c36a237b84ba8b
Commits on Dec 9, 2013
  1. Merge liquidfun

    stewartmiles committed Dec 9, 2013
  2. Merge googletest

    stewartmiles committed Dec 9, 2013
  3. Merge freeglut

    stewartmiles committed Dec 9, 2013
  4. Disable particle type selection in DamBreak example.

    stewartmiles committed Dec 9, 2013
    Tested:
    Verified DamBreak sample only uses water particles and doesn't display particle
    type selection arrows on Android.
    Bug: 12063366
    
    Change-Id: I6908a8823e753900afa0355776e7f6541b3a0c59
  5. Merge "Made push_documentation.sh non-interactive." into ub-games-master

    stewartmiles authored and Android (Google) Code Review committed Dec 9, 2013
  6. Made push_documentation.sh non-interactive.

    stewartmiles committed Dec 9, 2013
    Explicitly specified merge commit message when updating the documentation
    branch on github which disables the prompt for a merge message by "git merge".
    In addition, changed instructions for push_documentation.sh to include the
    name of the staging area directory.
    
    Tested:
    Ran script and verified staging area looked ok (just documentation folder) and
    the merge commit message was correct "Merge branch master into gh-pages".
    
    Change-Id: Iad4cb3c4d85d246136ff74c4e94c640c65afb935
Commits on Dec 7, 2013
  1. Added a symlink to the Readme in liquidfun/Readme.md.

    stewartmiles committed Dec 7, 2013
    This makes it possible to see the readme on the master branch page on github.
  2. Fixed bug where script stops when no file message filter is specified.

    stewartmiles committed Dec 6, 2013
    In addition...
    * Made the merge step non-interactive filtering source branch names by default.
    * Added a feature which attempts to remove history prior to a specified commit
      on each source branch prior to rewriting the tree and merging in order
      to reduce the time required for incremental updates.  Still needs to be
      tested with a sufficiently complicated tree.
    * Clarified commands that need to be executed to push the staged branch
      upstream.
    
    Tested:
    Generated LiquidFun upstream tree and manually inspected the results.
    $ ./tools/push_upstream.sh -e '(XXX@google.com)' -a '(YYY)' -r \
          "$(for r in splash2d freeglut googletest; do \
             echo "https://${internal_path}/${r}|${r}|${internal_branch}"; done)"
    
    Change-Id: Ie237d606a1ea284841715aba9cdb096cf3333ff9
  3. liquidfun

    stewartmiles committed Dec 7, 2013
  4. Merge googletest

    stewartmiles committed Dec 7, 2013
  5. Merge freeglut

    stewartmiles committed Dec 7, 2013
  6. Merge "Fixed HelloWorldTests so that it finds the golden file on OSX …

    stewartmiles authored and Android (Google) Code Review committed Dec 7, 2013
    …and Windows." into ub-games-master
Commits on Dec 6, 2013
  1. Made particles a lot prettier on Android using blended gaussian points

    Anonymous
    Anonymous committed Dec 4, 2013
    Tested: on a wide range of Android devices
    
    (for "dambreak", on old Nexus 7, slowest device):
    
    pretty particles: 35 msec
    square particles - correct size: 35msec
    square particles - 2 pixels (current): 33 msec
    
    seems we are mostly cpu bound on the old nexus 7, so this effect is for free.
    
    on Nexus 4, new Nexus 7, nexus 10, etc this is all 60fps or over.
    
    * refactored particle rendering code
    * added FPS display
    * added minimal version of this on desktop platforms
    
    Change-Id: I6ae6b5b9201075394bdd6497b7bdd83c31447def
Commits on Dec 5, 2013
  1. Only reduce particle damping to 0.2 for water particles.

    stewartmiles committed Dec 5, 2013
    This prevents *interesting* particle explosions when using tensile particles.
    
    Tested:
    Verified that particle explosions don't occur when using tensile particles
    in the DamBreak, Particles and WaveMachine tests in the Testbed application on
    Android.
    
    Bug: 12019668
    Change-Id: Iaa82888a813684cf31f39d4d4bc6daed36f32c20
  2. Fixed HelloWorldTests so that it finds the golden file on OSX and Win…

    stewartmiles committed Dec 5, 2013
    …dows.
    
    Fixed a bug in BodyTracker::SetWorkingDirectory() to the directory containing
    the executable on Windows and OSX.
    
    Windows and OSX builds result in the executables being placed under
    UnitTests/{Debug,Release} which differs to the Linux build.  So this
    change just takes the executable path and sets the baselines directory to
    the container directory.
    
    Tested:
    Verified HelloWorldTests passes when executed...
    * On Windows from Visual Studio.
    * On Windows from Unittests/run_tests.bat
    * On Linux from Unittests/run_tests.sh
    * On OSX from Unittests/run_tests.sh
    * On OSX from Xcode.
    
    Bug: 12015991
    Change-Id: I8f0b538be590f8f9e8c8869b56d0db401c0fb8d8
  3. Merge "Fixed warning in b2ParticleContactIsZombie()." into ub-games-m…

    stewartmiles authored and Android (Google) Code Review committed Dec 5, 2013
    …aster
  4. Merge "Clear Android logs (with "adb logcat -c") before execution. Pr…

    jsanmiya authored and Android (Google) Code Review committed Dec 5, 2013
    …events confusing output of logs from previous runs. Also, remove hack that only took the first log. This was, in fact, a bug because we should have been taking the last log instead. Now there is only one log, so we can remove the hack entirely." into ub-games-master
  5. Fixed warning in b2ParticleContactIsZombie().

    stewartmiles committed Dec 5, 2013
    Particle\b2ParticleSystem.cpp(717): warning C4800: 'const uint32' : forcing value to bool 'true' or 'false' (performance warning)
    
    Tested: Rebuilt on Windows verified warning was gone.
    Change-Id: I5ef43210470a76f92b433d2bd66b6d82ff94b82c
  6. Merge "Parse release version number from Readme.md when building a di…

    stewartmiles authored and Android (Google) Code Review committed Dec 5, 2013
    …stribution." into ub-games-master
  7. Clear Android logs (with "adb logcat -c") before execution.

    jsanmiya committed Dec 5, 2013
    Prevents confusing output of logs from previous runs.
    Also, remove hack that only took the first log. This was, in fact, a bug
    because we should have been taking the last log instead. Now there is
    only one log, so we can remove the hack entirely.
    
    Tested: Built and ran Unittests/Function, run_tests_android.sh, and
    Testbed, on Android.
    
    Bug: 11392215
    Change-Id: I91262fc16dafb7df70ad0c4b0da640da4d0b0ad4
  8. Removed superfluous paragraph about the discussion group from readme.

    stewartmiles committed Dec 5, 2013
    Tested:
    Rebuilt the docs and verified the changes were present.
    
    Change-Id: Ie7627ee72397d363e11b134c4f5b1b81184dddc7
  9. Parse release version number from Readme.md when building a distribut…

    stewartmiles committed Dec 5, 2013
    …ion.
    
    In addition,
    * Removed references to files that no longer need to be cleaned from the tree.
    * Added help test to generate_docs.sh.
    
    Tested:
    Built a distribution, verified all expected files were present and built
    successfully on Windows, OSX, Linux and for Android using Linux.
    
    Bug: 11043661
    Change-Id: Ieea2f64633853abf2b2ba1a5699b72f257b03ee2
Commits on Dec 4, 2013
  1. Rename API ref to LiquidFun.

    stewartmiles committed Dec 4, 2013
    Tested:
    Rebuilt docs, verified there are no more instances of the old name present.
    
    Change-Id: I968a2a82c716001a3d68eeff605bd6f62044e692
  2. Fixed issues in and reformatted Building documentation.

    stewartmiles committed Dec 4, 2013
    In addition, added linklint step after documentation build is complete.
    In order to workaround linklint errors...
    * Silenced errors for named anchors as manual inspection indicated the errors
      were spurious.
    * Copied an empty jquery.js file into the Readme folder since doxygen generates
      html that references a non-existant and unused file.
    
    Tested:
    Rebuilt documentation, read through the results.  Verified no errors occur
    when building the docs.
    
    Bug: 11531946
    Change-Id: I83ae0efad9f393a74b593eef623a40713d30916b
  3. Improvements in the Android Build documentation & links on the landin…

    Anonymous
    Anonymous committed Dec 4, 2013
    …g page.
    
    Change-Id: Iad728d45788f24093dfe3ff8c70a04646fb3ca0d
    Tested: re-generated the docs
  4. Added Readme link to landing page and cleaned up some wording.

    stewartmiles committed Dec 4, 2013
    In addition...
    * Removed all footers from doxygen generated pages.
    * Modified the tools/generate_docs.sh script to generate redirect pages and
      some additional parameterization.
    * Moved the Programming Guide to a subdirectory so that it's consistent with
      other documentation.
    * Configured doxygen to copy Programming Guide images.
    * Added doxyfile to generate HTML readme from Readme.md.
    * Fixed scrolling to random locations in the landing page due to movie iframes.
    
    Change-Id: Ia5b57f247bd55bd364d4341e83a1744aa23bcd8c
  5. Added script to generate Building and Programmers Guide html, and add…

    Anonymous
    Anonymous committed Dec 3, 2013
    …ed new html files
    
    Added doxyfile for API-Ref, and to the doc build script, added new html
    
    Tested: by browsing html
Commits on Dec 3, 2013
  1. Merge "Expanded explaination of the b2_liquidFunVersionString constan…

    stewartmiles authored and Android (Google) Code Review committed Dec 3, 2013
    …t." into ub-games-master
  2. Merge "Added reference to Building.html from the landing page." into …

    stewartmiles authored and Android (Google) Code Review committed Dec 3, 2013
    …ub-games-master