boyu0
|
a8ddca81bd
|
issue #2771: fix some compile error in win32
|
2013-10-23 18:52:09 +08:00 |
minggo
|
914269b4bd
|
Merge pull request #4001 from minggo/iss2905-adjust_folder
issue #2905:ndk-r8e build ok now
|
2013-10-23 02:47:05 -07: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 |
Dhilan007
|
dfd69d262a
|
adjust std:function support 10 parameter
|
2013-10-23 16:48:51 +08:00 |
ondesly
|
969b464b9b
|
android & ios screen size change support
|
2013-10-23 12:29:59 +04: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
|
abcf8f268d
|
fix conflicts
|
2013-10-22 18:36:13 +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 |
James Chen
|
feee6ca84b
|
Merge pull request #3978 from HoGarfield/cc.RESOLUTION_POLICY
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
|
2013-10-22 01:34:44 -07:00 |
James Chen
|
59b5c26abf
|
Merge pull request #3991 from HoGarfield/AnimationManager
closed #3040: Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
|
2013-10-22 01:30:06 -07:00 |
samuelhu
|
be1f17ca0f
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-22 16:14:49 +08:00 |
minggo
|
d968ef6949
|
Merge pull request #3990 from Dhilan007/di2905
issues #2905:add miss file
|
2013-10-22 00:58:34 -07:00 |
garfield_ho
|
0002815acb
|
Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
|
2013-10-22 15:56:35 +08:00 |
Dhilan007
|
31a2217178
|
issues #2905:add miss file
|
2013-10-22 15:56:08 +08:00 |
garfield_ho
|
55d45081f6
|
Fixed name
|
2013-10-22 15:41:43 +08:00 |
James Chen
|
74b514c299
|
Merge pull request #3979 from HoGarfield/AutoPlay-Animation
closed #3033: CCBReader can't play sequence automatically in JSB.
|
2013-10-22 00:30:47 -07:00 |
minggo
|
d07fbb8903
|
Merge pull request #3974 from boyu0/iss2771_physical
issue 2771: physical
|
2013-10-21 22:44:22 -07:00 |
boyu0
|
e99b80b304
|
issue #2771: implements rayCast and rectQuery
|
2013-10-21 23:16:21 +08:00 |
Dhilan007
|
232f0d598b
|
issues #2905:add new vs project
|
2013-10-21 22:21:11 +08:00 |
Dhilan007
|
f11dba586a
|
issue #2905:modification vs-project for folder structure change
|
2013-10-21 22:09:21 +08:00 |
garfield_ho
|
464d1598d2
|
fixed bug of CCBReader that can not autoplaySequence
|
2013-10-19 16:48:57 +08:00 |
garfield_ho
|
54ac8f3537
|
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
|
2013-10-19 16:44:14 +08:00 |
boyu0
|
5741a16620
|
issue #2771: edit some include head file path
|
2013-10-18 17:47:29 +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 |
Dhilan007
|
6ce34288e0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-18 15:53:26 +08:00 |
minggo
|
5f65cdc3c0
|
fix xcode compiling error and simplify android.mk
|
2013-10-18 15:39:09 +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
|
86384b0df1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-18 12:36:18 +08:00 |
dualface
|
8f2f524f2d
|
fix tolua_fix, cleanup peertable after object deleted
|
2013-10-18 11:30:28 +08:00 |
James Chen
|
39afa3b8df
|
Merge pull request #3967 from dumganhar/change-url
Changing the submodule URL for 'auto-generated'.
|
2013-10-17 19:00:36 -07:00 |
James Chen
|
8c0d7e151c
|
Updating the submodule reference of 'auto-generated'.
|
2013-10-18 10:02:47 +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 |
James Chen
|
fd0e84bfa2
|
Merge pull request #3963 from kpkhxlgy0/use
closed #2994: Can't click the area that outside of keyboard to close keyboard when using EditBox
|
2013-10-17 00:36:33 -07:00 |
minggo
|
e50f9fc43b
|
issue #2905: jsbinding samples and lua binding samples build ok on android
|
2013-10-17 15:04:30 +08:00 |
XiaoLongHan
|
a2de02cc19
|
Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard.
|
2013-10-17 14:21:55 +08: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 |
Dhilan007
|
a91621ae5a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-16 17:51:02 +08:00 |
James Chen
|
afe2b8e0c1
|
Update auto-generated submodule manually.
|
2013-10-16 17:37:34 +08:00 |
Dhilan007
|
c6344875de
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-10-16 17:30:51 +08:00 |
James Chen
|
d283c66803
|
Merge pull request #3955 from dumganhar/iss2905-folder-structure
issue #2905: [iOS Mac] HelloLua and TestLua work now.
|
2013-10-16 02:17:43 -07:00 |
James Chen
|
225738ecc5
|
issue #2905: [iOS Mac] HelloLua and TestLua work now.
|
2013-10-16 17:19:02 +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
|
352d1f6768
|
issue #2905: Renaming lua/cocos2dx_support to lua/bindings.
|
2013-10-16 16:40:07 +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
|
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
|
410280a8d3
|
Merge pull request #3945 from minggo/iss2905-adjust_folder
issue #2905: testcpp bild ok on Android
|
2013-10-15 03:02:12 -07:00 |
minggo
|
6fc2be62f5
|
issue #2905: testcpp bild ok on Android
|
2013-10-15 18:00:03 +08:00 |
Dhilan007
|
2865ad798b
|
issues #2905:Updating project configuration for folder change.
|
2013-10-15 10:18:37 +08:00 |
James Chen
|
438fe70287
|
issue #2905: [iOS, Mac] HelloCpp works now.
|
2013-10-14 15:53:14 +08:00 |
minggo
|
92e0dbe0c1
|
issue #2905:add ccUtils.cpp
|
2013-10-14 14:56:57 +08:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
1751cc3d89
|
Merge pull request #3935 from minggo/remove-subfolder
issue #2905: remove sub folders except platform
|
2013-10-13 18:40:02 -07:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |
minggo
|
5182a3c978
|
Merge pull request #3933 from minggo/iss2905-adjust_folder
adjust folder structure
|
2013-10-12 00:27:48 -07:00 |
minggo
|
8eeb911e8f
|
issue #2905: adjust folder structure
|
2013-10-12 15:25:45 +08:00 |
James Chen
|
f6275667bf
|
Removing unused ios projects.
|
2013-10-12 15:02:28 +08:00 |
James Chen
|
7de6646213
|
Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder.
|
2013-10-12 14:56:40 +08:00 |
minggo
|
19ee87e29a
|
issue #2905: step2 Box2D -> box2d
|
2013-10-12 14:03:04 +08:00 |
minggo
|
1f38636e84
|
issue #2905: step1 Box2D -> box2d
|
2013-10-12 14:02:13 +08:00 |
minggo
|
5acbe663e0
|
issue #2905: add missing files
|
2013-10-12 13:44:57 +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 |