James Chen
|
b2cebebbaf
|
issue #4129: Remove unused references in Xcode project.
|
2014-02-28 15:40:03 +08:00 |
James Chen
|
801e981286
|
issue #4116: Updates iOS / Mac projects.
|
2014-02-26 22:27:38 +08:00 |
James Chen
|
e4837e7f94
|
issue #4116: Removes script-bindings codes.
|
2014-02-26 21:34:06 +08:00 |
samuele3hu
|
a765178a5f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
|
2014-02-24 09:38:08 +08:00 |
James Chen
|
c5bf3950bc
|
closed #4107: Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm).
|
2014-02-21 11:55:37 +08:00 |
samuele3hu
|
555ef20202
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic
Conflicts:
cocos/scripting/lua/bindings/LuaBasicConversions.h
cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
|
2014-02-21 10:10:20 +08:00 |
samuele3hu
|
3532665520
|
issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object
|
2014-02-21 09:45:33 +08:00 |
James Chen
|
0d8846d876
|
closed #4097: Adds a macro to disable inserting script binding relevant codes.
|
2014-02-20 16:40:46 +08:00 |
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
andyque
|
f16b0022a3
|
move CCActionEaseEx content to CCActionEase
|
2014-02-18 14:22:13 +08:00 |
andyque
|
895b2a0055
|
move CCActionEaseEx and CCTweenFunction to core engine
|
2014-02-18 14:22:12 +08:00 |
James Chen
|
297fe597e1
|
Updates mac / iOS project.
|
2014-02-18 11:08:27 +08:00 |
James Chen
|
9d764718f9
|
issue #4037: Removes unused files from Xcode setting.
|
2014-02-14 10:26:27 +08:00 |
James Chen
|
acefa4e237
|
Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343
|
2014-02-14 09:33:42 +08:00 |
James Chen
|
fb4699359d
|
Merge pull request #5326 from Dhilan007/develop_label
issue #3821: Moving platform-dependent codes of LabelTTF from cocos2d::Image to cocos2d::Device.
|
2014-02-14 09:24:11 +08:00 |
Dhilan007
|
0d5c702708
|
move labelttf's platform-dependent code from CCImage to CCDevice
|
2014-02-13 21:08:43 +08:00 |
heliclei
|
1154c28516
|
share xcode build schemes to support xcodebuild command line build
|
2014-02-13 18:11:24 +08:00 |
ucchen
|
2c961bdfbf
|
add spine manual binding;
|
2014-02-13 11:01:54 +08:00 |
Ricardo Quesada
|
1836375468
|
schemes are no longer shared
|
2014-02-12 08:26:22 +08:00 |
Ricardo Quesada
|
24f655f9b1
|
Better 'vertices drawn'
|
2014-02-09 19:31:45 -08:00 |
Ricardo Quesada
|
616feadda1
|
More fixes and "tiles" is an uint32 (GID)
|
2014-02-07 18:11:17 -08:00 |
Ricardo Quesada
|
9a53f5a9f5
|
Testing a new TMX renderer
faster
|
2014-02-04 17:59:21 -08:00 |
Ricardo Quesada
|
5691829b72
|
Linux with #ifdef
|
2014-01-30 17:10:18 -08:00 |
Ricardo Quesada
|
7da8c84a75
|
Renames EGLView -> GLView
|
2014-01-30 16:51:43 -08:00 |
Ricardo Quesada
|
862500f99a
|
Renames EGLView -> GLView
|
2014-01-30 15:40:56 -08:00 |
Ricardo Quesada
|
b96c4f1ad0
|
Only compile iOS files on iOS
|
2014-01-27 16:44:10 -08:00 |
Ricardo Quesada
|
efaec7b7ec
|
Merge branch 'develop' into glview_improvements
Conflicts:
samples/Lua/HelloLua/Classes/AppDelegate.cpp
template/multi-platform-lua/Classes/AppDelegate.cpp
|
2014-01-27 10:52:35 -08:00 |
James Chen
|
5b9f1697d3
|
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode.
|
2014-01-26 11:16:25 +08:00 |
samuele3hu
|
58eab72d26
|
issue:Add luasocket's support for lua
|
2014-01-24 17:24:10 +08:00 |
Ricardo Quesada
|
8ecaf49f93
|
GLView improvements
it is not longer a singleton
it is possible to specify the size
|
2014-01-23 15:36:55 -08:00 |
Ricardo Quesada
|
83f16e25e3
|
merge from develop
|
2014-01-22 11:44:48 -08:00 |
Ricardo Quesada
|
1113587f47
|
mac/CCEGLView moved to desktop/
|
2014-01-21 17:52:30 -08:00 |
Ricardo Quesada
|
06be466f29
|
Removed unused code and files.
Making the mac platform easier to mantain
|
2014-01-21 16:25:29 -08:00 |
Ricardo Quesada
|
98d23d30a6
|
First step in simplifying the mac platform
|
2014-01-21 15:44:01 -08:00 |
Dhilan007
|
9f9e289f8c
|
update xcode project.
|
2014-01-20 11:30:35 +08:00 |
Ricardo Quesada
|
5fcbf42356
|
GlobalZOrder is used for render priority...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
|
2014-01-18 11:38:06 -08:00 |
James Chen
|
d309ae76d0
|
issue #3628: Adds missing files for iOS and Mac.
|
2014-01-17 11:13:40 +08:00 |
Ricardo Quesada
|
65602a4574
|
Updates Xcode, Android and Linux project
with new BatchCommand
|
2014-01-15 16:06:47 -08:00 |
James Chen
|
f5ae2bbacc
|
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
issue #3401: physical lua binding
|
2014-01-06 23:48:47 -08:00 |
boyu0
|
cf146b32cf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2014-01-07 10:16:44 +08:00 |
Ricardo Quesada
|
d15768d630
|
Removes RELASE_NOTES
|
2014-01-06 16:28:24 -08:00 |
chengstory
|
b4118a7ccc
|
fixed #3582
1. add #include "cocostudio/CCComBase.h" into CocoStudio.h
|
2014-01-05 03:55:10 +08:00 |
chengstory
|
aae6d27c74
|
fixed #3582
1. revert ComRender::create(cocos2d::Node *node, const char *comName).
|
2014-01-05 03:11:32 +08:00 |
chengstory
|
bac600ab9f
|
fixed #3582
1. create Component By component Factory.
|
2014-01-05 02:22:32 +08:00 |
samuele3hu
|
07a3efb585
|
Update the lua test cases about the GUI
|
2014-01-03 10:39:19 +08:00 |
boyu0
|
0a06d93328
|
issue #3401: physical lua banding script and auto script
|
2014-01-02 11:45:11 +08:00 |
CaiWenzhi
|
81bdfac795
|
Modify class name Label LabelBMFont LabelAtlas
|
2013-12-31 16:36:33 +08:00 |
chengstory
|
8ae7ecff33
|
Merge branch 'develop' into #3457
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSGUIReader.h
|
2013-12-26 12:55:52 +08:00 |
CaiWenzhi
|
96279c12dc
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 18:32:15 +08:00 |
yinkaile
|
d72c9d94d7
|
upload trigger code.
|
2013-12-25 17:40:54 +08:00 |