samuelhu
|
a4d028e905
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 11:40:41 +08:00 |
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 |