Michael Contento
fe180078f0
Android: add xlargeScreens="true" to supports-screens
2013-10-28 23:12:51 +01:00
boyu0
66d1bbd89f
issue #2771 : edit physics effect with all bodies and fix some bugs
2013-10-28 16:17:19 +08:00
James Chen
a829325240
issue #3069 : Updating EventDispatcherTest.
2013-10-28 16:00:19 +08:00
boyu0
d0d8694091
issue #2771 : fix some retain/release bugs
2013-10-28 11:08:41 +08:00
James Chen
e6b0134080
issue #3069 : Updating Custom event test.
2013-10-28 10:49:43 +08:00
James Chen
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
James Chen
9bf44a6c83
issue #3069 : Renaming 'removeListeners' to 'removeEventListeners'.
2013-10-25 16:34:26 +08:00
James Chen
27b71ba73c
Use integer as event type and listener type.
2013-10-25 10:53:47 +08:00
James Chen
b5cac51f97
PhysicsTest update.
2013-10-25 10:53:47 +08:00
James Chen
9c4bc9e8ed
Update physicsTest.
2013-10-25 10:53:47 +08:00
James Chen
7854a13278
Small fix for Bug-422.cpp and MenuTest.cpp.
2013-10-25 10:53:47 +08:00
James Chen
b131e8c509
Update menu test.
2013-10-25 10:53:46 +08:00
James Chen
9ed263056c
Use eventDispatcher to dispatch event. Remove controller codes in Layer.
2013-10-25 10:53:46 +08:00
James Chen
1f3863e787
Event Dispatcher refactor commit. TestCpp could run.
2013-10-25 10:53:45 +08:00
James Chen
cfaef2a01a
Adding onEnterHook, onXXXHook for Node.
2013-10-25 10:53:45 +08:00
Dhilan007
08960f1510
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2893
2013-10-24 18:16:44 +08:00
Dhilan007
fd993e2fa2
issues #2905:split jsbinding module
2013-10-24 17:54:57 +08:00
James Chen
10329de46c
Merge pull request #4002 from boyu0/iss2771_physical
...
issue #2771 physical
2013-10-24 02:31:40 -07:00
samuelhu
a5e479d2bb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-24 11:14:20 +08:00
boyu0
a8ddca81bd
issue #2771 : fix some compile error in win32
2013-10-23 18:52:09 +08:00
minggo
d07d054a01
issue #2905:ndk-r8e build ok now
2013-10-23 17:44:20 +08:00
boyu0
912a9a2887
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-23 17:41:52 +08:00
boyu0
899f720efa
issue #2771 : implement getShapeAtPoint and getShapesAtPoint
2013-10-23 17:28:23 +08:00
minggo
e81efb24c9
issue #2905 : android samples run ok
2013-10-23 16:49:50 +08:00
minggo
4952df576b
Merge pull request #3996 from boyu0/iss2771_physical
...
issue #2771 : physical
2013-10-22 20:45:55 -07:00
boyu0
17422c3123
issue #2771 : fix some compile error in win32
2013-10-23 11:08:21 +08:00
boyu0
51801d9218
issue #2771 : fix some compile error in android and win32
2013-10-23 10:11:08 +08:00
samuelhu
26caaa0a36
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-23 09:57:21 +08:00
minggo
0169189f6a
Merge pull request #3992 from Dhilan007/di2905
...
issues #2905:add SimpleGame vs-project
2013-10-22 18:41:26 -07:00
minggo
abcf8f268d
fix conflicts
2013-10-22 18:36:13 +08:00
Dhilan007
3252a89791
issues #2905:add SimpleGame vs-project
2013-10-22 18:11:07 +08:00
minggo
6a664d480a
issue #2905:samples build ok on linux
2013-10-22 18:01:56 +08:00
boyu0
24561860f0
issue #2771 : add ray cast test
2013-10-22 18:00:24 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
minggo
d07fbb8903
Merge pull request #3974 from boyu0/iss2771_physical
...
issue 2771: physical
2013-10-21 22:44:22 -07:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
boyu0
6e2c4801f8
Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-18 16:05:29 +08:00
boyu0
6aef4476d9
issue #2771 : edit some mistake when merge
2013-10-18 15:55:47 +08:00
boyu0
d12ee5f120
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-18 15:34:13 +08:00
Dhilan007
8fb0327597
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-18 14:57:33 +08:00
minggo
63c13d8eaa
issue #2905:simplify Android.mk dependence
2013-10-18 14:18:36 +08:00
Dhilan007
66c2fe26ef
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 22:34:09 +08:00
minggo
9c3cac759c
issue #2905:simple game and assets manager build ok on android
2013-10-17 18:39:37 +08:00
Dhilan007
6f39f903e3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 16:23:19 +08:00
minggo
e50f9fc43b
issue #2905 : jsbinding samples and lua binding samples build ok on android
2013-10-17 15:04:30 +08:00
Nite Luo
d72d8e93d2
Add mouse support to linux
2013-10-16 22:36:00 -07:00
Dhilan007
546bc3aa32
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 11:33:10 +08:00
minggo
8f9756f030
issue #2905:TestJavascript build ok on Android
2013-10-17 11:28:57 +08:00
boyu0
89448135ad
issue #2771 : implement some joint definition.
2013-10-17 10:57:48 +08:00
Dhilan007
d82c2ca060
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-17 09:39:48 +08:00
Ricardo Quesada
3cbeabc777
Icons for test projects
2013-10-16 11:55:14 -07:00
Dhilan007
c6344875de
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 17:30:51 +08:00
minggo
91eada6c1e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder
2013-10-16 16:50:46 +08:00
minggo
8f7a489a4d
issue #2905:make cocostudio and gui flat
2013-10-16 16:48:39 +08:00
James Chen
00ee416006
issue #2905 : [iOS Mac] All js games work now.
2013-10-16 16:21:55 +08:00
Dhilan007
3d1f734326
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-10-16 15:44:43 +08:00
James Chen
6fba0dd5db
issue #2905 : [iOS Mac] TestJavascript works now.
2013-10-16 15:43:59 +08:00
James Chen
8e80f1d46a
issue #2905 : Reverting TestCpp/Android.mk
2013-10-16 11:22:58 +08:00
James Chen
7dc8aeb156
issue #2905 : Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.
2013-10-16 11:19:01 +08:00
Dhilan007
5116e91c4b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
2013-10-16 11:00:22 +08:00
minggo
6fc2be62f5
issue #2905 : testcpp bild ok on Android
2013-10-15 18:00:03 +08:00
boyu0
d1fead368d
issue #2771 : migrate the PhysicsBody definition
2013-10-15 16:55:08 +08:00
Dhilan007
2865ad798b
issues #2905:Updating project configuration for folder change.
2013-10-15 10:18:37 +08:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
boyu0
5c7603e0ce
issue #2771 : change angular damping to moment. (these two have different meaning, change to the correct one)
2013-10-14 13:56:08 +08:00
James Chen
f6275667bf
Removing unused ios projects.
2013-10-12 15:02:28 +08:00
minggo
ad6325b0dd
fix conflicts
2013-10-12 11:31:32 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
Nite Luo
ddf21e8bd1
Implement mouse callback for windows
2013-10-11 16:33:49 -07:00
Nite Luo
09c0e23b5d
Mouse working on mac
2013-10-11 14:35:38 -07:00
James Chen
edcf9fecb4
[Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'.
2013-10-11 21:52:28 +08:00
minggo
0130aae044
Merge pull request #3916 from boyu0/iss2771_physical
...
[ci skip]issue 2771: physical
2013-10-10 19:50:19 -07:00
boyu0
acf1d72213
issue #2771 : delete #define RAND_MAX in PhysicsTest.cpp(already defined in stdlib.h)
2013-10-11 10:24:55 +08:00
minggo
e90e975e3d
Merge pull request #3911 from minggo/iss2905-adjust_folder
...
[ci skip]SimpleAudioEngine -> audio
2013-10-10 18:27:25 -07:00
boyu0
775a81ae19
issue #2771 : Let the sprites added to SpriteBatchNode support physics.
2013-10-10 18:31:43 +08:00
minggo
c9d28276d3
Merge pull request #3915 from Dhilan007/0002
...
[ci skip]fix compile fail on vs2012.
2013-10-10 03:25:38 -07:00
James Chen
590d8d50e0
Merge pull request #3914 from Dhilan007/00001
...
fix copy resource error.
2013-10-10 03:09:20 -07:00
LinWenhai
83ab7128e7
fix incomplete copy
2013-10-10 18:07:36 +08:00
LinWenhai
8c6a481588
fix incomplete copy
2013-10-10 18:06:59 +08:00
LinWenhai
f861d6d2fc
fix incomplete copy
2013-10-10 18:03:15 +08:00
LinWenhai
312d761390
Update build_native.cmd
2013-10-10 18:01:45 +08:00
minggo
6e62be5443
issue #2905 : modify makefile to include correct header files
2013-10-10 17:39:53 +08:00
Dhilan007
5ea5c394e7
fix compile fail on vs2012.
2013-10-10 17:17:10 +08:00
Dhilan007
e181f7a4d2
fix copy resource error.
2013-10-10 17:10:37 +08:00
James Chen
5b3cbf9a29
issue #2823 : Updating build_native.sh for AssetsMangerTest.
2013-10-10 17:07:13 +08:00
James Chen
732233336b
issue #2823 : Updating build_native.sh for JSB projects. Copy all resources in scripting/javascript/bindings/js/*
2013-10-10 16:47:19 +08:00
James Chen
02f724cd23
issue #2823 : Enabling JSB debugger in debug mode. Removing the definition of JSB_ENABLE_DEBUGGER.
2013-10-10 16:18:12 +08:00
James Chen
5f4b0d9a0e
issue #2823 : Removing unused debugger codes in MoonWarriors/Classes/AppDelegate.cpp.
2013-10-10 16:18:11 +08:00
James Chen
0ad7a9fd4b
issue #2823 : minor fix and logs.
2013-10-10 16:18:10 +08:00
James Chen
b5d02d8cca
issue #2823 : firefox debugger step ok.
2013-10-10 16:18:09 +08:00
minggo
866906fd58
issue #2905:modify project settings to include correct audio path
2013-10-10 15:40:06 +08:00
samuele3hu
3104bfbe50
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
2013-10-10 11:48:20 +08:00
samuele3hu
531e454eae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
...
Conflicts:
samples/samples.xcodeproj/project.pbxproj
2013-10-10 11:47:36 +08:00
Dhilan007
a8f0c99abf
Fix miss project configuration for CoreMotion.
2013-10-10 11:12:33 +08:00
samuele3hu
b5ee16399c
issue #2768:Modify the linux make files of the liblua 、the testlua and hellolua projects
2013-10-10 11:09:09 +08:00
boyu0
381f904cd4
issue #2771 : add PhysicsMaterial
2013-10-09 17:53:12 +08:00
boyu0
4747e37acf
issue #2771 : let PhysicsShape::create doesn't need to pass the PhysicsBody
2013-10-09 13:41:19 +08:00
minggo
d8d7d0b5a5
Merge pull request #3884 from samuele3hu/developPerformace
...
[ci skip]issue #2792:Performance Test: Sprite drawing
2013-10-08 19:08:48 -07:00
samuele3hu
508654738a
issue #2768:Modify armature test sample and skip some functions to lua
2013-10-08 15:45:13 +08:00
samuele3hu
4c1bd825af
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
2013-10-08 10:17:58 +08:00
Dhilan007
5acac436f9
issues #2677:Use CoreMotion's API to replace UIAccelerometer.
2013-10-08 10:11:52 +08:00
Nite Luo
a2c2546942
Implement MouseWheel Event, also fix a typo in EventListener interface
2013-10-04 10:07:39 -07:00
boyu0
35259588a3
issue #2771 : fix some bugs in PhysicsShape
2013-09-30 21:48:25 +08:00
boyu0
9c16a45f33
issue #2771 : separate the PhysicsBody and the PhysicsShape.
2013-09-30 20:43:19 +08:00
samuelhu
01ee83364e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerformace
2013-09-30 16:23:37 +08:00
samuelhu
6aa18423e6
issue #2792 : Performance Test: Sprite drawing
2013-09-30 16:22:55 +08:00
boyu0
18a4b18368
issue #2771 : move _physicsBody from sprite to node
2013-09-30 13:02:17 +08:00
boyu0
3dbe74db1a
issue #2771 : refactor PhysicsTest
2013-09-29 15:09:53 +08:00
Dhilan007
9727436a5d
issues #2834:Use Android standalone toolchain on windows to remove the dependence of cygwin
2013-09-27 21:54:48 +08:00
Ricardo Quesada
cc4695507a
Test compiles with box2d enabled
2013-09-26 16:23:13 -07:00
James Chen
3ffad35f0e
Merge pull request #3741 from signmotion/develop
...
Fixed some compiling-warnings (MSVC2012).[ci skip]
2013-09-24 02:27:14 -07:00
CaiWenzhi
fa892c2158
Remove layoutexecutant class
2013-09-23 19:16:20 +08:00
signmotion
7d139a3bc3
Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').
2013-09-22 23:50:54 +03:00
James Chen
26ecb2ea9e
[Win32] Updating the window size of JS-Games to 480x720.
2013-09-22 12:03:55 +08:00
James Chen
a8f71fff73
Updating JS-test.
2013-09-22 11:27:09 +08:00
James Chen
75a562f9b4
[Mac] Updating the window size for JS games.
2013-09-22 11:26:44 +08:00
James Chen
47f9055e24
Updating js test.
2013-09-22 10:06:13 +08:00
minggo
40819b90df
Merge pull request #3726 from ricardoquesada/missing_icons
...
Adds missing icons to templates and samples
2013-09-21 00:58:32 -07:00
minggo
8238a05039
fix compiling error
2013-09-21 15:30:54 +08:00
Ricardo Quesada
cd557a11bf
Adds missing icons to templates and samples
2013-09-20 14:06:44 -07:00
minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
samuele3hu
a6d498e068
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
2013-09-20 22:06:28 +08:00
samuele3hu
54e0fd9a63
Modify Accelerometer Test sample
2013-09-20 22:05:37 +08:00
minggo
4c9771ba3c
rename some class names to obey cocos2d-x coding style
2013-09-20 19:19:31 +08:00
minggo
c84a1a157b
Merge pull request #3714 from ricardoquesada/icon_xcode_improvements
...
Icon xcode improvements
2013-09-20 01:24:15 -07:00
James Chen
3d41b7e33c
Adding EventDispatcher Test of removing all touch listeners.
2013-09-20 14:14:03 +08:00
Ricardo Quesada
2ab1b2ff04
Lua template: ios and mac projects in one Xcode file
...
Merged iOS and Mac projects into one single Xcode.proj file
2013-09-19 17:05:00 -07:00
Ricardo Quesada
d6675df75b
Adds iOS7 icons in SimpleGame and HelloCpp
2013-09-19 11:44:20 -07:00
James Chen
dadf6b3d0b
Merge pull request #3710 from Dhilan007/develop
...
restore AccelerometerTest
2013-09-19 07:20:23 -07:00
James Chen
2ebdb440bf
Merge pull request #3706 from ricardoquesada/cpp_best_practices
...
Small fixes to comply with C++ best practices
2013-09-19 07:15:32 -07:00
Dhilan007
2504b8e029
restore AccelerometerTest
2013-09-19 19:05:52 +08:00
James Chen
153794ba6c
Updating MutiTouchTest.cpp. Adding title. Removing unused codes.
2013-09-19 18:54:26 +08:00
James Chen
d32fb93e07
Fixing SchedulerTest crash. We need to invoke parent's onExit in subclass::onExit.
2013-09-19 18:53:45 +08:00
James Chen
b05796e1a5
issue #2087 : Fixing NewEventDispatcherTest --> SpriteAccelerationEventTest crash.
2013-09-19 13:55:49 +08:00
Ricardo Quesada
0674948325
Small fixes to comply with C++ best practices
...
Small fixes to comply with C++ best practices
2013-09-18 19:38:21 -07:00
James Chen
e051903b38
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2087-new-event-dispatcher
2013-09-19 09:22:31 +08:00
James Chen
3fbf61ad52
issue #2087 : Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes.
2013-09-19 09:14:51 +08:00
James Chen
a842b6de2f
Merge pull request #3699 from Dhilan007/develop
...
Unify Accelerometer coordinate on IOS and Android.[ci skip]
2013-09-18 17:20:38 -07:00
Dhilan007
479355ee32
Unify Accelerometer coordinate on IOS and Android.
2013-09-19 00:04:50 +08:00
James Chen
ec7cfae4e8
Merge pull request #3697 from dumganhar/iss2087-new-event-dispatcher
...
Fixing MenuTest crash.
2013-09-18 08:42:09 -07:00
James Chen
c7612fee15
Fixing MenuTest crash.
2013-09-18 23:43:04 +08:00
James Chen
339b4fa749
Merge pull request #3696 from dumganhar/iss2087-new-event-dispatcher
...
issue #2087 : Adding new event dispatcher test and bug fixes.
2013-09-18 07:51:12 -07:00
James Chen
4288160d50
issue #2087 : Renaming EventDispatcherTest name to EventDispatcherTest(NEW)
2013-09-18 22:47:50 +08:00
James Chen
8bb406a1ec
issue #2087 : Enabling acc when testing it.
2013-09-18 22:45:48 +08:00
James Chen
32089fa517
issue #2087 : Adding new EventDispatcher Test.
...
1) RemoveListenerWhenDispatching
2) CustomEventTest
3) LabelKeyboardEventTest
4) SpriteAccelerationEventTest
2013-09-18 22:23:02 +08:00
James Chen
a2d9f2d7cf
Make XXXEventListener as friend class of XXXEvent. Move the test of eventdispatchertest.
2013-09-18 18:35:42 +08:00
James Chen
f23ca6a52c
Merge pull request #3695 from dumganhar/iss2087-new-event-dispatcher
...
Make XXXEventListener as friend class of XXXEvent. Move the test of eventdispatchertest.
2013-09-18 03:35:03 -07:00
minggo
1878fa6041
Merge pull request #3694 from dabingnn/release30_bug_hot_fix
...
rename test case to correct name
2013-09-18 03:33:46 -07:00
Huabing.Xu
19e37d284e
rename test case to correct name
2013-09-18 18:26:03 +08:00
James Chen
d7f15a971a
Merge pull request #3692 from dumganhar/iss2087-new-event-dispatcher
...
issue #2087 : Sorts listeners only when flag is dirty. setPriority is only valid in fixed priority listener.
2013-09-18 02:49:52 -07:00
James Chen
f7fa92aea9
issue #2087 : Sorts listeners only when flag is dirty. setPriority is only valid in fixed priority listener.
2013-09-18 17:46:00 +08:00
minggo
ff3fcf5eb7
Merge pull request #3690 from dabingnn/release30_bug_hot_fix
...
glfw EGLView alloc on the stack to prevent memory leak
2013-09-18 02:44:34 -07:00
samuele3hu
d4669f3ad4
replace tabs with spaces
2013-09-18 17:19:34 +08:00
Huabing.Xu
a2dee37b0e
glfw EGLView set alloc on the stack to prevent memory leak
2013-09-18 17:00:21 +08:00
samuele3hu
567dd00710
Modify Accelerometer lua test sample
2013-09-18 16:44:05 +08:00
James Chen
40a6f84585
Merge pull request #3680 from Dhilan007/develop
...
1.android platform:handle key event and fix Accelerometer value error [ci skip]
2013-09-18 00:01:32 -07:00
minggo
c1d7cc0f29
Merge pull request #3684 from minggo/develop
...
upstream to js tests
2013-09-17 23:25:00 -07:00
minggo
6f196e1470
upstream to js tests
2013-09-18 14:24:21 +08:00
minggo
801b7831df
Merge pull request #3671 from chengstory/#4684
...
Remove unused files from mk files.
2013-09-17 22:08:38 -07:00
Dhilan007
fd3a03a6ee
1.android platform:handle key event
...
2.android platform:fix Accelerometer value error
2013-09-18 12:04:35 +08:00
zhangcheng
820b8630dc
1. fixes failed to build linux.
2013-09-18 11:51:14 +08:00
minggo
40d91f0afa
disable compressing png when deploying for iOS device
2013-09-18 11:16:28 +08:00
James Chen
f403f7d683
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
...
Conflicts:
samples/samples.xcodeproj/project.pbxproj
2013-09-17 23:24:14 +08:00
James Chen
e563c27994
Keypad event fix for js and lua bindings.
2013-09-17 23:21:45 +08:00
minggo
c2e53d5673
Merge pull request #3665 from minggo/merge-physics
...
Merge physics
2013-09-17 08:18:55 -07:00
James Chen
513237d5f6
Fixing armature test crash.
2013-09-17 23:03:33 +08:00
zhangcheng
c065dd2920
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
2013-09-17 22:41:42 +08:00
James Chen
7d94878173
[win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32.
2013-09-17 22:34:20 +08:00
CaiWenzhi
1f45bad5e7
Modify guy example
2013-09-17 21:19:04 +08:00
zhangcheng
ec401d1148
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
2013-09-17 21:15:36 +08:00
zhangcheng
b86a8271d9
1. Upload Cocostudio Action.
2013-09-17 21:14:45 +08:00
CaiWenzhi
f42797bc0d
Merge branch 'develop' into Merge_GUI_to_Develop
2013-09-17 20:43:16 +08:00
CaiWenzhi
9d07b2c1d2
Temp commit
2013-09-17 20:13:23 +08:00
minggo
ba820790ec
Merge https://github.com/cocos2d/cocos2d-x into merge-physics
2013-09-17 20:06:33 +08:00
James Chen
81df48b264
Updating submodule of JS-Test.
2013-09-17 19:32:15 +08:00
minggo
ddaff9cce6
make cocos2dx depend chipmunk
2013-09-17 19:24:30 +08:00
minggo
d488796896
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics
2013-09-17 18:14:12 +08:00
James Chen
43e98be8b7
Adding resources of CocoStudio GUI Test.
2013-09-17 17:46:40 +08:00
James Chen
beb8fa0b34
Merge branch 'develop' into box2d_test_bed_fix
2013-09-17 17:21:54 +08:00
James Chen
3fa539081f
Merge pull request #3644 from samuele3hu/developTest
...
Modify some lua test samples bug and delete tool/tolua++ folder[ci skip]
2013-09-17 01:41:50 -07:00
boyu0
acbb50b543
issue #2771 : edit Xcode project setting.
2013-09-17 16:28:32 +08:00
boyu0
5040ae33a1
issue #2771 : add comments
2013-09-17 16:27:43 +08:00
boyu0
270bd997cc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-09-17 14:46:36 +08:00
boyu0
0a53a12f51
issue #2771 : update project setting
2013-09-17 14:31:43 +08:00
samuele3hu
3809a6feed
Repair some lua test samples bug and del tool/tolua++ folders
2013-09-17 13:59:48 +08:00
zhangcheng
a25c2cabf8
1. Fixes failed to build windows.
...
2. Upload CocoGUI Resources.
2013-09-17 13:25:15 +08:00
James Chen
9cd99f4c66
[Android] ArmatureTest compilation fix.
2013-09-17 11:56:00 +08:00
James Chen
fe1b11a814
Fixing wrong include.
2013-09-17 11:28:33 +08:00
boyu0
9f7bf4349c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-09-17 11:19:47 +08:00
boyu0
54f7146d5f
issue #2771 : update vs project setting
2013-09-17 11:18:53 +08:00
James Chen
480b2dd1d8
[Linux] Updating Makefile for TestCpp.
2013-09-17 10:52:42 +08:00
James Chen
28b266bc5e
[Android] Android.mk fixes after adding GUI test.
2013-09-17 10:49:59 +08:00
James Chen
650e6ad6fc
issue #2087 : [dispatcher] Updating MenuTest.
2013-09-17 10:46:31 +08:00
boyu0
481ad7ef12
issue #2771 : update project setting
2013-09-17 10:41:08 +08:00
James Chen
365419a8b2
issue #2087 : [dispatcher] Fix box2d_test crash.
2013-09-16 23:35:16 +08:00
boyu0
f96bc2355a
issue #2771 : update android.mk
2013-09-16 22:56:20 +08:00
James Chen
157ffa9299
Merge pull request #3627 from nutty898/Merge_GUI_to_Develop
...
Merge gui to develop 3.0 branch
2013-09-16 07:45:23 -07:00
CaiWenzhi
f983155d7c
Modify scene sample
2013-09-16 22:29:53 +08:00
boyu0
a48fee881d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-09-16 22:16:50 +08:00
CaiWenzhi
d276bfc885
modify mk files
2013-09-16 22:15:29 +08:00
boyu0
2c66f1b95e
issue #2771 : Implement the minimum set of physical API. Improve the PhysicsTest
2013-09-16 21:22:22 +08:00
James Chen
b128018f76
Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996
...
Conflicts:
extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-09-16 20:58:26 +08:00
CaiWenzhi
759fcc147b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop
2013-09-16 20:55:55 +08:00
CaiWenzhi
ca599b4852
Merge guy to 3.0 branch
2013-09-16 20:54:13 +08:00
signmotion
5dffb1b44e
Deprecated methods are replaced (warning MSVC C4996 is suppressed).
2013-09-16 15:38:03 +03:00
James Chen
72c2d4ca35
Merge branch 'develop' into 2youyouo2-develop
...
Conflicts:
extensions/proj.win32/libExtensions.vcxproj.filters
2013-09-16 20:12:03 +08:00
minggo
21d299150e
Merge pull request #3621 from minggo/develop
...
upstream synchronize
2013-09-16 04:47:21 -07:00
minggo
819fbf2866
upstream synchronize
2013-09-16 19:46:14 +08:00
James Chen
83d61dff44
[Armature] Fixing compilation errors.
2013-09-16 19:27:34 +08:00
James Chen
208f705845
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-09-16 18:18:23 +08:00
James Chen
d8fb3aa731
issue #2087 : [dispatcher] Reverts: HelloCpp.
2013-09-16 16:22:22 +08:00
James Chen
37dd173644
issue #2087 : [dispatcher] Fixing errors in test.
2013-09-16 16:03:39 +08:00
James Chen
8e668cd837
issue #2087 : [dispatcher] Rename FixedPriorityChangedTest to FixedPriorityTest.
2013-09-16 16:02:48 +08:00
James Chen
46e1291ce1
issue #2087 : [dispatcher] Enabled touch for Box2dTestBed, removed touch listener before re-adding.
2013-09-16 15:55:03 +08:00
James Chen
990b801b11
issue #2087 : [dispatcher] Reverts: glGetError --> CHECK_GL_ERROR_DEBUG.
2013-09-16 15:54:02 +08:00
James Chen
7921b45090
issue #2087 : [dispatcher] New Dispatcher Test: Fixed priority. Adding include.
2013-09-16 15:43:48 +08:00
James Chen
b3cade3be0
issue #2087 : [dispatcher] New Dispatcher Test: Fixed priority.
2013-09-16 15:43:20 +08:00
2youyou2
a08ce3df73
change singleton class get method to getInstance
2013-09-16 15:16:05 +08:00
2youyou2
16c70363dd
standardizate code
2013-09-16 14:56:59 +08:00
James Chen
e31c4f008d
Merge pull request #3597 from chengstory/#4560
...
SceneEditorTest He version
2013-09-15 20:23:05 -07:00
minggo
81a26d44f6
Merge pull request #3596 from dumganhar/new-event-dispatcher-rename
...
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
2013-09-15 20:13:51 -07:00
minggo
37cfc855b9
Merge pull request #3581 from dabingnn/new_shader_test
...
issue #2782 : add shader test sprite and close issue
2013-09-15 19:36:51 -07:00
samuele3hu
6efe3e7eeb
issue #2794:Add a newline
2013-09-16 10:04:58 +08:00
James Chen
9891077bba
[dispatcher] Adding 'emit touch event' menu item.
2013-09-15 21:56:02 +08:00
2youyou2
db4813f161
1.remove CC from class name
...
2.fix async loading
2013-09-15 19:08:45 +08:00
James Chen
e3cce1fd0b
[dispatcher] 100 times for Touch event dispatch test.
2013-09-15 18:26:17 +08:00
James Chen
62a0dc41c3
[dispatcher] Adding TouchEvent dispatch test.
2013-09-15 17:49:36 +08:00
2youyou2
9fd89dbfc2
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
...
Conflicts:
extensions/CCArmature/CCArmature.cpp
extensions/CCArmature/CCArmature.h
extensions/CCArmature/CCBone.cpp
extensions/CCArmature/CCBone.h
extensions/CCArmature/animation/CCArmatureAnimation.cpp
extensions/CCArmature/animation/CCTween.cpp
extensions/CCArmature/animation/CCTween.h
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/datas/CCDatas.h
extensions/CCArmature/display/CCDecorativeDisplay.cpp
extensions/CCArmature/display/CCDecorativeDisplay.h
extensions/CCArmature/display/CCDisplayFactory.cpp
extensions/CCArmature/display/CCDisplayFactory.h
extensions/CCArmature/display/CCDisplayManager.cpp
extensions/CCArmature/display/CCDisplayManager.h
extensions/CCArmature/display/CCSkin.cpp
extensions/CCArmature/display/CCSkin.h
extensions/CCArmature/external_tool/CCTexture2DMutable.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.cpp
extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.h
extensions/CCArmature/external_tool/Json/lib_json/json_reader.cpp
extensions/CCArmature/external_tool/Json/lib_json/json_value.cpp
extensions/CCArmature/external_tool/Json/lib_json/value.h
extensions/CCArmature/physics/CCColliderDetector.cpp
extensions/CCArmature/physics/CCColliderDetector.h
extensions/CCArmature/utils/CCArmatureDataManager.cpp
extensions/CCArmature/utils/CCArmatureDefine.h
extensions/CCArmature/utils/CCDataReaderHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.cpp
extensions/CCArmature/utils/CCSpriteFrameCacheHelper.h
extensions/CCArmature/utils/CCUtilMath.cpp
extensions/cocos-ext.h
extensions/proj.win32/libExtensions.vcxproj
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.h
samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson
2013-09-15 15:19:13 +08:00
samuele3hu
1e093868c8
issue #2768:Modify testlua and hellolua sample's linux mayflies.
2013-09-15 09:53:08 +08:00
2youyou2
2213e8118d
fix armature hd crash
2013-09-14 23:31:33 +08:00
zhangcheng
841ea4cfdd
1. change 480*320 to 960*640.
2013-09-14 20:52:35 +08:00
zhangcheng
95236e86d9
1. update scenetest version.
2013-09-14 20:49:02 +08:00
samuele3hu
95831eb70f
issue #2768:Add a newline
2013-09-14 20:00:26 +08:00
yinkaile
5e1f91d396
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
...
Conflicts:
extensions/CocoStudio/Armature/CCArmature.h
extensions/CocoStudio/Armature/CCBone.h
extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
extensions/CocoStudio/Armature/animation/CCProcessBase.h
extensions/CocoStudio/Armature/animation/CCTween.h
extensions/CocoStudio/Armature/datas/CCDatas.h
extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
extensions/CocoStudio/Armature/display/CCDisplayManager.h
extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
extensions/CocoStudio/Armature/physics/CCColliderDetector.h
extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
2013-09-14 19:54:49 +08:00
samuele3hu
85ca0136f0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge
2013-09-14 19:53:08 +08:00
samuele3hu
aa4c90e97a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
...
Conflicts:
extensions/cocos-ext.h
2013-09-14 19:29:36 +08:00
zhangcheng
acf9754814
1. add supported for 480*320 on scenetest.
2013-09-14 19:03:15 +08:00
zhangcheng
0121943c11
1. Adds SceneEditorTest hd version
2013-09-14 16:34:26 +08:00
James Chen
1ed980d27c
[dispatcher] Updating win32 TestCpp.vcxproj.
2013-09-14 10:32:37 +08:00
James Chen
997a5a36c1
[dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'.
2013-09-14 09:02:49 +08:00
James Chen
dd7bfd7b60
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase
...
Conflicts:
cocos2dx/CCDirector.h
cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
cocos2dx/menu_nodes/CCMenu.h
cocos2dx/platform/CCAccelerometerDelegate.h
cocos2dx/platform/android/CCAccelerometer.h
cocos2dx/platform/ios/CCAccelerometer.h
cocos2dx/platform/mac/CCAccelerometer.h
cocos2dx/platform/win32/CCAccelerometer.h
cocos2dx/script_support/CCScriptSupport.h
cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
cocos2dx/touch_dispatcher/CCTouchDispatcher.h
cocos2dx/touch_dispatcher/CCTouchHandler.h
extensions/CocoStudio/Components/CCInputDelegate.h
2013-09-13 19:06:09 +08:00
James Chen
dd55822465
[dispatcher] Updating NewEventDispatcherTest.cpp.
2013-09-13 18:51:00 +08:00
James Chen
ff24eac21a
[dispatcher] Adding new EventDispatcher Test to Makefile and project.
2013-09-13 18:08:00 +08:00
yinkaile
74bd8b09d6
update armature
2013-09-13 18:07:37 +08:00
James Chen
cf66992b51
[dispatcher] Updating HelloWorldScene.cpp, if you wish to using the same listener for different target, please invoke clone to create a new one.
2013-09-13 18:02:26 +08:00
James Chen
7729756d04
[dispatcher] Updating EventDispatcherTest.cpp.
2013-09-13 18:01:32 +08:00
minggo
9c259823e1
Merge pull request #3590 from Dhilan007/develop
...
issue #2800:Can not hide status bar on iOS 7
2013-09-13 02:12:30 -07:00
James Chen
51548b9542
Adding NewEventDispatcher Test.
2013-09-13 16:38:21 +08:00
Dhilan007
18f2f831b4
issue #2800:Can not hide status bar on iOS 7
...
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
2013-09-13 16:07:02 +08:00
Dhilan007
5350b1ad06
issue #2800:Can not hide status bar on iOS 7
...
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
2013-09-13 15:54:58 +08:00
minggo
c4cb2582cc
fixed #2793:best practice of New Label
2013-09-13 11:46:46 +08:00
James Chen
c948a67243
[dispatcher] Updating SimpleGame.
2013-09-12 22:12:58 +08:00
James Chen
6f37529236
[dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private.
2013-09-12 20:47:15 +08:00
James Chen
24c8438fa6
[Dispatcher] Updating Android.mk, and some refractor.
2013-09-12 17:31:37 +08:00
James Chen
6623879f6d
[EventDispatcher] Refactoring Touch, Touch doesn't inherit from Object now. Using std::vector<Touch*> to dispatch event and a little performance improved.
2013-09-12 14:26:39 +08:00
Huabing.Xu
b1b192ce70
closed #2782 : shadertestSprite remove blank line
2013-09-12 10:31:14 +08:00
Huabing.Xu
53ffedc558
issue #2782 : shadertestSprite add lensFlare Sprite Test Case
2013-09-12 10:25:55 +08:00
James Chen
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
samuele3hu
7c62509b02
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge
2013-09-11 09:50:31 +08:00
samuele3hu
29f0909714
issue #2768:Add LuaObjectBridge and LuaJavaBridge
2013-09-11 09:48:24 +08:00
boyu0
d161c6a576
issue #2771 : Add PhysicsTest to TestCpp. Add initTest to TestScene, move Scene::init() from constructor to TestScene::initTest()
2013-09-10 17:41:06 +08:00
chengstory
bdfde89ef8
Merge branch '#develop' into #4551
...
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-09-10 16:25:31 +08:00
minggo
31ce15ea46
Merge pull request #3571 from dabingnn/new_shader_test
...
issue #2782 shader test sprite
2013-09-09 22:55:53 -07:00
chengstory
e04a47b807
1. update mkfile.
2013-09-10 13:08:05 +08:00
Huabing.Xu
8e35e7cc27
issue #2782 : shadertestSprite change test case textures and add normal sprite for comparison
2013-09-10 11:45:38 +08:00
chengstory
669de88e73
1. remove any unused functions.
2013-09-10 11:02:50 +08:00
Huabing.Xu
2912260b3a
issue #2782 : shadertestSprite linux and windows version
2013-09-10 11:00:57 +08:00
zhangcheng
98fce2fa84
1. update Samples on develop branch.
2013-09-10 09:53:15 +08:00
Huabing.Xu
5801e9118c
issue #2782 : remove a blank test case
2013-09-10 09:38:12 +08:00
Huabing.Xu
f2fc710f86
issue #2782 : shadertestSprite android make file
2013-09-10 09:32:03 +08:00
Nako Sung
31e3faaa4f
Update AppDelegate.cpp
2013-09-09 22:38:37 +09:00
Huabing.Xu
8a86a883d0
issue #2782 : update mac version, update test case title
2013-09-09 21:33:01 +08:00
zhangcheng
99f32077d2
1. upload SceneTest Resources.
2013-09-09 19:52:07 +08:00
Huabing.Xu
d7d914feb1
Merge branch 'develop' into new_shader_test
2013-09-09 18:18:31 +08:00
Huabing.Xu
d763de3d3c
new shader test code
2013-09-09 17:49:13 +08:00
성낙호
bf4eaa7e7c
merged
2013-09-09 18:20:16 +09:00
성낙호
3a4c9f9fb0
men leak fixed (life-cycle management was hand downed to scene-graph)
2013-09-09 17:07:32 +09:00
minggo
c5b113c35e
Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements
...
Fileutils perf improvements
2013-09-08 19:50:12 -07:00
boyu0
1d47737f45
issue #2771 : add physics files and entries.
2013-09-09 10:29:02 +08:00
samuele3hu
357466bab2
issue #2768:Add Armature lua binding and releated test samples
2013-09-09 10:20:32 +08:00
James Chen
ba9fdc5774
Reverts samples/Cpp/HelloCpp/proj.win32/main.cpp
2013-09-08 11:30:50 +08:00
James Chen
b8c82ae5a9
[develop] Warning fixes.
2013-09-08 11:26:38 +08:00
Ricardo Quesada
8078a574c2
snapshopTextures are no longer supported
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-09-06 22:55:36 -07:00
Ricardo Quesada
b2a81b5b86
Removes some Hungarion notation...
...
...and improves performance in FileUtils: String is not created
2013-09-06 18:46:33 -07:00
Ricardo Quesada
b78382d5e5
Performance improvements in FileUtils / TextureCache
...
Added common "apple" platform to avoid duplicate files in FileUtils and other common files
Improves performance in fetching files.
2013-09-06 15:33:28 -07:00
minggo
76a1b36191
Merge pull request #3546 from minggo/alloc_perf_test
...
Alloc perf test
2013-09-05 23:30:15 -07:00
minggo
8e0bce344c
Merge branch 'alloc_perf_test' of https://github.com/minggo/cocos2d-x into alloc_perf_test
2013-09-06 13:45:59 +08:00
minggo
d723c4ef3f
Merge branch 'alloc_perf_test' of https://github.com/ricardoquesada/cocos2d-x into alloc_perf_test
2013-09-06 13:45:23 +08:00
minggo
1664d3503d
add PerformanceAllocTest.cpp/h to vs project and fix some compiling errors
2013-09-06 12:51:37 +08:00
Ricardo Quesada
1071ab9d37
Adds a new test: sprite with image
2013-09-05 21:35:15 -07:00
minggo
0131ecf705
add PerformanceAllocTest.cpp/h to Android.mk and linux project setting
2013-09-06 11:44:10 +08:00
Ricardo Quesada
02500372ed
Adds new perf test: alloc / dealloc
2013-09-05 20:02:04 -07:00
minggo
249b4d79a3
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
...
Iss2460 glfw refractor
2013-09-05 18:28:31 -07:00
samuele3hu
32d056df18
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView
2013-09-04 14:03:21 +08:00
samuele3hu
6815e01f84
issue #2764:Add TableView lua binding and releated test sample
2013-09-04 14:02:22 +08:00
minggo
9dedb072e6
Merge pull request #3528 from natural-law/ForPlugin
...
Modify the method cocos_android_app_init()
2013-09-03 22:50:40 -07:00
Ricardo Quesada
befcf722b6
compiles Linux / Windows
2013-09-03 10:17:25 -07:00
Ricardo Quesada
088a11ad0d
Little performance improvements in SpriteBatchNode
...
_descendants: Array -> std::vector<Sprite*> since retain/release is no needed
Code is cleaner
Removes unused method (bug inherited from cocos2d-iphone)
Adds more doxygen strings
2013-09-02 16:44:25 -07:00
zhangbin
b854c25103
Add parameter in method cocos_android_app_init() to initialize plugin.
2013-09-02 16:10:08 +08:00
Huabing.Xu
bc5ae78423
issue #2460 : change other sample projects to glfw version
2013-09-02 11:46:23 +08:00
Ricardo Quesada
be0c8cb1e8
adds two more perf tests
...
Node::addChild and Node::removeChild
2013-08-31 17:08:51 -07:00
Ricardo Quesada
0d96a0ce40
resets random seed before each test
2013-08-31 15:49:25 -07:00
Ricardo Quesada
a5e0febc3e
Adds better names to test
...
And new values for get(),add(),remove(),sort(),reorder()
2013-08-31 07:27:56 -07:00
Ricardo Quesada
5abb57e5f2
AddChild test fix
...
`sortAllChildren` should not be part of the test.
It is tested separatedly on another test
2013-08-31 06:59:44 -07:00
samuele3hu
5ee2a7e58e
issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator
2013-08-30 17:15:16 +08:00
samuele3hu
8f338cc209
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-08-30 15:21:59 +08:00
samuele3hu
f184d7cd8f
issue #2433:Replace ccDraw** in DrawPrimitives with draw**
2013-08-30 15:06:00 +08:00
samuele3hu
f56c6f7087
issue #2433:Modify platform config and some test samples
2013-08-30 11:56:35 +08:00
Huabing.Xu
99f88df8d2
issue #2460 : optimize EGLView interface
2013-08-29 11:36:16 +08:00
Ricardo Quesada
c04409b6d5
More accurate test
...
Name is recalculated. No time is "wasted" in calculating it.
And `Visit` test uses `Node` objects instead of `Sprite`s. So `draw` is not taken into account, just the visit.
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 18:32:45 -07:00
Ricardo Quesada
eff8f4307f
Project is Xcode 5 friendly
...
Adds defaults for provisioning profile. Needed for iOS on Xcode 5
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 12:43:50 -07:00
Ricardo Quesada
7fb56bd123
Adds "Visit Scene Graph" tests
...
A new tests to measure the performance of visit
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 12:39:57 -07:00
samuele3hu
1dabab2ca5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
2013-08-28 15:35:33 +08:00
James Chen
a8140dd31b
Adding test for issue http://www.cocos2d-x.org/issues/2401 .
2013-08-28 15:12:41 +08:00
samuele3hu
9e071afe09
issue #2433:Add more deprecated function and modify some test
2013-08-28 15:11:19 +08:00
James Chen
b235bf07b7
[Mac] Adding WebsocketTest and SocketIOTest.
2013-08-28 15:02:57 +08:00
Huabing.Xu
e935481361
Merge branch 'develop' into Iss2460-glfw-refractor
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/platform/mac/CCEGLView.mm
samples/Cpp/TestCpp/proj.linux/main.cpp
samples/Cpp/TestCpp/proj.win32/main.cpp
2013-08-28 13:42:22 +08:00
Huabing.Xu
29746d513a
issue #2640 : glfw linux version
2013-08-28 12:00:06 +08:00
James Chen
08cd81ff43
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated
...
Conflicts:
scripting/auto-generated
2013-08-27 16:59:59 +08:00
James Chen
a7f4e82799
issue #2732 : Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files.
2013-08-27 16:46:31 +08:00
James Chen
7552a72577
issue #2732 : [iOS] Updating the reference of auto-generated binding glue codes.
2013-08-27 16:05:48 +08:00
minggo
faa94fd074
Merge pull request #3482 from minggo/release_unneeded_codes
...
Remove unneeded codes
2013-08-26 23:23:41 -07:00
minggo
c4a97cdfa1
Merge pull request #3485 from ricardoquesada/perf_and_bug_fixes
...
Perf and bug fixes
2013-08-26 23:22:33 -07:00
James Chen
213b7aea21
Merge pull request #3453 from samuele3hu/iss2433-lua-bindings-generator
...
issue #2433 : Add lua bindings generator and modify releated test samples
2013-08-26 23:09:56 -07:00
Ricardo Quesada
0093263c18
Little performance improvements
...
Uses `AffineTransform::IDENTITY`
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-26 18:08:21 -07:00
James Chen
6501c9bffd
Merge pull request #3479 from pyrasis/tizen_2.2
...
[Tizen] Update project files
2013-08-26 03:23:14 -07:00
minggo
e567b6c54b
fix warnings on ndk-r9
2013-08-26 18:02:51 +08:00
James Chen
c9ffc44bc4
[Android] Removing x86 from APP_ABI. Otherwise the time of compiling will be very long.
2013-08-26 16:52:20 +08:00
Ricardo Quesada
ea8eb601af
Uses std::sort()
...
Uses std::sort() for inserting the nodes.
This code is not final, but preliminary results show that std::sort() is 60% faster
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-24 10:56:07 -07:00
Lee, Jae-Hong
bbf9053788
[Tizen] Update project files.
...
- Update file list.
- change order of link files.
2013-08-25 02:22:50 +09:00
Ricardo Quesada
364288cf66
Adds "Sort all Children" perf test
...
Adds a new perf tests: "sortAllChildren"
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-23 13:14:57 -07:00
samuele3hu
6ae80bcaf0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-23 16:14:19 +08:00
samuele3hu
e557b6b7c2
issue #2433:Add lua deprecated fiel and modify some test samples
2013-08-23 16:12:59 +08:00
James Chen
2a147ec34a
Adding a new search path 'res' to TestJavascript since some resources are defined as hard code in ControlColourPicker::init().
...
bool ControlColourPicker::init()
{
if (Control::init())
{
setTouchEnabled(true);
// Cache the sprites
SpriteFrameCache::getInstance()->addSpriteFramesWithFile("extensions/CCControlColourPickerSpriteSheet.plist"); // Hard code here
// Create the sprite batch node
SpriteBatchNode *spriteSheet = SpriteBatchNode::create("extensions/CCControlColourPickerSpriteSheet.png"); // Hard code here
addChild(spriteSheet);
2013-08-23 15:55:25 +08:00
James Chen
7882ea7fbc
Merge pull request #3465 from dumganhar/develop
...
issue #2483 : Updating VS projects to use the correct library (mozjs-23.0.lib).
2013-08-22 20:28:57 -07:00
James Chen
6ed43811fe
issue #2483 : Updating VS projects to use the correct library (mozjs-23.0.lib).
2013-08-23 11:26:16 +08:00
Ricardo Quesada
055c566bc9
Adds missing #include
2013-08-22 19:30:20 -07:00
Ricardo Quesada
38bfadf7f3
Adds 2 new performance tests
...
Invocation with `for_each()` and using `arrayMakeObjectsPerformSelector`
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-22 18:21:52 -07:00
minggo
ddb4219d24
Merge pull request #3457 from boyu0/iss2434_gen_android_mk
...
closed #2434 : Add android_mk_generator.py to generate Android.mk
2013-08-22 03:05:11 -07:00
boyu0
9e34aae075
closed #2434 : Use the origin android.mk files instead use templates
2013-08-22 16:45:40 +08:00
samuele3hu
5f6d9815ca
issue #2433:Modify platform config and some test samples
2013-08-22 15:06:34 +08:00
boyu0
83f7835708
issue #2434 : Delete unused method dirs and find_files in Android.mk template
2013-08-22 14:03:25 +08:00
boyu0
ad23ec4a0f
#closed #2434 : refactor LocalVarToAuto.py to use the PathUtils and fix some errors
2013-08-22 13:40:57 +08:00
samuele3hu
3b90d0b5b6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 13:40:35 +08:00
Ricardo Quesada
d7590affda
Merge branch 'develop' into dictionary_array_fixes
...
Conflicts:
cocos2dx/cocoa/CCArray.cpp
cocos2dx/cocoa/CCArray.h
cocos2dx/label_nodes/CCLabel.cpp
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/display/CCDisplayManager.cpp
2013-08-21 21:27:44 -07:00
boyu0
da566a3c16
issue #2434 : add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
...
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
Ricardo Quesada
2e221ee6cc
Array & Dictionary fixes
...
In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't have the `init()` method creating potential leaks.
Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks.
This patch fixes all those issues.
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:12:09 -07:00
Ricardo Quesada
f0a2f6cbf8
purge profiler data one + or - is pressed
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:02:50 -07:00
minggo
2de8963a0a
fix warnings caused by deprecating some functions of Array
2013-08-22 10:45:47 +08:00
samuele3hu
3cb095f48a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 10:17:59 +08:00
samuele3hu
bea62800b4
issue #2433:Modify TestLua samples and add some manual binding code
2013-08-22 10:16:57 +08:00
Huabing.Xu
3bc5f1ed8a
issue #2460 : glfw win32 project file
2013-08-21 12:02:21 +08:00
Huabing.Xu
b2e167c6ea
issue #2460 : glfw mac version
2013-08-21 12:01:56 +08:00
Ricardo Quesada
cf02cb4581
Fixes names in Performance Node tests
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 18:05:35 -07:00
Ricardo Quesada
e5551b2872
Compiles both with std::vector and ccCArray
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 16:06:51 -07:00
Ricardo Quesada
20167e2a12
removes unneeded spaces
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:45 -07:00
Ricardo Quesada
c9b250d4a4
Adds new tests to tests
...
and enables profiling
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:32 -07:00
Huabing.Xu
2e21e18b70
issue #2460 : rename EGLView::Create to EGLView->create
2013-08-20 16:23:46 +08:00
Huabing.Xu
dd538a28a7
issue #2460 : glfw window version
2013-08-20 13:57:15 +08:00
samuele3hu
39686ea503
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-20 13:46:26 +08:00
samuele3hu
7a9f1d6804
issue #2433:Modify TestLua samples and some .ini files
2013-08-20 13:44:37 +08:00
Ricardo Quesada
511ec1cc5d
Compiles with improved CCArray
...
Compiles both with std::vector or ccCArray
2013-08-19 17:09:28 -07:00
minggo
3ca26e1aa6
Merge pull request #3430 from boyu0/iss2517_update_local_var_to_auto
...
closed #2517 : Update all test cases use auto for local variables
2013-08-17 01:12:48 -07:00
minggo
c7f313419e
Merge pull request #3431 from minggo/iss2525-add_iterator_for_array
...
add iterator for Array and make Array can be used in range-based loop
2013-08-17 00:42:42 -07:00
folecr
aff86b1b52
Keep TravisCI happy : build Android TestCpp for ARM architecture only.
2013-08-16 16:19:34 -07:00
minggo
baa9e0a1e4
issue #2525:add iterator for Array and make Array can be used in range-based loop
2013-08-16 18:23:41 +08:00
성낙호
200a1ec831
style edited
2013-08-16 19:03:27 +09:00
boyu0
6779f494f3
issue #2517 : Restore TestCpp proj.android that edited by mistake.
2013-08-16 16:09:46 +08:00
boyu0
70df1a6061
closed #2517 : Use LocalVarToAuto.py to change Samples src file
2013-08-16 16:05:27 +08:00
godyZ
424b4140a2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode
2013-08-16 11:14:47 +08:00
godyZ
e8809b2b15
issue #2533:add ATITC compressed texture support
...
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
2013-08-16 11:02:44 +08:00
samuele3hu
c8b75a1080
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-16 10:13:38 +08:00
samuele3hu
de3335a4a9
issue #2433:Update lua manual binding and modify some samples
2013-08-16 10:12:46 +08:00
James Chen
9ab671fb03
Merge pull request #3425 from dumganhar/iss2488-new-label-sample
...
Iss2488: Merge PR https://github.com/cocos2d/cocos2d-x/pull/3422
2013-08-15 07:16:48 -07:00
James Chen
4b0d0225b7
issue #2488 : Updating makefile for linux and emscripten.
2013-08-15 21:44:51 +08:00
James Chen
409e345522
issue #2488 : Updating VS project configuration.
2013-08-15 21:40:11 +08:00
James Chen
56cd039b32
issue #2488 : Adding "啊" letter at the end of string to make VS2012 happy, otherwise VS will generate errors like "Error 3 error C2146: syntax error : missing ')' before identifier 'label'";
2013-08-15 21:39:47 +08:00
James Chen
9dbd74d2a8
Merge pull request #3413 from dumganhar/iss2521-js-ccb-owner
...
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
2013-08-15 04:19:17 -07:00
James Chen
21134cc48f
Merge branch 'new_develop_merge_clean' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge_clean
2013-08-15 17:02:51 +08:00
samuele3hu
7f8099ce69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
tools/bindings-generator
2013-08-15 16:21:32 +08:00
samuele3hu
f29525bbc6
issue #2433:Modify Testlua sample and add some manual binding functions
2013-08-15 15:51:22 +08:00
samuele3hu
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
folecr
b4edb14d33
Use ndk-gdb-py and name the explicit launch activity to be able to use gdb's Text User Interface when debugging.
2013-08-13 15:50:58 -07:00
folecr
4d34cfc28f
Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore
2013-08-13 11:29:53 -07:00
folecr
84054a237c
Android platform version used matches all other sample projects
2013-08-13 11:28:56 -07:00
carlo morgantini
47be4ff58a
Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean
...
Conflicts:
cocos2dx/label_nodes/CCFontAtlas.cpp
cocos2dx/label_nodes/CCFontAtlas.h
cocos2dx/label_nodes/CCFontAtlasCache.cpp
cocos2dx/label_nodes/CCFontAtlasFactory.cpp
cocos2dx/label_nodes/CCFontAtlasFactory.h
cocos2dx/label_nodes/CCFontDefinition.cpp
cocos2dx/label_nodes/CCFontFreeType.cpp
cocos2dx/label_nodes/CCLabel.cpp
cocos2dx/label_nodes/CCLabel.h
cocos2dx/label_nodes/CCStringBMFont.h
cocos2dx/label_nodes/CCStringTTF.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-08-13 11:28:54 -07:00
carlo morgantini
15ec303278
more clean ups on tests for label
2013-08-13 10:12:02 -07:00
folecr
b61ce3c79d
ndkgdb.sh for TestCpp
2013-08-13 08:47:48 -07:00
folecr
17c7b7cbcf
APP_OPTIM is debug
2013-08-13 08:47:48 -07:00
folecr
652920eaac
set android:debuggable property to true
2013-08-13 08:47:48 -07:00
folecr
75f7af00a6
TestCpp builds both ARM and x86 versions
2013-08-13 08:47:48 -07:00
folecr
cd0f1beaf4
fix evaluation of properties array read from local.properties
2013-08-13 08:47:48 -07:00
folecr
ef7c3b2b09
Remove unused option in build script
2013-08-13 08:47:48 -07:00
carlo morgantini
35b5e30190
alignment added to new label creation
2013-08-12 15:41:29 -07:00
carlo morgantini
d15d84c05f
samples cleaned up
2013-08-12 15:09:28 -07:00
carlo morgantini
097a5c488a
New Label tests plus bug fixing
2013-08-12 13:29:54 -07:00
James Chen
9cf3bf64d5
issue #2521 : Updating JS-Test.
2013-08-12 11:31:54 +08:00
James Chen
12ffdfc4fd
issue #2521 : TestJavascript needs ccbreader support.
2013-08-12 11:21:31 +08:00
Lee, Jae-Hong
66593ae4bf
[Tizen] Update project files
...
- include stdint.h
- set etc, s3tc header path
- exclude CCImageCommonWebp.cpp, include etc, s3tc directories.
- update project files.
2013-08-10 23:11:31 +09:00