chuanweizhang2013
25a7f21056
make debug writable path the same as release
2014-08-29 17:27:55 +08:00
songchengjiang
34070677ad
Added testing Model Number
2014-08-29 17:11:18 +08:00
minggo
826e1018cb
fix conflict
2014-08-29 16:55:09 +08:00
minggo
afaea360fd
Merge pull request #7908 from dabingnn/v3_fix_bugs
...
V3 fix bugs
2014-08-29 16:45:52 +08:00
minggo
444b298028
fix compiling error on windows
2014-08-29 16:44:20 +08:00
lite3
4a374a1a2a
Merge branch 'v3' into customguireader
2014-08-29 16:36:42 +08:00
CocosRobot
3b3747d518
[AUTO]: updating luabinding automatically
2014-08-29 08:12:40 +00:00
Huabing.Xu
8e51377f2d
fix primitive draw error
2014-08-29 16:00:04 +08:00
minggo
1dcdbca4e0
revert lua-bindings
2014-08-29 15:54:20 +08:00
minggo
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
minggo
58dd2f4a69
Merge pull request #7882 from andyque/addWebView
...
add WebView
2014-08-29 13:42:14 +08:00
songchengjiang
71d722854c
added mesh command
2014-08-29 12:08:28 +08:00
lvlong
496aad2fe7
remove 0.3 branch logic
2014-08-29 11:59:30 +08:00
lvlong
cbe61a4b73
modify log
2014-08-29 11:56:33 +08:00
andyque
4c046336da
fix linux
2014-08-29 11:53:39 +08:00
andyque
cf0baef7c0
add web view javascript support
2014-08-29 11:50:08 +08:00
andyque
043acb2fd4
rename webview to UIWebView
2014-08-29 11:28:28 +08:00
lvlong
15c945d89b
Merge branch 'newcode' into v3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-29 11:04:15 +08:00
songchengjiang
43eb725c27
resolve conflict
2014-08-29 11:02:34 +08:00
songchengjiang
701d70fb6c
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
lvlong
5a1e0601a7
Code Standards
2014-08-29 10:43:26 +08:00
songchengjiang
96e6595e95
Added getInverseViewMatrix
2014-08-29 10:42:02 +08:00
andyque
cd031c4493
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
2014-08-29 10:25:24 +08:00
yangxiao
18a0f34c5c
Merge branch 'newcode' into billboard
2014-08-29 10:12:00 +08:00
Huabing.Xu
528f4b5c0c
fix TextureAtlas drawNumberofQuads bug
2014-08-29 10:06:44 +08:00
minggo
a125ed0453
Merge pull request #7906 from Teivaz/v3_WP8
...
[WP8] Fixed project compilation.
2014-08-29 10:03:25 +08:00
Huabing.Xu
7c870cfcc1
fix skew matrix bug
2014-08-29 09:50:26 +08:00
songchengjiang
06e3eb955f
repaired BillBoard Depth Test
2014-08-29 09:30:59 +08:00
Ricardo Quesada
20d22a1c8a
Users new `// MARK: ` feature to mark sections
...
Instead of using `#praga mark` which was not compatible with other
compilers, it uses the `// MARK:` which is compatible with all compilers
2014-08-28 14:56:15 -07:00
songchengjiang
e6f055f3fd
calculated Z in View
...
Transparent Render
2014-08-28 19:22:01 +08:00
yangxiao
a3dd4e101a
animation transition
2014-08-28 18:53:15 +08:00
teivaz
1d08acac08
* [WP8] Fixed project compilation. Removed references to deleted source files
2014-08-28 13:47:14 +03:00
minggo
50a2cb2b86
remove unneeded includes
2014-08-28 17:32:23 +08:00
minggo
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
CocosRobot
ebe75e702a
[AUTO]: updating luabinding automatically
2014-08-28 08:58:52 +00:00
lite3
2b6bdac05d
Merge branch 'v3' into customguireader
2014-08-28 15:13:10 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
681c3c06f1
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
...
stopAllActionsByTag && removeAllActionsByTag
2014-08-28 14:24:37 +08:00
yangxiao
16ab05a8cf
sequence3d
2014-08-28 13:47:17 +08:00
songchengjiang
7751762893
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-08-28 13:37:37 +08:00
yangxiao
c5a152708d
clear transparent queue
2014-08-28 13:35:32 +08:00
lvlong
a05d50d66e
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
2014-08-28 12:02:33 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
minggo
f0f1bf1b92
Merge pull request #7883 from giginet/set-node-name-via-ccs-scene
...
Add the feature that CCSSceneReader can load name properties as node names.
2014-08-28 11:14:15 +08:00
songchengjiang
6a2f4c635e
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-08-28 11:06:02 +08:00
Huabing.Xu
08006aa47a
Merge branch 'v3' into v3_trianglesCommand
2014-08-28 10:56:38 +08:00
yangxiao
52b2b1d2cb
transparent render queue
2014-08-28 10:53:57 +08:00
minggo
45b382cb1f
Merge pull request #7898 from CocosRobot/update_lua_bindings_1409191992
...
[AUTO]: updating luabinding automatically
2014-08-28 10:17:26 +08:00
minggo
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
CocosRobot
31a9997922
[AUTO]: updating luabinding automatically
2014-08-28 02:15:00 +00:00
minggo
b8447baf73
Merge pull request #7893 from slackmoehrle/glview_fix
...
Glview fix
2014-08-28 10:10:17 +08:00
Huabing.Xu
bdf92cfbd4
Renderer Only knows about Triangles Command, every command inherit from Triangles Command can be batched
2014-08-28 09:58:39 +08:00
Dhilan007
837e8665b5
remove redundant LOCAL_STATIC_LIBRARIES
2014-08-28 09:46:09 +08:00
Ricardo Quesada
781b0bc478
properties revert back to 10
2014-08-27 16:35:13 -07:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Slack-Moehrle
1b5413d8b4
comment out [glview release]; and [eaglview release];
2014-08-27 10:42:27 -07:00
Slack-Moehrle
d4d2b8c83e
comment out [glview release]; and [eaglview release];
2014-08-27 10:26:09 -07:00
Dhilan007
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
Dhilan007
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
samuele3hu
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
lvlong
e05f6bc874
modify for compress
2014-08-27 18:44:31 +08:00
Huabing.Xu
c627affa5e
add triangles command, make quad command inherit from triangles command
2014-08-27 18:39:49 +08:00
yangxiao
a71f42c817
add transparent queue
2014-08-27 17:53:46 +08:00
Huabing.Xu
91e332c253
dynamic update index for quad command
2014-08-27 16:43:14 +08:00
minggo
17ab047b7d
fix compiling error on windows
2014-08-27 15:13:41 +08:00
Huabing.Xu
c4ecff9804
temp backup
2014-08-27 14:54:35 +08:00
andyque
3d97ddc739
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/ui/Android.mk
2014-08-27 14:08:16 +08:00
minggo
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
minggo
d0ca9a4da5
remove unneeded include header files
2014-08-27 13:39:50 +08:00
minggo
ac029c3d0d
Merge pull request #7887 from super626/v3
...
2d cull only for default camera
2014-08-27 13:39:13 +08:00
yangxiao
26f7345693
2d cull only for default camera
2014-08-27 12:09:23 +08:00
samuele3hu
7a9a16d6aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test
2014-08-27 11:11:21 +08:00
samuele3hu
471820568f
Update android.mk of cocos and lua-templates
2014-08-27 10:28:04 +08:00
samuele3hu
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
samuele3hu
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
minggo
31f406bbdd
Merge pull request #7884 from minggo/cocos2dxrendererjava-onpause-fix
...
invoke nativeOnPause after onSurfaceCreated is invoked
2014-08-27 10:17:42 +08:00
minggo
d290076917
invoke nativeOnPause after onSurfaceCreated is invoked
2014-08-27 10:13:03 +08:00
andyque
4597de069d
improve test case and make program more robust
2014-08-27 08:02:22 +08:00
giginet
d07903827d
Add the feature that CCSSceneReader can load name properties as node names.
...
When name property of objects on CocosStudio Scene are set.
They will be loaded and set as Node::name property.
Thanks to this commit. We are enable to access to each nodes on scene via its names.
```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
auto object = scene->getChildByName<cocos2d::Sprite *>("objectName");
```
2014-08-27 03:49:07 +09:00
andyque
fc3a30b9ca
modify cmakeList.txt
2014-08-26 23:25:07 +08:00
andyque
84c5542a0e
Merge branch 'v3' into addWebView
2014-08-26 22:11:35 +08:00
andyque
9449152caf
finish WebView Tests
2014-08-26 22:03:55 +08:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
andyque
15815118a2
finish android version
2014-08-26 16:53:37 +08:00
minggo
3d4f22ca74
add cocos2d.h into pre-compiled header
2014-08-26 16:45:24 +08:00
songchengjiang
0bfa76b375
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-08-26 15:09:56 +08:00
yangxiao
8a38ce10be
first version billboard
2014-08-26 15:07:37 +08:00
yangxiao
7d6b8ea706
merge cocos
2014-08-26 14:58:58 +08:00
minggo
c935a39090
Merge pull request #7879 from dabingnn/v3_fixLabelStatus
...
fix LabelStatus string error when labelStatus is recreated
2014-08-26 14:51:08 +08:00
andyque
631e1a70c4
add WebView-inl.h and refactor Android code
2014-08-26 14:26:37 +08:00
yangxiao
7ff75fb397
remove warning
2014-08-26 14:19:08 +08:00
andyque
e12db46866
fix style
2014-08-26 12:08:26 +08:00
andyque
2226d4b420
change WebView namespace and add WebViewTest
2014-08-26 11:39:56 +08:00
andyque
736b83acb1
Merge branch 'add_webview' of https://github.com/gin0606/cocos2d-x into addWebView
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-26 10:56:10 +08:00
yangxiao
cff5b65314
Merge branch 'newcode' into v3
2014-08-25 21:20:49 +08:00
Huabing.Xu
ef472d6250
fix LabelStatus string error when labelStatus is recreated
2014-08-25 17:19:45 +08:00
samuele3hu
07cf4d3526
Fix the win32 and android compile error
2014-08-25 14:10:13 +08:00
gin0606
41011824c1
Add WebView to libui Android
2014-08-25 15:01:37 +09:00
gin0606
de429591c3
Add WebView to libui iOS
2014-08-25 14:47:42 +09:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
samuele3hu
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
yangxiao
c7f7623320
reserve animation size
2014-08-25 11:30:34 +08:00
minggo
7ece79e7d3
Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963
...
[AUTO]: updating luabinding automatically
2014-08-25 11:01:27 +08:00
minggo
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
CocosRobot
5db16cdc23
[AUTO]: updating luabinding automatically
2014-08-25 02:34:32 +00:00
minggo
74fc9931e7
fix compiling error of cpp-tests on linux
2014-08-24 19:12:36 -07:00
samuele3hu
c495e5266a
Remove useless win32 module project and adjust the related project setting
2014-08-25 09:59:50 +08:00
samuele3hu
1126e950b2
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases
2014-08-25 09:52:48 +08:00
samuele3hu
281da9f1d7
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +08:00
samuele3hu
25aab05b1f
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform
2014-08-25 09:48:14 +08:00
minggo
dcea3b6134
Merge pull request #7843 from huangshiwu/v3_glviewattrs
...
V3 glviewattrs
2014-08-25 09:46:19 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
zii
e8a5fc9fef
Update CCActionManager.cpp
2014-08-23 17:06:46 +08:00
zii
4763531085
Update CCActionManager.cpp
2014-08-23 17:03:26 +08:00
CocosRobot
899e0a4182
[AUTO]: updating luabinding automatically
2014-08-22 11:25:33 +00:00
minggo
0701fe1dfb
Merge pull request #7853 from super626/v3
...
Better reskin model support
2014-08-22 19:18:47 +08:00
huangshiwu
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
yangxiao
1db3d14896
reset bone number to 60, put test in alphabetical order
2014-08-22 16:06:36 +08:00
samuele3hu
d1b4d43a0b
Remove CCModuleManager.h/cpp and adjust the related project
2014-08-22 15:10:46 +08:00
yangxiao
6ff2aa2755
change skin joint count to 40
2014-08-22 15:00:34 +08:00
yangxiao
3a0d63caa6
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-22 14:55:11 +08:00
yangxiao
a102946d35
android and linux
2014-08-22 14:54:26 +08:00
XiaoYang
e4737f9070
Merge pull request #112 from liuliang2004/Meshv3
...
Modify project file
2014-08-22 14:46:46 +08:00
yangxiao
39cc03173b
remove unused variable
2014-08-22 14:43:48 +08:00
liuliang
c7c091e4b6
Modify project file
2014-08-22 14:32:27 +08:00
yangxiao
81dbb0bca4
add comment
2014-08-22 14:02:51 +08:00
samuele3hu
70cba1f64a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
cocos/Android.mk
2014-08-22 14:01:17 +08:00
minggo
aba973b1ea
Merge pull request #7834 from andyque/improveUI
...
add click event listener to all Widget classes
2014-08-22 14:00:10 +08:00
yangxiao
d90572fc10
engine refactor hide concept of submesh
2014-08-22 13:52:03 +08:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
samuele3hu
523dcdb6fb
Update cocos2d android.mk
2014-08-22 13:43:18 +08:00
samuele3hu
ada7fa23d3
Add CC_DLL for related network files
2014-08-22 13:42:46 +08:00
samuele3hu
700699a37f
Modify MciPlayer.cpp to support Unicode
2014-08-22 13:41:48 +08:00
minggo
a0b19db670
Merge pull request #7840 from minggo/fix-warning
...
fix warnings
2014-08-22 13:41:31 +08:00
minggo
0c9c873edb
Merge pull request #7846 from andyque/addUILuaBindings
...
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
2014-08-22 13:40:02 +08:00
minggo
ab9c35616e
Merge pull request #7847 from andyque/addLuabindingsToUI
...
add deprecated options for ui, add Scale9Sprite bindings
2014-08-22 13:38:45 +08:00
yangxiao
7818b28ee3
Merge branch 'newcode' into v3
2014-08-22 13:32:57 +08:00
yangxiao
022b7e3fd3
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-22 13:27:14 +08:00
yangxiao
2d5431353a
engine adjust
2014-08-22 13:25:26 +08:00
andyque
13003fe0a6
add deprecated options for ui, add Scale9Sprite bindings
2014-08-22 11:56:13 +08:00
andyque
84cf0ee834
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
2014-08-22 11:49:39 +08:00
minggo
7fd1521bbf
update version
2014-08-22 11:48:14 +08:00
huangshiwu
7f57d15cb3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs
2014-08-22 11:04:13 +08:00
huangshiwu
7dec715288
OpenGL context attributions setting revise
2014-08-22 10:55:39 +08:00
minggo
21cb90bf12
Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR
...
Migrate some changes from Cocos2d-JS to -x
2014-08-21 22:38:59 +08:00
pandamicro
bb5e189f30
Fix warning or Bundle3D
2014-08-21 20:02:22 +08:00
pandamicro
59cedea6dc
Reverse useless change
2014-08-21 19:40:18 +08:00
pandamicro
634847412b
Reverse CC_CONSTRUCTOR_ACCESS modification
2014-08-21 19:36:28 +08:00
lvlong
4ce334c0c3
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
2014-08-21 18:16:21 +08:00
lvlong
d00bcbccb0
add texture coord2-7
2014-08-21 18:14:24 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
pandamicro
34b93a24ff
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
...
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
2014-08-21 16:07:19 +08:00
minggo
4563e65427
fix compiling error on android and fix some coding style
2014-08-21 15:41:05 +08:00
pandamicro
5fb9f59633
Fix small issues
2014-08-21 15:40:53 +08:00
pandamicro
9544482058
Fix Android.mk s
2014-08-21 15:40:42 +08:00
pandamicro
485dd1f7da
Update #3897 : Refactor missed protected constructors
2014-08-21 15:40:22 +08:00
minggo
b349ce43ae
use macro to control whether to use jpeg, tiff, webp or not
2014-08-21 15:19:26 +08:00
pandamicro
909dd0d397
Update #3897 : Refactor missed protected constructors
2014-08-21 15:11:33 +08:00
minggo
c0d1bfca26
Merge pull request #7832 from Teivaz/v3
...
Fixed WinRT project
2014-08-21 13:37:03 +08:00
teivaz
aecdb832a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-08-21 13:48:05 +03:00
teivaz
a70688dc96
+ [WINRT] Inserted newly added files to cocos WIN RT project
2014-08-21 13:47:53 +03:00
lvlong
7753f4c471
modify assert(0)
2014-08-21 13:30:51 +08:00
liuliang
9ee6683569
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-21 11:24:11 +08:00
liuliang
082689971d
Modify the model resolution
2014-08-21 11:23:31 +08:00
XiaoYang
7cf00c535d
Merge pull request #109 from lvlonggame/merge-bundle
...
fix binary load bug.
2014-08-21 10:44:00 +08:00
lvlong
1f349cb3fe
fix binary load bug.
2014-08-21 10:38:33 +08:00
andyque
3f51926c5d
add click event listener to Widget
2014-08-21 10:21:07 +08:00
huangshiwu
2369a5900d
merge v3 to v3_glviewattrs
2014-08-21 10:18:55 +08:00
yangxiao
c26a81bb55
Merge branch 'newcode' into v3
2014-08-21 09:53:06 +08:00
teivaz
4697cb07e6
! Set version to 3.3 (as it is no longer 3.2)
2014-08-21 18:04:46 +03:00
andyque
34b3f1f0e3
remove warnings
2014-08-21 09:36:12 +08:00
huangshiwu
2a03bea1a4
OpenGL context attributions setting
2014-08-21 09:35:32 +08:00
lite3
c136e8e079
fix indent
2014-08-21 02:15:27 +08:00
lite3
679d525453
Merge branch 'v3' into customguireader
2014-08-21 01:22:07 +08:00
lite3
9f348962c7
Merge branch 'v3' into customguireader
2014-08-21 00:18:30 +08:00
yangxiao
3a69fc9b14
rename ModelDataNode to ModelData
2014-08-20 19:19:49 +08:00
yangxiao
fcf4d79b06
setGLProgramState support
2014-08-20 19:01:04 +08:00
yangxiao
bd4aec4bcd
support multi-attribs
2014-08-20 18:20:19 +08:00
andyque
46f3ab9b57
add Scale9Sprite to create method of ui::EditBox
2014-08-20 16:08:28 +08:00
minggo
f3b211351b
Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie
...
V3 add primitivehead fie
2014-08-20 16:04:27 +08:00
yangxiao
9a6181fdca
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-20 15:02:26 +08:00
yangxiao
79857c471b
multiply Mesh attrib support
2014-08-20 15:02:16 +08:00
Huabing.Xu
b5e5e2d8d5
add primitive head file to cocos2d.h
2014-08-20 14:48:50 +08:00
XiaoYang
82c2304e64
Merge pull request #105 from lvlonggame/merge-bundle
...
format code
2014-08-20 14:23:40 +08:00
Huabing.Xu
22db2abcaf
add != operator in Blendfunc
2014-08-20 14:21:13 +08:00
lvlong
8e0d80d4c6
Merge branch 'newcode' into merge-bundle
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-20 14:00:25 +08:00
liuliang
df272ee7f5
Modify the parsing
2014-08-20 13:53:15 +08:00
minggo
bbf5c56e83
Merge pull request #7827 from andyque/ccRandom
...
add c++11 random library support
2014-08-20 13:35:12 +08:00
andyque
34629f1014
fix windows & win8 & wp8 compile error
2014-08-20 12:02:12 +08:00
liuliang
a27a420a91
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
...
Conflicts:
cocos/3d/CCSprite3D.cpp
2014-08-20 11:45:48 +08:00
liuliang
c6cd9b029d
Modify the parsing
2014-08-20 11:40:04 +08:00
minggo
d91dc842de
Merge pull request #7822 from Teivaz/v3_WP8
...
Added method for custom precompiled shader program loading in WP8
2014-08-20 11:22:26 +08:00
teivaz
0e5a79d486
+ [WP8] Added method for custom precompiled shader program loading
2014-08-20 12:02:16 +03:00
minggo
84f2e248d1
Merge pull request #7823 from newnon/v3_Label_fix
...
Label performance problem
2014-08-20 10:28:01 +08:00
minggo
2b709f92bb
Merge pull request #7816 from xiangxw/fix_sendPrompt
...
fix sendPrompt()
2014-08-20 10:25:30 +08:00
lvlong
93ee44c912
format code
2014-08-20 10:24:46 +08:00
minggo
74fba21fc0
Merge pull request #7825 from 2youyouo2/v3
...
remove cascade color for CorlorFrame
2014-08-20 10:23:15 +08:00
minggo
41905cb4c0
Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue
...
fix pageView touch location
2014-08-20 10:11:59 +08:00
andyque
9a3c2dc6a4
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-20 09:56:16 +08:00
andyque
07eb0d373c
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
cocos/ui/Android.mk
2014-08-20 09:32:29 +08:00
Sergey
055a143f9d
Label performance problem
2014-08-19 15:02:09 +04:00
Sergey
bfe6513706
setKeepScreenOn method
2014-08-19 15:00:58 +04:00
andyque
a8ab1a85b7
fix linux compile error
2014-08-19 17:42:17 +08:00
teivaz
0e7ec265ee
* [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res"
2014-08-20 11:54:41 +03:00
minggo
49c6d1e746
Merge pull request #7819 from minggo/androidmk-optimize
...
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 16:11:40 +08:00
minggo
cdd67be77a
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 15:29:40 +08:00
yangxiao
54423efe9f
fix reskin
2014-08-19 15:25:00 +08:00
kaile.yin
d884054ec9
remove cascade color for CorlorFrame
2014-08-19 15:19:47 +08:00
andyque
deb7ff64d4
fix pageView touch location
2014-08-19 15:14:07 +08:00
XiaoYang
9f444b7010
Merge pull request #104 from liuliang2004/Meshv3
...
Modification is compatible with the old model
2014-08-19 14:32:05 +08:00
liuliang
9d3bab3810
Modification is compatible with the old model
2014-08-19 14:03:41 +08:00
yangxiao
5cf30a363c
remove unused code
2014-08-19 13:54:06 +08:00
yangxiao
289b04a2ae
merge cocos2d
2014-08-19 13:19:42 +08:00
yangxiao
b2d43a4167
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-19 11:56:21 +08:00
yangxiao
f2729c7ef2
cache work
2014-08-19 11:56:09 +08:00
xiangxw
bef6a2a7f1
fix sendPrompt()
...
a extra '\0' will be sent when sizeof() is used
2014-08-19 11:46:30 +08:00
andyque
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
minggo
dd1bc70cde
Merge pull request #7271 from newnon/v3_getPreviousLocation_fix
...
bug on began touch - prevpoint
2014-08-19 09:49:01 +08:00
teivaz
db805ee2c8
* Fixed WP8 cocos library project
...
* Fixed profiling macros
2014-08-19 19:24:56 +03:00
CocosRobot
4236e89245
[AUTO]: updating luabinding automatically
2014-08-18 15:26:32 +00:00
minggo
38fdef614a
Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
...
add swallow touch and propagation to parent widgets customization
2014-08-18 23:16:22 +08:00
CocosRobot
85d505b427
[AUTO]: updating luabinding automatically
2014-08-18 14:47:35 +00:00
minggo
22fa650bbf
Merge pull request #7807 from samuele3hu/v3_3_3d_module
...
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
2014-08-18 22:38:58 +08:00
lvlong
43bc54b134
delete empty line
2014-08-18 20:28:59 +08:00
lvlong
2b70cf3dd8
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-18 20:22:56 +08:00
lvlong
9c25139895
animation & animations
2014-08-18 20:22:18 +08:00
yangxiao
d5df1f3ab2
forget return true
2014-08-18 18:56:01 +08:00
yangxiao
d6ed1af1f7
compute submesh aabb error
2014-08-18 18:34:18 +08:00
minggo
2f2ee43b21
Merge pull request #7808 from 2youyouo2/v3
...
fixed ArmatureAnimation::setSpeedScale
2014-08-18 18:19:23 +08:00
lvlong
da26fa3ca5
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-18 18:04:44 +08:00
lvlong
7311d5139b
add VERTEX_ATTRIB_TEX_COORD1
2014-08-18 18:02:58 +08:00
yangxiao
b9c28dd8d7
return true
2014-08-18 17:57:14 +08:00
yangxiao
2f600f8af4
fix bundle mac
2014-08-18 17:52:27 +08:00
liuliang
ee4e4ca455
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-18 17:39:28 +08:00
liuliang
e151b207a4
Modified binary load model, compatible with the old format
2014-08-18 17:31:04 +08:00
yangxiao
01c1691a4f
deal aabb
2014-08-18 17:02:13 +08:00
minggo
e2829cd68a
Merge pull request #7802 from SmartCat/v3
...
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32
2014-08-18 16:56:15 +08:00
kaile.yin
6abaf27b14
fixed ArmatureAnimation::setSpeedScale
2014-08-18 16:19:54 +08:00
samuele3hu
91fd40dd3a
Add a newline for some files
2014-08-18 15:27:54 +08:00
samuele3hu
2d8ae3a917
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module
2014-08-18 15:08:04 +08:00
samuele3hu
e0168c373c
Add manual lua bindings for 3d and adjust related test case on different platform
2014-08-18 15:04:32 +08:00
samuele3hu
7596a8a831
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-18 14:58:57 +08:00
yangxiao
30ce92f677
obj work, make code clean
2014-08-18 14:16:34 +08:00
yangxiao
219404bd7d
change tex param
2014-08-18 11:42:41 +08:00
yangxiao
cd4da73beb
merge, obj not work now
2014-08-18 11:28:57 +08:00
yangxiao
79a55286ce
refactor to new model
2014-08-18 11:13:08 +08:00
liuliang
2f816aea2c
Modified load static model
2014-08-18 10:32:23 +08:00
samuele3hu
6259aebdab
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-17 23:45:56 +08:00
yangxiao
1e961e00b7
obj loader work
2014-08-17 22:49:53 +08:00
lvlong
da63032a46
draw sub mesh bug
2014-08-16 20:38:00 +08:00
lvlong
b1c9fb99e3
animation is ok.
2014-08-16 19:51:59 +08:00
lvlong
9c41b1a826
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 18:20:29 +08:00
lvlong
4f4b8dc25c
for testing
2014-08-16 18:19:41 +08:00
yangxiao
fb1b7ca3bb
fix skeleton
2014-08-16 18:18:15 +08:00
lvlong
24bb827ef4
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 16:58:02 +08:00
yangxiao
7159914248
old model work
2014-08-16 16:56:04 +08:00
lvlong
4dd9102e87
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 15:45:28 +08:00
lvlong
5b59b8a987
fixed some loading problems.
2014-08-16 15:40:00 +08:00
yangxiao
a11ac316bf
create model
2014-08-16 14:52:44 +08:00
yangxiao
8a5bbabe21
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:49:47 +08:00
yangxiao
47d15a4aa1
load
2014-08-16 14:49:38 +08:00
lvlong
84dcff2f7a
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-16 14:44:41 +08:00
lvlong
d60a7734b1
merge bundle.
2014-08-16 14:28:15 +08:00
yangxiao
ae361c91cd
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:16:27 +08:00
yangxiao
ef2db59825
modify render
2014-08-16 14:16:17 +08:00
liuliang
ae79603791
Modify the material parsing
2014-08-16 14:14:37 +08:00
lvlong
f8f416cd3c
merge bundle
2014-08-16 11:12:26 +08:00
liuliang
21dcc51c0f
Modify the material parsing
2014-08-16 10:41:42 +08:00
liuliang
1b92409d78
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-16 09:59:25 +08:00
liuliang
f35dd346eb
Modify Analytic
2014-08-16 09:59:08 +08:00
yangxiao
3ab7c6b952
create from bundle data
2014-08-15 20:52:45 +08:00
liuliang
b4a20feabc
Parse the data file
2014-08-15 18:27:28 +08:00
yangxiao
9ab48bd71e
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 18:27:03 +08:00
yangxiao
a740841f5e
submeshid
2014-08-15 18:21:58 +08:00
Dmitry Bushtets
1257f642c7
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)
2014-08-15 13:20:37 +03:00
liuliang
0db924d7cd
Parse the data file
2014-08-15 18:20:37 +08:00
liuliang
c533f66b9f
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-15 17:46:40 +08:00
liuliang
b5665a4723
Modify the binary parsing
2014-08-15 17:46:21 +08:00
liuliang
ab80c5026d
Modify the binary parsing
2014-08-15 17:45:37 +08:00
songmiao
08a4ebba06
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-08-15 17:43:04 +08:00
yangxiao
d09695b118
create from data
2014-08-15 17:41:04 +08:00
yangxiao
6f0fc48e8e
merge cocos2d
2014-08-15 16:36:17 +08:00
songmiao
361770e0f3
add BillBorad and BillBoardTest
2014-08-15 16:15:29 +08:00
yangxiao
e2312bd353
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 15:55:32 +08:00
yangxiao
42916bcbe6
newmodel
2014-08-15 15:55:21 +08:00
CocosRobot
bdfc48b127
[AUTO]: updating luabinding automatically
2014-08-15 07:44:57 +00:00
liuliang
4c8b24d113
Modify the binary parsing
2014-08-15 15:32:15 +08:00
minggo
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
andyque
0e637b4d9f
add swallow touch and propagation customization to UIWidgets
2014-08-15 15:28:28 +08:00
andyque
cf8e40f8ce
deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead
2014-08-15 15:26:19 +08:00
minggo
b842c57954
Merge pull request #7794 from minggo/seperate-jpg-tiff-webp
...
Seperate jpg tiff webp
2014-08-15 15:24:09 +08:00
CocosRobot
24f0e8aada
[AUTO]: updating luabinding automatically
2014-08-15 07:23:17 +00:00
minggo
8364e179a4
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
...
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
minggo
e59283343a
Merge pull request #7751 from zawasp/win32_minimize
...
add minimize / restore for desktop (win32, linux, mac)
2014-08-15 15:00:13 +08:00
yangxiao
88bb1482e3
newmodel
2014-08-15 14:58:30 +08:00
minggo
11b4793d75
Merge pull request #7793 from dabingnn/v3_fixRandomCrashForPrimitive
...
fix android background and foreground crash for primitive
2014-08-15 14:56:49 +08:00
minggo
408472625c
add CCModuleManager into CMakeLists.txt
2014-08-15 14:46:21 +08:00