yinkaile
|
ba809a0096
|
change const char* to const std::string&
|
2013-12-23 14:05:46 +08:00 |
James Chen
|
7c6b4f2838
|
Merge pull request #4597 from CocosRobot/updategeneratedsubmodule_1387777977
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-22 22:00:44 -08:00 |
CocosRobot
|
9901703f4a
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-23 05:52:59 +00:00 |
James Chen
|
f9c45f89ac
|
Merge branch 'data-refactor' of https://github.com/dumganhar/cocos2d-x into data-refactor
|
2013-12-23 13:52:42 +08:00 |
James Chen
|
2fec81fcae
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-12-23 13:52:15 +08:00 |
James Chen
|
71966d8ca9
|
Merge pull request #4593 from samuele3hu/NewEventDispatcher
issue #3403:Add the EventDispatcher lua binding and the releated test cases
|
2013-12-22 21:46:12 -08:00 |
James Chen
|
4ed988b8c5
|
Fixes linux build failure.
|
2013-12-23 13:45:31 +08:00 |
James Chen
|
aeafe06d7f
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
|
2013-12-23 11:57:29 +08:00 |
James Chen
|
11423b5851
|
Changes the type of FontFreeType::_ttfData from `unsigned char*` to `Data`, makes codes more elegant.
|
2013-12-23 11:53:39 +08:00 |
James Chen
|
366c4ca9fb
|
Updates tools/tojs(tolua)/cocos2dx.ini.
|
2013-12-23 11:48:22 +08:00 |
James Chen
|
ca082080b5
|
Binds FileUtils::getStringFromFile automatically since we have added this method.
|
2013-12-23 11:47:56 +08:00 |
samuele3hu
|
9128960c13
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-23 11:22:41 +08:00 |
samuele3hu
|
f0dc7f0b15
|
issue #3403:Modify the registerScriptHandler functions inputparams and some EventData struct info
|
2013-12-23 11:19:55 +08:00 |
boyu0
|
1072711a4c
|
issue #2050: use static_cast
|
2013-12-23 10:46:35 +08:00 |
boyu0
|
baf8cb06c5
|
issue #2050: delete max/minGID, fix firstGID bug
|
2013-12-23 10:37:46 +08:00 |
James Chen
|
c9b4cad6bf
|
Merge pull request #4594 from dumganhar/remove-cccamera
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583).
|
2013-12-22 18:17:12 -08:00 |
James Chen
|
0a2490333b
|
Compilation fix after this PR (https://github.com/cocos2d/cocos2d-x/pull/4583).
|
2013-12-23 10:03:36 +08:00 |
minggo
|
b5976b1a51
|
Merge pull request #4592 from Dhilan007/android_build_script
support generate APK by script in template project and unify help messag...
|
2013-12-22 17:48:05 -08:00 |
samuele3hu
|
7daace0b2a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-23 09:43:05 +08:00 |
samuele3hu
|
71d5896d41
|
issue #3403:Delete Camera manual lua binding
|
2013-12-23 09:42:36 +08:00 |
minggo
|
deb681ef98
|
Merge pull request #4591 from Dhilan007/update_vsProject
update vs project for remove CCCamera.
|
2013-12-22 17:40:01 -08:00 |
yinkaile
|
87103434e3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-23 09:30:14 +08:00 |
samuele3hu
|
50bcdee725
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into NewEventDispatcher
|
2013-12-22 22:11:17 +08:00 |
samuele3hu
|
97f26176e8
|
issue #3403:Add the EventDispatcher lua binding and the releated test cases
|
2013-12-22 22:10:21 +08:00 |
Dhilan007
|
d1972b3d17
|
support generate APK by script in template project and unify help message for usage.
|
2013-12-22 17:48:35 +08:00 |
Dhilan007
|
786b7d9912
|
update vs project for remove CCCamera.
|
2013-12-22 17:19:59 +08:00 |
minggo
|
3d37a26e21
|
Merge pull request #4523 from Dhilan007/increase_test_pressure
increase label test pressure.
|
2013-12-21 17:08:20 -08:00 |
minggo
|
d353ad2853
|
Merge pull request #4590 from CocosRobot/updategeneratedsubmodule_1387658138
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-21 17:07:19 -08:00 |
CocosRobot
|
bc5fd247ac
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-21 20:35:41 +00:00 |
Ricardo Quesada
|
f0fd59f7d5
|
Merge pull request #4589 from ricardoquesada/node_get_scene
Adds getScene() to Node
|
2013-12-21 12:29:37 -08:00 |
Ricardo Quesada
|
4f435a8613
|
Adds getScene() to Node
helper function to get the Scene containing the Node
|
2013-12-21 12:28:49 -08:00 |
Ricardo Quesada
|
d35846b0d4
|
Merge pull request #4588 from ricardoquesada/events_in_director
Events in director
|
2013-12-21 10:58:43 -08:00 |
Ricardo Quesada
|
49903ea779
|
Director emits events after visit, after draw and after update. And when the projection changes
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
|
2013-12-21 10:55:16 -08:00 |
Ricardo Quesada
|
eea2e70d1e
|
Adds events in director
|
2013-12-21 00:56:28 -08:00 |
Ricardo Quesada
|
219fa29146
|
Merge pull request #4584 from CocosRobot/updategeneratedsubmodule_1387597649
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-20 19:55:17 -08:00 |
CocosRobot
|
58e25a657f
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-21 03:47:33 +00:00 |
Ricardo Quesada
|
dbb9e91799
|
Merge branch 'develop' into events_in_director
|
2013-12-20 19:45:58 -08:00 |
Ricardo Quesada
|
72d77bb035
|
removes dirty from ActionCamera
|
2013-12-20 19:45:30 -08:00 |
Ricardo Quesada
|
28739c5efe
|
Merge pull request #4583 from ricardoquesada/without_cccamaera
Removes CCCamera object
|
2013-12-20 19:40:31 -08:00 |
Ricardo Quesada
|
eadbaa3bf5
|
Adds comment to ActionCamera file
|
2013-12-20 19:37:14 -08:00 |
Ricardo Quesada
|
fd8c7e9a5d
|
Removes CCCamera
Not needed anymore.
|
2013-12-20 19:24:56 -08:00 |
Ricardo Quesada
|
b8b7714431
|
Camera is working OK in 2d projection
|
2013-12-20 19:19:24 -08:00 |
Ricardo Quesada
|
d8ad5291f4
|
Nore camera
|
2013-12-20 16:33:31 -08:00 |
Ricardo Quesada
|
f55513fa48
|
Merge pull request #4581 from ricardoquesada/node_grid_fixes
NodeGrid fixes
|
2013-12-20 11:54:40 -08:00 |
Ricardo Quesada
|
0703d974e2
|
NodeGrid fixes
Adds license
Removes unneded matrix
replaces std::for_each with for range-loop
|
2013-12-20 11:52:52 -08:00 |
James Chen
|
2a7b2c107a
|
Updates CCUserDefaultAndroid.cpp.
|
2013-12-20 21:51:53 +08:00 |
James Chen
|
b504d817b5
|
Small bug fix in CCData.
|
2013-12-20 21:41:20 +08:00 |
minggo
|
9bea08ded9
|
Merge pull request #4580 from dabingnn/develop_MotionStreak
Migrate MotionStreak to new renderer
|
2013-12-20 05:36:52 -08:00 |
Huabing.Xu
|
739cf0ce85
|
Migrate MotionStreak to new renderer
|
2013-12-20 21:21:50 +08:00 |
James Chen
|
9e05f300f3
|
[Data Refactor] compilation error fix.
|
2013-12-20 21:16:46 +08:00 |