17854cd922
change speed
2014-06-17 13:45:58 +08:00
d2a6782a9e
fixed start frame not right
2014-06-17 11:45:57 +08:00
53963a2441
issue #4693:enumerateChildren() support regular expression
2014-06-17 11:43:03 +08:00
7ee90b4114
add performance test
2014-06-17 11:13:46 +08:00
9ab45744bb
Merge branch 'v3' into cleanupBinaryLoader
2014-06-17 09:45:16 +08:00
753167b5f2
updated xaml resources
2014-06-16 09:25:35 -07:00
9acd373a0e
make girl up
2014-06-16 19:41:10 +08:00
32cc5b12d6
ready
2014-06-16 19:30:45 +08:00
4b7f6a6185
static Sprite3D is ok
2014-06-16 19:08:43 +08:00
bc31d6b082
merge lv
2014-06-16 16:45:43 +08:00
920b358764
new girl.c3t
2014-06-16 16:23:24 +08:00
2282c98f2e
do some test
2014-06-16 15:38:03 +08:00
2840409933
for tony test
2014-06-16 14:09:41 +08:00
fda54a21f1
change test title
2014-06-16 09:45:44 +08:00
414aab8553
update CMakeLists.txt
2014-06-16 09:40:27 +08:00
0fa4e921f0
delete girl - 副本.c3t
2014-06-16 09:25:12 +08:00
79d2de3b67
make character up
2014-06-16 00:31:31 +08:00
dd8f66ce57
merge loader
2014-06-16 00:01:38 +08:00
9dd7241176
load c3t animation work 90%
2014-06-15 22:45:56 +08:00
1d01fe8bbc
refactor
2014-06-15 16:12:24 +08:00
71f74f0825
fixed android compile failed
2014-06-15 13:10:44 +08:00
4ae01d148f
11
2014-06-13 19:26:46 +08:00
369ed3e6d3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-13 18:00:01 +08:00
2031e0e92d
change TimelineAction to ActionTimeline
2014-06-13 16:03:03 +08:00
1c5d9ba212
remove resource to use armature resource
2014-06-13 14:41:28 +08:00
9b3b6c0e53
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
2014-06-13 14:39:11 +08:00
4b7b32e81e
BUG FIX : #5553
...
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
2014-06-13 15:24:37 +09:00
4e94eaabed
Merge branch 'v3' into v3Animation
2014-06-13 12:06:11 +08:00
ee919b673f
issue #4437 : config for android and linux.
2014-06-13 11:07:21 +08:00
3af0bdfef6
texture
2014-06-13 09:18:25 +08:00
2d913470a0
updated fast resume code for app
2014-06-12 16:36:53 -07:00
b36741865c
add hd resource
2014-06-12 19:38:08 +08:00
f63939945d
change NodeCache to NodeReader
2014-06-12 19:34:22 +08:00
14f4b6430f
modify 3dloader, you can run animation.
2014-06-12 18:26:42 +08:00
e4f1ac6126
add hd resource
2014-06-12 17:38:26 +08:00
7eda0ae999
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-12 16:43:04 +08:00
1ca69d2689
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2014-06-12 16:28:36 +08:00
f536020d26
remove unused files
2014-06-12 16:21:41 +08:00
742ea7f2df
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
acb87f414e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
2014-06-12 14:44:28 +08:00
e37c6ab7ee
test action sequence
2014-06-12 14:20:38 +08:00
6845a69655
issue #4693 : remove unneede codes
2014-06-12 14:00:41 +08:00
990c491746
issue #4693 : add test case for getName, setName, getChildByName and enumerateChildren
2014-06-12 13:55:23 +08:00
6c7b538ee1
Add deprecated support for the related UI addEventListener functions
2014-06-12 12:02:22 +08:00
dc4cdc9c0f
remove the comments
2014-06-12 10:19:08 +08:00
97b578185d
new parameter for setting blur shader effect
2014-06-12 09:49:48 +08:00
4d1bf0c1a2
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
2014-06-12 09:42:20 +08:00
28ae57c5fc
add AsyncReader
2014-06-12 00:38:23 +08:00
aa06fab776
support relative path for reading json
2014-06-11 21:11:22 +08:00
65acec013b
Merge branch 'v3' into v3Animation
2014-06-11 17:45:31 +08:00
5515c43bb2
improve lasers
2014-06-11 15:16:08 +08:00
18663609b4
add interface for speed and playback in animate
2014-06-11 15:07:37 +08:00
e2c75c1f11
New shader for the blur effect, the old one is ineffecient and difficult to maintain.
2014-06-11 14:54:14 +08:00
2f6f1b7151
improve binary format
2014-06-11 14:45:35 +08:00
7a8f27ee0b
remove unused parser code
2014-06-11 14:15:34 +08:00
54379f48a9
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
2014-06-11 11:24:17 +08:00
09a2ceb7df
add TimelineAction
2014-06-11 11:10:07 +08:00
2d50df8b01
Update the KeyCodeTest in the NewEventDispatcherTest
2014-06-11 10:19:07 +08:00
d200dd83a4
Update the KeyCodeTest in the NewEventDispatcherTest
2014-06-11 10:15:38 +08:00
2252bc271b
Update the KeyCodeTest in the NewEventDispatcherTest
2014-06-11 10:14:24 +08:00
4ce2d7f193
Update values of KeyCode used in the Lua to fix related error
2014-06-11 10:10:11 +08:00
b895018765
update parser
2014-06-11 09:35:24 +08:00
6d09b50699
animation bug
2014-06-10 19:53:06 +08:00
48f7743daa
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-10 15:08:10 +08:00
5a80b4da2e
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
2014-06-10 11:30:39 +08:00
f6f75e8810
Update controller.lua
2014-06-10 10:01:08 +08:00
cb3af59d38
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-10 09:51:50 +08:00
a991940268
debug Sprite3D with .c3t
2014-06-09 18:37:58 +08:00
29ac8d746d
Merge pull request #7012 from Dhilan007/v3-testcast
...
update test cast of label.
2014-06-09 16:32:32 +08:00
c387ae3bc7
add text effect test
2014-06-09 14:34:46 +08:00
791737befa
update test cast of label.
2014-06-09 13:41:32 +08:00
361bfad5f8
initilization missed.
2014-06-09 11:39:19 +08:00
ae16c88538
Save the bound texture unit so that the sampler can be updated dynamiclly.
2014-06-09 10:58:28 +08:00
0c95fe1fbd
animation test
2014-06-06 19:12:08 +08:00
fc5e58b521
issue #4437 : add dirty tag.
2014-06-06 18:03:44 +08:00
560053d23c
issue #4437 : add test and fix transform.
2014-06-06 17:33:27 +08:00
eba954b410
Add bytecode and encrypted files test cases for Lua
2014-06-06 17:17:43 +08:00
890bc20475
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-06 11:44:23 +08:00
5ab8b81205
Update control.lua for lua-tests
2014-06-06 11:42:18 +08:00
6cee3fe830
Merge pull request #6979 from visiblelight/TextureOptimize
...
Texture Optimize
2014-06-06 11:38:49 +08:00
39f2669886
remove the new images and use the old ones.
2014-06-06 10:37:45 +08:00
f7d5d837bf
add new tests for different pixel formats
2014-06-05 16:33:42 +08:00
919524cf89
Update controller.lua for lua-tests and bindings-generator submoudle
2014-06-05 14:39:09 +08:00
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
3dc6e86c25
add binary file parsing into ui tests
2014-06-05 10:25:45 +08:00
a11740ff29
ouch, more windows compile issues
2014-06-04 10:11:16 -07:00
59b966731e
Compiles on Windows and Android
2014-06-04 09:48:35 -07:00
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
7a4d46dc1b
Merge pull request #6965 from Dhilan007/v3-wp8fix
...
Support Fast App Resume and fixed black screen may arise when using third sdk.
2014-06-04 17:15:13 +08:00
a495747a7c
Merge pull request #6971 from andyque/refactorUIFramework
...
refactor ObjectFactory
2014-06-04 17:08:27 +08:00
a31710973c
Merge pull request #6962 from visiblelight/AlphaIssues
...
Fix a crash in ParticleTest->PremultipliedAlphaTest
2014-06-04 15:10:54 +08:00
38e274de73
refact ui header file include
2014-06-04 14:56:33 +08:00
7bf2be6033
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
...
Bugfix autorelease pool manager
2014-06-04 14:31:30 +08:00
5432698674
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
...
closed #5482 : Node::setPhysicsBody() doesn't work after node added to another node.
2014-06-04 13:52:43 +08:00
368c5b0d3b
closed #5482 : add a test case for bug 5482.
2014-06-04 11:59:15 +08:00
52ad2063bd
Support Fast App Resume.
2014-06-04 11:19:53 +08:00
ad230bb412
fix a crash in ParticleTest->PremultipliedAlphaTest
2014-06-04 10:39:18 +08:00
dbca937835
add test case to break buggy code
2014-06-03 17:58:09 +08:00
691a77b148
Merge pull request #6928 from boyu0/bug5392_scheduleUpdate
...
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-06-03 14:38:07 +08:00
b24c674d25
Little fixes for setNormalized
2014-05-30 21:50:39 -07:00
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
5e82d9db4d
set libws2_32 as standard library for mingw.
2014-05-30 20:14:22 +08:00
2e42c77b9a
fix typo
2014-05-30 11:13:53 +08:00
95b6fb52de
only use _backToForeGroundListner when on Android
2014-05-30 10:56:03 +08:00
41d19007eb
Merge branch 'v3.1hotfix' into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +08:00
0739f40726
fix faults of load project on Win 32.
2014-05-29 17:30:55 +08:00
b68525ac1f
Merge pull request #6916 from John-He-928/mingw-build
...
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
2014-05-29 15:17:07 +08:00
bfb3567131
Merge pull request #6924 from minggo/remove-test-case
...
Remove test case
2014-05-29 14:54:28 +08:00
e48b14b55d
Merge pull request #6932 from Dhilan007/v3-labelfix
...
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
2014-05-29 14:54:16 +08:00
3182fd56b8
Merge pull request #6931 from VisualSJ/v3
...
Test case action name error
2014-05-29 14:07:23 +08:00
dd2b7e036a
Test case action name error
2014-05-29 14:00:43 +08:00
2a6158bae1
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
2014-05-29 14:00:38 +08:00
91db87a2f6
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-05-29 13:51:43 +08:00
8633ab9c14
add background/foreground listener for EffectSprite/Effect framework test case
2014-05-29 12:43:04 +08:00
44950a57f1
fix mingw32/mingw64 build: use system libs and includes rather than prebuilt ones.
2014-05-29 01:30:14 +08:00
ad3b1cf827
add background/foreground listener for Effectsprite3d/Effect3d test case
2014-05-28 21:07:12 +08:00
d7cca2a044
closed #4819 : remove KeyboardTest
2014-05-28 18:31:00 +08:00
0acc4cd961
issue #4819 : remove KeyPadTest
2014-05-28 18:17:22 +08:00
0ad0f9c405
issue #4819 : remove AccelerometerTest
2014-05-28 18:10:37 +08:00
90cac02de6
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:27:03 +08:00
c52132179a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-28 10:05:41 +08:00
04d2d4a22e
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:04:29 +08:00
c44a5a2b3e
Merge pull request #6908 from dabingnn/v3_refactorEffect3DFrameWork
...
V3 refactor effect3 d frame work
2014-05-27 20:53:40 +08:00
99290b83c7
Merge pull request #6871 from asuuma/v3_Repeat_fix
...
Fix Repeat will run one more over in rare situations
2014-05-27 16:22:42 +08:00
e59813476a
clclosed #5369 : Fix wrong logic when setTarget to Effect3D
2014-05-27 15:08:38 +08:00
0b661d8192
Merge pull request #6907 from visiblelight/screenshot_refactor
...
adding comments for the new utility
2014-05-27 14:52:09 +08:00
453ff81d2a
closed #5369 : refactor Effect3d/EffectSprite3D framework to the pattern similar to Effect/EffectSprite
2014-05-27 14:50:46 +08:00
b8f9b1f20b
Add test case for reproducing Repeat bug
2014-05-27 15:40:38 +09:00
e81db73b0a
adding comments for the new utility.
2014-05-27 14:29:52 +08:00
034e2c6f75
Merge pull request #6809 from heliclei/autotest-stop
...
Support autotest stop command
2014-05-27 14:01:38 +08:00
a01315e2f5
Merge pull request #6726 from visiblelight/screenshot
...
Add a new utility function to snap the screen
2014-05-27 11:18:25 +08:00
363fd8dc2a
move the capturen screen interface from Director to ccUtils
2014-05-27 10:44:23 +08:00
f7450730fb
Merge pull request #6901 from andyque/fixDpadNavigation
...
issue #5176 , refactor FocusNavigationController
2014-05-27 10:40:00 +08:00
9cef55d62c
issue #5176 , refactor FocusNavigationController
2014-05-27 10:20:37 +08:00
866a1cb9aa
Merge pull request #6820 from newnon/v3_android_improvements
...
Android project improvements
2014-05-27 10:17:03 +08:00
d8d5139aaf
closed #5176 , refactor UILayout and focus
2014-05-26 23:04:44 +08:00
c72ae9e3c5
merge from the latest v3
2014-05-26 20:18:11 +08:00
20bae53f4a
fixing typos
2014-05-26 16:32:13 +08:00
28d30a5c40
fix a typo
2014-05-26 16:24:57 +08:00
40f2128acd
Merge branch 'v3' into 5176
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
7edfe78f7d
remove the parameter rect
2014-05-26 13:42:47 +08:00
75cb686573
Merge pull request #6894 from andyque/refactor5183
...
refactor Layout, LayoutParameter and LayoutExecutant
2014-05-26 00:41:04 -05:00
f29654ff6c
Merge pull request #6890 from visiblelight/FixTextureCache
...
Fix the crash in TextureAsync test
2014-05-25 20:55:13 -05:00
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
006f082f74
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-23 19:15:46 +08:00
3bd196f077
Update the openGL lua binding and related test case
2014-05-23 19:12:30 +08:00
1b3a474646
Merge pull request #6891 from boyu0/3.1_test
...
Roll back test_image_ar.pvr
2014-05-23 04:25:56 -05:00
80e184312a
Roll back test_image_ar.pvr
2014-05-23 17:19:39 +08:00
910099fbe5
add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks.
2014-05-23 17:08:22 +08:00
dc03571076
fix some bugs for lua-tests
2014-05-23 16:48:18 +08:00
f76e2a5476
Readd the lua binding for `visit` and modify a requirement for IDE
2014-05-23 10:00:59 +08:00
5601048829
Fixes compiler warnings for mac and ios
2014-05-22 16:34:16 -03:00
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
5e4f481ae5
capture this instead of reference in lambda
2014-05-22 14:52:19 +08:00
a6efd4f650
Move `setSearchPat` operation from cpp to script
2014-05-22 14:00:39 +08:00
3b777646c4
issue #5176 . fix UIScrollView
2014-05-22 11:01:58 +08:00
57d5e6f2d5
issue #5176 , add ListView focus test
2014-05-22 11:01:58 +08:00
6c8e38871c
issue #5255:Remove Sprite3D effect test
2014-05-22 10:22:10 +08:00
4da8ad502f
tests release/debug build
2014-05-21 21:13:44 +04:00
fa5d43741c
fix keypad test
2014-05-21 10:46:26 +08:00
a2ebe428da
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-20 18:11:28 +08:00
2d65f9bc6f
issue #5255:Add Sprite3D test cases for Lua
2014-05-20 18:09:04 +08:00
b07e82f7c3
Revert "Revert "Merge pull request #6752 from andyque/refactorLayout""
...
This reverts commit 1ed9b9749e
2014-05-20 16:17:10 +08:00
9a276c66a0
Merge pull request #6740 from zifter/FixProgressTo
...
Fix Progress Action. Not working with charging from 100 to 0.
2014-05-20 15:36:10 +08:00
1ed9b9749e
Revert "Merge pull request #6752 from andyque/refactorLayout"
...
This reverts commit ae118a9d226f2f2046c7
2014-05-20 14:36:29 +08:00
b6373b5303
Merge branch 'v3' into refactorLayout
2014-05-20 09:30:23 +08:00
cffd53ea94
accelerometer fix
2014-05-19 17:44:28 +08:00
ee24e137f7
issue #5183 , refactor obscure functions
2014-05-19 17:18:04 +08:00
121d6d3109
issue #5183 , refactor
2014-05-19 16:51:25 +08:00
2ddfc45fee
support autotest stop
2014-05-19 13:46:17 +08:00
b89a073b90
replace texture resources
2014-05-19 12:09:55 +08:00
99f17ec88d
commnet out the Renderer test in PerformanceTest
2014-05-19 11:46:32 +08:00
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94#33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73#31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29#29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837ceahttps://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e#24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57#18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a#11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27#8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
2014-05-18 14:49:16 -07:00
81ddbaa7b1
update the calculation of device pixel resolution
2014-05-19 01:12:56 +08:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
e3f2c3985d
Merge pull request #6777 from boyu0/physics_rollback_for_lua
...
Roll back lua PhysicsTest.
2014-05-16 21:55:52 +08:00
74335a92f7
Roll back lua PhysicsTest.
2014-05-16 17:19:02 +08:00
67a558c83d
for 93562d6aa6
...
update Cocos2dxHelper and AndroidManifest.xml template.
2014-05-16 15:55:00 +08:00
7e4597508c
Does not crash on Mac if the .ttf file is not found
2014-05-15 17:22:53 -07:00
f9f0142842
default value is 0.5 for interpolation
2014-05-15 16:52:15 -07:00
9d1ab1ba07
uniform sampler CC_Texture0 MUST NOT be defined on shaders
...
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
2014-05-15 16:47:54 -07:00
e5494cd9e5
multiple pass sprite
...
on ShaderSprite2.cpp
2014-05-15 13:13:31 -07:00
cde4e4811b
Update some GuiConstants and resubmission pr#6361.
2014-05-15 16:54:55 +08:00
5a14b1d67b
fix compile error and synchronizate the UI change for Lua
2014-05-15 15:39:15 +08:00
1c13f901ae
Even better shader test
2014-05-14 16:55:57 -07:00
839170c147
Improvments on the shader2 tests
2014-05-14 13:09:33 -07:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
6fcef92708
Fix Progress Action.
2014-05-14 19:13:14 +03:00
90e2b8a4af
move the method from ccUtils to Director
2014-05-14 19:42:24 +08:00
048d6c09d3
Merge pull request #6701 from heliclei/autotest-autorun
...
support auto start cpp-tests
2014-05-14 18:16:58 +08:00
6cb3b47488
closed #5110 , refactor
2014-05-14 17:07:24 +08:00
dfb016dde3
move the utility from Renderer to UtilsHelper
2014-05-14 16:25:47 +08:00
6213747c41
fix the compile failure on win32.
2014-05-14 19:37:04 +08:00
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +08:00
46cf6251b6
issue #5110 , rename a member variable and delete gui prefix in ui tests
2014-05-14 11:26:04 +08:00
e6a36fde18
issue #5110 , refactor VideoPlayer
2014-05-14 11:18:11 +08:00
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
e7df247d65
replace more tabs with spaces to uniform the code styles.
2014-05-14 10:40:56 +08:00
021be6ef9b
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-14 09:22:36 +08:00
723938e292
Adds effectNode in ShaderTest2
2014-05-13 18:12:58 -07:00
0171e27747
Merge pull request #6714 from Dhilan007/v3_nodefix
...
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
2014-05-13 14:14:27 -07:00
6462a1bf79
Adds simple sample for multitexturing
2014-05-13 12:55:34 -07:00
541d03d668
Now it shoudl run fine on iOS
2014-05-14 01:06:26 +08:00
ed0ae9d5b3
fix compiling fail on Linux.
2014-05-13 18:51:02 +08:00
05c16de87a
Merge pull request #6715 from dumganhar/iss5160-animation-notification
...
closed #5160 : Dispatch a custom event after an animation frame is displayed
2014-05-13 18:38:44 +08:00
fe91f46882
The target filename shuld use a writable path.
2014-05-13 18:34:35 +08:00
24524cb5be
issue #5160 : Updates actiontest
2014-05-13 17:30:48 +08:00
35b19a239a
exit gracefully after running all tests
2014-05-13 17:20:12 +08:00
5459b581b0
replace tab with spaces; remove the 'flipped' parameter;
2014-05-13 17:17:15 +08:00
0dd22af688
closed #5160 : Updates ActionTest
2014-05-13 17:08:52 +08:00
fbfbcaffc8
update project
2014-05-13 16:43:19 +08:00
47e4ee4ff2
add a new utility function to capture the screen
2014-05-13 16:23:35 +08:00
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
17cd12f8b1
fix win32 compile
2014-05-13 14:43:11 +08:00
7d8cfc4cca
set parent transform dirty when addChild
2014-05-12 23:28:20 -07:00
13f3c9705a
Merge remote-tracking branch 'upstream/v3' into autotest-autorun
2014-05-13 14:24:00 +08:00
8cc224dcef
change default auto-run config to false
2014-05-13 14:17:43 +08:00
45d8547622
add config item
2014-05-13 14:16:06 +08:00
eaa879a9f3
fix for winrt build
2014-05-13 14:08:49 +08:00
0b7b9f6131
Merge branch 'v3' into reparentChildren
2014-05-12 22:52:19 -07:00
e1f82c174b
add TestCase for reparentChildren bug
2014-05-12 22:50:31 -07:00
471f218acf
add config item to control whether start autorun
2014-05-13 11:47:32 +08:00
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
98f1c6768c
Merge remote-tracking branch 'upstream/v3' into autotest-autorun
2014-05-13 07:53:49 +08:00
1aabedb316
support auto start tests
2014-05-12 21:47:55 +08:00
9ab2dae212
Merge pull request #6635 from dumganhar/iss4660-unicode
...
issue #4660 : ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
9d7d06a1f8
issue #5047 , refactor UIVideoPlayer
2014-05-12 11:35:57 +08:00
4f3c128c4f
issue #5057 , refator UITextField
2014-05-12 11:29:22 +08:00
eeaf48d3e5
issue #5047 , refactor UISlider
2014-05-12 11:17:06 +08:00
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
77a463bac3
issue #5057 , refactor UIPageView
2014-05-12 10:31:52 +08:00
7f15a14d55
issue #5057 , refactor LoadingBar
2014-05-12 10:12:22 +08:00
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
4d275f91d0
issue #4660 : Updates utf unit test, use c memcmp and run 10000 times
2014-05-11 11:24:32 +08:00
945ad2eb04
issue #4660 : Adds utf8/16 conversion unit test
2014-05-10 21:52:19 +08:00
006fe7eb94
Merge pull request #6667 from super626/improved_glprogram
...
remove unused shadertest
2014-05-09 21:42:01 -07:00
4d579892b1
Merge pull request #6668 from dabingnn/v3_fix_accident_changes
...
V3 fix accident changes
2014-05-09 21:38:09 -07:00
ba63befa5e
roll back target=android-10
2014-05-09 21:36:35 -07:00
cb3bd52d9a
remove unused shadertest
2014-05-09 21:34:59 -07:00
a8c2fb5431
Fixes deprecated warnings
2014-05-09 21:29:24 -07:00
1a0ab4bf92
10 tests
2014-05-09 20:51:46 -07:00
e84d96234b
add two shaderTest case for Trace
...
comment out one(it is not working on IOS device)
2014-05-09 20:35:15 -07:00
4a49668940
plist are not executable files
2014-05-09 20:11:36 -07:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
1be6ba961c
Merge branch 'newcode' into improved_glprogram
2014-05-09 16:05:42 -07:00
877d8dd771
android works!!
2014-05-09 15:59:49 -07:00
47f6f8871f
compiles on windows
2014-05-09 14:43:20 -07:00
4c4a974287
use STRINGGIFY(A) instead R""
2014-05-09 12:03:09 -07:00
4bcdccd302
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-09 12:01:18 -07:00
e72633c066
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram
2014-05-09 11:53:22 -07:00
0b8aed3536
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-09 11:51:00 -07:00
168ff78e18
add test case for y flipped coord
2014-05-09 11:49:51 -07:00
88f1d8ac4e
Add ShaderTest sample and shader code
2014-05-09 11:48:11 -07:00
78dd92a7ef
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-09 11:40:13 -07:00
e1fe26543d
issue #5057 , refactor & remove deprecated warnings
2014-05-09 18:37:22 +08:00
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
451b7a1b6b
issue #5057 , refactor UICheckBox event callback
2014-05-09 16:04:55 +08:00
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
57ce0ee2cf
issue #5057 , refactor addTouchEventListener to std::function<>
2014-05-09 14:30:39 +08:00
7d1cb7af47
issue #5057 , refactor UILoadingBarTest
2014-05-09 11:52:51 +08:00
06f264e87d
rename VideoWidget to VideoPlayer.
2014-05-09 11:30:07 +08:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
2e669c1d28
GLProgram::create() returns a linked GLProgram
2014-05-08 16:04:59 -07:00
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
087378926f
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-08 10:16:09 -07:00
eea1ba6946
added missing files to projects
2014-05-08 10:11:42 -07:00
59e1fc39b3
Merge pull request #6638 from Dhilan007/v3_video
...
fixed compilation fails on android.
2014-05-08 21:43:21 +08:00
24452cada1
fixed compilation fails on android.
2014-05-08 21:39:53 +08:00
0ed33cacf4
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which
...
was set in '.user' file
2014-05-08 21:19:54 +08:00
972f9447dd
issue #4876:Add test case to play video
2014-05-08 18:14:32 +08:00
0c2fd977ea
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
...
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
9f0e25d808
Merge pull request #6628 from andyque/refactor5056
...
refactor 5056. pull gui tests from ExtensionTest to UITest
2014-05-08 17:00:38 +08:00
97ee5cb456
closed #5056 . fix windows compile error
2014-05-08 16:18:46 +08:00
a8d728ffc9
Merge pull request #6610 from zawasp/vs2013project
...
upgrade win32 projects for Visual Studio 2013
2014-05-08 15:40:02 +08:00
e48e26cfdc
issue #5056 . fix linux & android compile error
2014-05-08 15:20:24 +08:00
bea98a1416
Lua xcode project fix
2014-05-08 15:09:02 +08:00
88b0eb3baa
Adds missing 'fps_images.png', our test case needs them
2014-05-08 15:09:02 +08:00
898a66131a
issue #5056 . move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
f6d0135b9b
Merge branch 'v3' into focus3861
2014-05-08 11:27:57 +08:00
323987beb2
closed #4861 , done
2014-05-08 11:26:29 +08:00
90ec7dd9ec
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-07 20:21:03 -07:00
b401f6adc1
Lots of new code
...
Adds GLProgramState
2014-05-07 20:20:19 -07:00
b5f1f7455b
issue #4861 , fix a problem when layout focus loops
2014-05-08 10:46:05 +08:00
ec45dbb0c9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-08 10:22:52 +08:00
41f48e7fa9
Merge branch 'v3' into tony_improved_glprogram
2014-05-07 15:30:04 -07:00
98454eeb69
Adds GLProgram::createXXX()
2014-05-07 14:38:41 -07:00
02405a8efe
Improved samples
2014-05-07 12:41:04 -07:00
b1ed7178fe
Improved API for Uniforms
2014-05-07 10:44:45 -07:00
5190fb27c8
use proposed vertex attribute api
2014-05-07 09:27:44 -07:00
b66b4c6f1d
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
...
remove C4005 warnings after upgrading projects
2014-05-07 17:41:04 +03:00
05b7d274c8
issue #4861 . fix distance calculation
2014-05-07 18:27:05 +08:00
72709c30d5
fixed compilation fail on Android.
2014-05-07 18:20:40 +08:00
8615e13c91
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-07 17:16:40 +08:00
9862fab58f
Comments fix in CCRenderTexture.h
2014-05-07 16:37:21 +08:00
1282252c25
closed #4861 , refactor
2014-05-07 14:06:44 +08:00
yangxiao