Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[physics] add pre/post callback in update() #19118

Merged
merged 3 commits into from Oct 16, 2018

Conversation

PatriceJiang
Copy link
Contributor

ref #11154

@PatriceJiang PatriceJiang reopened this Oct 16, 2018
@minggo minggo merged commit b70a6a6 into cocos2d:v3 Oct 16, 2018
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Nov 11, 2018
STEVE: removed
- physics
- lua-bindings
- js/lua-tests
- js/lua-template

* commit 'b70a6a6def0c13783576de4b66990698f07c58f5':
  [physics] add pre/post callback in `update()` (cocos2d#19118)
  Update gradle 4.6, sdk28, android gradle  plugin 3.1.0 (cocos2d#19113)
  remove un-elegant prebuilt feature in cmake (cocos2d#19109)
  [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19094)
  concat path error (cocos2d#19075)
  CCConsole: remove fd from _read_set when it is closed by client. (cocos2d#19066)
  LUA: cc.downloader binding (cocos2d#19078)
  fix build target path, set to publish/ folder (cocos2d#19081)

# Conflicts:
#	cocos/physics/CCPhysicsWorld.cpp
#	cocos/physics/CCPhysicsWorld.h
#	cocos/scripting/lua-bindings/CMakeLists.txt
#	cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp
#	cocos/scripting/lua-bindings/proj.android/Android.mk
#	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
#	cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj
#	cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj.filters
#	templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle
#	templates/js-template-default/frameworks/runtime-src/proj.android/gradle.properties
#	templates/js-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties
#	templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle
#	templates/lua-template-default/frameworks/runtime-src/proj.android/gradle.properties
#	templates/lua-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties
#	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
#	tests/js-tests/project/proj.android/app/build.gradle
#	tests/js-tests/project/proj.android/gradle.properties
#	tests/js-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties
#	tests/lua-empty-test/project/proj.android/app/build.gradle
#	tests/lua-empty-test/project/proj.android/gradle.properties
#	tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties
#	tests/lua-game-controller-test/project/proj.android/gradle.properties
#	tests/lua-game-controller-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties
#	tests/lua-tests/project/proj.android/app/build.gradle
#	tests/lua-tests/project/proj.android/gradle.properties
#	tests/lua-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties
@PatriceJiang PatriceJiang deleted the physics_add_post_callback branch December 25, 2018 04:08
EricDDK pushed a commit to EricDDK/cocos2d-x that referenced this pull request Jan 3, 2019
* add physics update pre/post callback

* update space

* run before simulation
huangwei1024 pushed a commit to huangwei1024/cocos2d-x that referenced this pull request Jun 20, 2019
* add physics update pre/post callback

* update space

* run before simulation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants