Commit Graph

20 Commits

Author SHA1 Message Date
troublemaker52025 e723e5aa3a Add renderMesh bias for v3.5.0 (#10102)
* Add renderMesh bias for v3.5.0

* fix ci error

* change function name

* fix merge error

* update

* update 2

* update

* update

* update 2
2022-02-24 23:27:09 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
minggo c0bdd3c0d8 Merge branch 'v3.4.1' into merge_v3.4.1
Conflicts:
	cocos/bindings/event/EventDispatcher.cpp
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridge.mm
	cocos/platform/java/jni/JniCocosOrientationHelper.cpp
	cocos/platform/win32/CanvasRenderingContext2D-win32.cpp
2022-01-07 18:36:14 +08:00
troublemaker52025 4e231f4232 updateLightingmap sync to native-engine for v3.4.1 (#4109)
* updateLightingmap sync to native-engine for v3.4.1
2021-12-20 10:34:23 +08:00
minggo ac7418f1c1 fix conflict 2021-11-30 10:48:30 +08:00
oahcy 5379e6ef35 引擎适配linux平台 (#4035) 2021-11-29 17:17:15 +08:00
Yun Hsiao Wu 083b9fe436 set model dirty when attaching to scene (#4054) 2021-11-17 18:54:05 +08:00
李吉林 bed27fcccf V3.4.0 occlusion query2 (#3975)
* occlusion query
Co-authored-by: lijilin <jilin.li@cocos.com>
2021-10-13 18:21:03 +08:00
minggo ea980f509c merge v3.3.2 2021-09-24 12:38:10 +08:00
李吉林 fa210fa955 add octree scene manager (#3891)
* add octree scene manager
Co-authored-by: lijilin <jilin.li@cocos.com>
2021-09-17 11:20:05 +08:00
Yun Hsiao Wu 1016f7d609 should trigger update when set instance (#3888) 2021-09-16 10:23:29 +08:00
GengineJS 8b4b7cad8a [Fix] the problem that the pipeline scene data switch scene ia is null (#3724) 2021-07-16 09:37:33 +08:00
GengineJS d918861a89 Fix testcase raycast scene (#3665) 2021-06-28 18:03:58 +08:00
GengineJS 979c0d950e AABB shared data (#3655) 2021-06-28 15:31:57 +08:00
江战 0a0f85849e V3.3 fix ios android crash (#3656) 2021-06-25 21:03:23 +08:00
江战 1ee3707307 3.3 fix instance crash (#3645) 2021-06-24 14:08:36 +08:00
GengineJS b8f54069c0 [Add] Native scene object update function (#3638) 2021-06-22 16:41:13 +08:00
minggo c98a1251a0 Revert "[add] Native scene object update function (#3602)" (#3634)
This reverts commit 8cc944277f.
2021-06-18 18:12:50 +08:00
GengineJS 8cc944277f [add] Native scene object update function (#3602) 2021-06-18 17:34:06 +08:00
cary d77dbb3a53 implement scene management in native(#3584) 2021-06-02 17:22:33 +08:00