CaiWenzhi
|
8b7a5c3141
|
Add RichText sample
|
2014-03-06 20:52:29 +08:00 |
CaiWenzhi
|
5e84c15812
|
Add RichText
|
2014-03-05 23:03:49 +08:00 |
CaiWenzhi
|
ad85d2c800
|
Merge branch 'develop' into develop_nutty_modify_framework_for315
|
2014-03-05 21:20:26 +08:00 |
CaiWenzhi
|
4f9dfdbef8
|
Fixed build error except Windows
|
2014-03-05 21:18:51 +08:00 |
minggo
|
db4d163806
|
update android build script since it only has testcpp now
|
2014-03-05 20:36:37 +08:00 |
CaiWenzhi
|
7a4ba91f29
|
Modify project file
|
2014-03-05 17:08:59 +08:00 |
CaiWenzhi
|
ab47cafb31
|
Merge branch 'develop' into develop_nutty_modify_framework_for315
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/gui/UIButton.cpp
cocos/gui/UIButton.h
cocos/gui/UIWidget.h
|
2014-03-05 16:52:31 +08:00 |
Ricardo Quesada
|
4fe3b16287
|
Updates to latest version of kazmath
|
2014-03-04 16:33:00 -08:00 |
CaiWenzhi
|
4a2dc4a607
|
Add custom widget and reader
|
2014-03-04 16:51:35 +08:00 |
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
|
450d30b164
|
Merge pull request #5040 from martell/mingwclang
closed #3809: Added clang support for Windows
|
2014-02-20 20:24:36 +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 |
Dhilan007
|
dfc6522f5c
|
update XCode project for add miss file on Mac and IOS.
|
2014-02-19 17:11:28 +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
|
78163e604e
|
Merge pull request #5358 from dumganhar/merge5343
closed #4037:Exposed the missing data structures of Spine to JS
|
2014-02-14 11:17:38 +08:00 |
James Chen
|
a5aa547c7b
|
Merge pull request #5316 from natural-law/ScenarioTest
closed #3738: Add performance test case on game scenario.
|
2014-02-14 11:12:01 +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 |
James Chen
|
c8ec90781c
|
Merge pull request #5351 from heliclei/xcode-scheme
share xcode build schemes to support xcodebuild command line build
|
2014-02-14 09:09:07 +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 |
James Chen
|
a255478127
|
[Linux] Installs libssl-dev package.
|
2014-02-13 10:08:03 +08:00 |
Éloi Rivard
|
79e3c05ef1
|
Minor debugging messages and guards.
Dependencies installation is skipped on linux distributions that does not use .deb package format.
|
2014-02-13 01:25:23 +01:00 |
Éloi Rivard
|
3fb2b61591
|
Linux local storage support. Depends on libsqlite3-dev
|
2014-02-13 00:53:51 +01:00 |
Ricardo Quesada
|
1836375468
|
schemes are no longer shared
|
2014-02-12 08:26:22 +08:00 |
zhangbin
|
89cc82c332
|
Merge branch 'develop' into ScenarioTest
|
2014-02-10 14:26:31 +08:00 |
zhangbin
|
926f84d385
|
issue #3738, Add game scenario performance test case.
|
2014-02-10 11:42:15 +08:00 |
Ricardo Quesada
|
24f655f9b1
|
Better 'vertices drawn'
|
2014-02-09 19:31:45 -08:00 |
Ricardo Quesada
|
ceba63db8b
|
Merge branch 'develop' into fast_tmx
|
2014-02-08 09:08:33 -08:00 |
Ricardo Quesada
|
616feadda1
|
More fixes and "tiles" is an uint32 (GID)
|
2014-02-07 18:11:17 -08:00 |
heliclei
|
e081ea2dc4
|
add xcode shared schemes
|
2014-02-07 14:46:36 +08:00 |
Ricardo Quesada
|
9a53f5a9f5
|
Testing a new TMX renderer
faster
|
2014-02-04 17:59:21 -08:00 |
James Chen
|
bed6777673
|
issue #3828: Don't package Test_info.plist for `TestJavascript Mac` target.
|
2014-02-01 12:20:38 +08:00 |
James Chen
|
a4e7d2b658
|
issue #3828: Icon resources should be packaged. Only XXX_info.plist should not be packaged. If it was packaged, it would cause problem of running on simulator.
|
2014-02-01 12:18:22 +08:00 |
James Chen
|
d0a44cd57e
|
issue #3828: Don't copy resources in test-xxx/proj.ios(mac)/xxx.png(.plist) in project configuration. This will fix the issue that application installed to iOS simulator can't be launched.
|
2014-02-01 11:55:46 +08:00 |
Ricardo Quesada
|
e77d22a58f
|
samples -> tests
|
2014-01-31 14:09:28 -08:00 |
Ricardo Quesada
|
5fde81d1e2
|
cocos2d-samples -> cocos2d-tests
|
2014-01-31 11:13:48 -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 |