James Chen
|
06bc92ff19
|
[dispatcher] Removing unused listeners after dispatching event.
|
2013-09-12 20:45:35 +08:00 |
James Chen
|
fb12c90238
|
[dispatcher] Using temporary std::vector in handleTouchXXXX.
|
2013-09-12 20:43:09 +08:00 |
James Chen
|
ea74c30895
|
[Dispatcher] Updating ios/CCDevice.mm.
|
2013-09-12 20:41:59 +08:00 |
James Chen
|
24c8438fa6
|
[Dispatcher] Updating Android.mk, and some refractor.
|
2013-09-12 17:31:37 +08:00 |
James Chen
|
f6faf58f2e
|
[Dispatcher] Updating Log message in CCAccelerationEventListener.cpp.
|
2013-09-12 16:03:30 +08:00 |
James Chen
|
6a2536b5bd
|
[Dispatcher] Fixing logic errors in CCScrollView after using EventDispatcher.
|
2013-09-12 16:03:03 +08:00 |
James Chen
|
b77cac8731
|
[Dispatcher] Fixing touch bindings for JSB.
|
2013-09-12 16:02:16 +08:00 |
James Chen
|
891bcba459
|
[Dispatcher] Reverting Touch, it should be inherited from Object for JSB.
|
2013-09-12 16:01:49 +08:00 |
James Chen
|
1c7287dd59
|
[Dispatcher] Updating license of CCEventListener.cpp.
|
2013-09-12 16:01:14 +08:00 |
James Chen
|
ce52997fc2
|
[Dispatcher] Updating tools/tojs/.ini
|
2013-09-12 15:34:14 +08:00 |
James Chen
|
5d95711865
|
[EventDispatcher] Fixing compilation error after changing of Touch(It doesn't inherit from Object).
|
2013-09-12 14:42:56 +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 |
James Chen
|
7071240e30
|
[EventDispatcher] Remove unused file(CCTouchDispatcher) reference in CCEGLView.mm.
|
2013-09-12 14:24:30 +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 |
Bruno Assarisse
|
636c3d1dfc
|
TMX map polyline parse
|
2013-09-11 20:36:53 -03:00 |
Siim Kallas
|
4e1e69e873
|
Fixed compilation on VC12 (VS2013 RC), std::min and std::max require <algorithm>
|
2013-09-11 19:00:48 +03:00 |
James Chen
|
b798535f14
|
[win32] Removing CCAccelerometer.cpp.
|
2013-09-11 22:31:17 +08:00 |
James Chen
|
da1101beeb
|
[Dispatcher] New event dispatcher, first commit.
|
2013-09-11 22:09:34 +08:00 |
James Chen
|
a0db624e66
|
Merge pull request #3576 from CocosRobot/updategeneratedsubmodule_1378893493
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
|
2013-09-11 02:58:54 -07:00 |
CocosRobot
|
a812aa9cb2
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-11 09:58:16 +00:00 |
James Chen
|
2603e4acf4
|
Merge pull request #3540 from samuele3hu/TableView
issue #2764:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
|
2013-09-11 02:52:38 -07: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 |
minggo
|
c07556fdfb
|
Merge pull request #3570 from chengstory/#4551
#4551
|
2013-09-10 01:55:52 -07: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
|
7e3b262c62
|
Merge pull request #3569 from CocosRobot/updategeneratedsubmodule_1378778871
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-09 22:59:16 -07: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 |
chengstory
|
9bf6ab1e16
|
1. fixes error of 34 line in android.mk.
|
2013-09-10 11:50:08 +08:00 |
chengstory
|
8b509c456f
|
1. add shadernode.cpp to linux, nacl mk files.
|
2013-09-10 11:47:02 +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
|
100228b4ae
|
1. fixes failed to build on linux.
|
2013-09-10 11:21:18 +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 |
CocosRobot
|
54c5e63916
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-09-10 02:07:54 +00:00 |
minggo
|
410125feba
|
[skip ci]
|
2013-09-10 10:06:06 +08:00 |
minggo
|
2a5c3ff7e4
|
Merge pull request #3548 from nakosung/multi_assets
exposed AssetsManager to javascript and added multiple-assetsManager support
|
2013-09-09 19:01:53 -07: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 |
zhangcheng
|
1115d0d3f9
|
1. merge scenereader Armature merge to cocos2dx 3.0.
|
2013-09-09 19:51:26 +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 |
Huabing.Xu
|
5c3809b98c
|
add fragment shaders
|
2013-09-09 17:48:34 +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 |