Huabing.Xu
|
1670e07300
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-04-11 11:18:13 +08:00 |
James Chen
|
2fc6c0150c
|
issue #4729: iOS/Mac works fine
|
2014-04-10 00:36:41 +08:00 |
Huabing.Xu
|
1a454590e7
|
changed project file
|
2014-04-02 15:06:42 +08:00 |
samuele3hu
|
219a91a641
|
Add the omitted socket script for lua-tests
|
2014-03-29 14:58:23 +08:00 |
James Chen
|
d5e8bde89e
|
Merge pull request #5889 from samuele3hu/develop_socket
close #4400: Use the latest version of LuaSocket and modify the related project config
|
2014-03-21 10:52:38 +08:00 |
samuele3hu
|
4b25c9f62e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
|
2014-03-20 17:07:33 +08:00 |
samuele3hu
|
d3487d2d3c
|
close #4400: Use the newest version of LuaSocket for lua
|
2014-03-20 17:04:54 +08:00 |
andyque
|
91d972ba87
|
rollback the scheme mode of projects
|
2014-03-20 17:01:21 +08:00 |
andyque
|
dd790ce54d
|
add id return value to LuaObjectCBridge
|
2014-03-20 16:59:18 +08:00 |
andyque
|
7ab639ec0f
|
fix lots compile warnings
|
2014-03-20 16:24:55 +08:00 |
andyque
|
d7b3737605
|
fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings
|
2014-03-20 10:14:25 +08:00 |
boyu0
|
f23db68151
|
build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.
|
2014-03-15 01:19:06 +08:00 |
Ricardo Quesada
|
372c26b5ba
|
only active arch for DEBUG
RELEAES compiles all valid archs
|
2014-03-12 08:40:04 -07:00 |
andyque
|
2c2a5ee38e
|
rename gui to ui
|
2014-03-12 10:46:49 +08:00 |
andyque
|
d806274f98
|
change gui to ui
|
2014-03-12 10:12:02 +08:00 |
Ricardo Quesada
|
8f7fd3e13c
|
Deployment iOS >= 5.1.1 (needed for ARM64)
Adds also Valid signature = iOS Developer
|
2014-03-11 10:18:38 -07:00 |
James Chen
|
8c56b11819
|
Updates Xcode project and adds scheme for xcbuild.
|
2014-03-11 19:27:55 +08:00 |
James Chen
|
91a3ba61da
|
lua-empty-test, cpp-empty-test work for iOS/Mac
|
2014-03-11 19:10:36 +08:00 |
James Chen
|
fda8cfa740
|
plist rename.
|
2014-03-11 19:10:35 +08:00 |
James Chen
|
36e9f55c98
|
Renames cocos2d_samples to cocos2d_tests, what could i say?
|
2014-03-11 19:10:09 +08:00 |
James Chen
|
4475209277
|
Renames 'cocos2d_tests.xcodeproj' to 'cocos2d_samples.xcodeproj'
|
2014-03-10 10:27:16 +08:00 |
CaiWenzhi
|
62dfe630c7
|
Add custom widget
|
2014-03-07 15:36:45 +08:00 |
CaiWenzhi
|
8b7a5c3141
|
Add RichText sample
|
2014-03-06 20:52:29 +08:00 |
CaiWenzhi
|
4f9dfdbef8
|
Fixed build error except Windows
|
2014-03-05 21:18:51 +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
|
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 |
Dhilan007
|
dfc6522f5c
|
update XCode project for add miss file on Mac and IOS.
|
2014-02-19 17:11:28 +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 |
heliclei
|
1154c28516
|
share xcode build schemes to support xcodebuild command line build
|
2014-02-13 18:11:24 +08: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
|
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 |
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 |