pandamicro
|
3c2e66e425
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
|
2015-08-02 22:28:27 +08:00 |
|
Wenhai Lin
|
70628c9dec
|
Fixed link errors on iOS/Mac
|
2015-07-29 13:59:58 +08:00 |
|
pandamicro
|
a2a32ef58c
|
Release docs for v3.7.1
|
2015-07-25 15:16:39 +08:00 |
|
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
|
Bin Zhang
|
0a6186d68f
|
Solve the error in Xcode project of simulator.
|
2015-07-22 13:44:34 +08:00 |
|
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
|
Bin Zhang
|
9b45a9ee6f
|
Add preprocessor CC_ENABLE_BULLET_INTEGRATION=1 in simulator.
|
2015-06-30 16:14:25 +08:00 |
|
yinjimmy
|
06bd26cb63
|
Fixed: app crash when console ui trace nil string on mac platform #11211
|
2015-05-15 15:08:42 +08:00 |
|
yinjimmy
|
5cfa5ad8b8
|
add simulator
|
2015-05-14 14:11:40 +08:00 |
|
SunLightJuly
|
ff8c0dac2b
|
removed framework of simulator
|
2015-03-10 10:51:16 +08:00 |
|
SunLightJuly
|
10a60bb9da
|
removed pbxproj of simulator
|
2015-03-10 02:28:27 +08:00 |
|
zhangbin
|
b1f9fb4b8e
|
Rename the Xcode target of libsimulator.
|
2015-01-16 14:29:48 +08:00 |
|
yinjimmy
|
0978a88b7f
|
Merge branch 'v3' into combine
Conflicts:
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
|
2015-01-12 17:54:58 +08:00 |
|
yinjimmy
|
dea3cf9863
|
move runtime source to libsimulator project
|
2015-01-12 12:52:44 +08:00 |
|
yinjimmy
|
d2a3a6a8c0
|
merge lua-template-default with lua-template-runtime
|
2015-01-09 04:08:41 +08:00 |
|
yinjimmy
|
650b398419
|
move files
|
2015-01-08 21:12:44 +08:00 |
|
yinjimmy
|
82f37fcf72
|
add libsimulator
|
2015-01-08 14:10:28 +08:00 |
|
yinjimmy
|
dee536def2
|
support win32
|
2015-01-08 13:36:59 +08:00 |
|
yinjimmy
|
f1f4e5f3c2
|
support android
|
2015-01-07 22:19:46 +08:00 |
|
yinjimmy
|
9122e15f2c
|
move simulator
|
2015-01-07 17:50:15 +08:00 |