8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
d20052cc22
Fix line wrapper in CCDevice
2015-08-04 11:07:04 +08:00
f48a9fb9f0
getDPI for Mac Implemented
2015-08-03 17:12:52 +05:30
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
f74438372c
Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug
...
GLViewImpl initWithRect bug size
2015-07-31 18:43:23 +08:00
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
20d445ad1a
Label:The texture of system font should be cropped if the height of label is not enough to show the entire string on Mac.
2015-07-29 16:11:27 +08:00
6de387b3ac
fix Mac system font crash issue
2015-07-29 15:20:31 +08:00
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
c81ba3c148
Merge pull request #12648 from stari4ek/v3-12645-depthstencil-attributes-ios
...
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-29 11:09:56 +08:00
9edd66d4a7
Label:support font that contains GB2312 char map.
2015-07-28 16:28:32 +08:00
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07:00
31bd25a5e9
Merge pull request #12762 from yangws/issue_10759
...
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-21 10:47:55 +08:00
371053305e
Merge pull request #12915 from yangws/issue_12887
...
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after…
2015-07-20 14:01:21 +08:00
14a419d725
Fixed #12887 : [Android] Cocos2dxHelper will not be initialized after activity recreate.
2015-07-20 11:14:06 +08:00
66dadea0cd
Rollback log level
2015-07-17 15:56:51 +08:00
f0b29814c3
Label:support font that contains GB2312 char map.[android]
2015-07-16 21:35:10 +08:00
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
af4442d0d6
Merge pull request #12833 from fusijie/v3
...
Fixed setAnimationInterval JNI bug.
2015-07-14 16:33:39 +08:00
ea773cac20
Fixed setAnimationInterval JNI bug.
2015-07-14 15:11:35 +08:00
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
0589c14302
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
...
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
06bf6ffa90
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-14 09:35:01 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
74227eaf16
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-13 22:44:40 +08:00
3d06ca297f
Merge pull request #10255 from WenhaiLin/v3-activitylife-fix
...
Fixed game awaked by the clock on Android
2015-07-13 22:34:22 +08:00
22b4f5a11e
Merge pull request #12238 from lite3/patch-3
...
remove old path When added existing new searchPath
2015-07-13 22:16:50 +08:00
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +08:00
8ab1dce2a0
Merge pull request #12778 from yangws/issue_9586
...
Fix bug: FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'
2015-07-13 11:03:24 +08:00
8bc68395de
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into issue_9586
2015-07-13 11:00:18 +08:00
142d354485
[ci skip]Replace tab with spaces.
2015-07-10 21:03:43 +08:00
b459940bb8
[ci skip]Replace tab with spaces.
2015-07-10 20:47:21 +08:00
c68469a611
Update Nibiru SDK.
2015-07-10 20:42:05 +08:00
34aa7a0bb1
Remove unused variable.
2015-07-10 16:40:02 +08:00
1711a70869
Merge v3 branch.
2015-07-10 16:39:36 +08:00
187c72e2b9
[ci skip] replace tab with 4 space.
2015-07-10 16:17:34 +08:00
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
52293ad451
Fixed #9586 : FileUtils::isDirectoryExist not correct on Android when using relative path in 'assets'.
2015-07-10 14:37:42 +08:00
02226c6a26
Fix bug: Clipping node doesn't work on Android 5.0.
2015-07-09 16:49:26 +08:00
d55c0c64c5
add std::nothrow
2015-07-08 15:19:17 +08:00
7e26c381c6
remove invalid code
2015-07-08 14:36:37 +08:00
abee4a376a
add write api in FileUtils
...
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
2015-07-07 14:06:59 +08:00
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +08:00
ad1fc88fa8
compiles on Xcode 7
2015-07-06 16:30:29 -07:00
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
17207f14e5
Merge pull request #12689 from fusijie/refine_setAnimationInterval
...
Refine setAnimationInterval from double to float.
2015-07-06 16:18:45 +08:00
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
f126eb3267
Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix
...
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-03 15:42:45 +08:00
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
363da2beab
Fixed : #12645 iOS: depth/stencil buffers attributes are ignored
2015-07-02 12:07:24 +03:00
a28ad6939d
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-02 16:19:33 +08:00
7684c208e0
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:41:44 -07:00
eb668f63ce
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:39:31 -07:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
e574c38a6b
Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix
...
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 22:26:54 +08:00
ed029d264f
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 18:40:39 +08:00
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
f617d6f1aa
Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix
...
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 15:27:43 +08:00
79aa300448
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 13:42:32 +08:00
b275ce2283
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 13:38:06 +08:00
55b86b2e14
add more docs for samsung enhanced API
2015-06-19 18:09:42 +08:00
c249f7cb69
keep old behavior
2015-06-15 19:48:12 +08:00
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
b4ca8c1489
Merge pull request #15 from pandamicro/spritepolygon
...
Add SpritePolygon JSB bindingsJSB bindings
2015-06-15 15:47:02 +08:00
86b6ea702a
Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix
...
[ci skip]Android Studio projects:Fixed compile error.
2015-06-15 14:48:42 +08:00
518de1ff57
[ci skip]Android Studio projects:Fixed compile error.
2015-06-15 14:42:45 +08:00
d0db40c4a6
Merge pull request #12080 from linshun/v3
...
issue #12078 added audio, network, physics, platform and storage group.
2015-06-15 12:45:11 +08:00
19ef0e0983
Fix indent
2015-06-12 13:01:13 +08:00
0f64a2d192
removed obsolete override of setViewPortInPoints
2015-06-11 07:59:52 -07:00
03814a569d
Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix
...
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-11 14:30:36 +08:00
6dfe937cae
Merge pull request #11892 from dabingnn/v3FrameBufferObject
...
V3 frame buffer object
2015-06-11 14:04:30 +08:00
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
79b3d70b60
fix bug #12200
...
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
2015-06-09 18:43:46 +08:00
b79eec0b20
fix grid bug for viewport
2015-06-09 17:24:30 +08:00
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
6fec9c40b0
SimpleAudioEngine:Fixed thread safety problem on android.
2015-06-09 15:07:35 +08:00
97b387560b
revert some accidental changes
2015-06-09 14:06:11 +08:00
f1d879f7ed
remove old path When added existing new searchPath
2015-06-08 13:34:45 +08:00
133ef90c09
Merge branch 'v3Viewport' into v3FrameBufferObject
...
# Conflicts:
# cocos/renderer/CCFrameBufferObject.h
2015-06-06 18:16:22 +08:00
6216e74a38
Merge pull request #12165 from gyf19/v3
...
HttpClient Android supports gzip
2015-06-04 22:00:13 +08:00
ad1f7c472c
add render buffer render target for color attachment
2015-06-04 11:18:35 +08:00
38c9490f4d
don't delete rendering thread. SpiderMonkey needs to stay on same thread
2015-06-03 09:19:05 -07:00
164e4c8314
HttpClient Android supports gzip
2015-06-03 19:41:14 +08:00
883f250f6a
Merge pull request #12137 from WenhaiLin/v3-text-line-height
...
Fixed the text line height calculation is wrong with system font on Android.
2015-06-03 16:24:38 +08:00
88697bf136
Remove unused function.
2015-06-02 16:38:06 +08:00
67d0088103
Fixed the text line height calculation is wrong with system font on Android.
2015-06-02 16:23:40 +08:00
2c611693c6
Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness
...
Improve UserDefault's robustness on Android.
2015-06-02 10:11:19 +08:00
9d8225aae8
Improve UserDefault's robustness on Android.
2015-06-01 15:09:11 +08:00
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
09b52331d1
issue #12078 : added renderer group and removed core and support group.
2015-06-01 13:43:56 +08:00
e0c65c203a
Merge branch 'v3' into v3-uwp
2015-05-29 08:09:05 -07:00
039c0036be
Merge pull request #12072 from iris-wy/v3
...
Add enhance service API
2015-05-29 15:32:06 +08:00
05d33ac0c8
removed old WP8 files
2015-05-28 14:08:25 -07:00
ef39251d14
issue #12078 : added platform group
2015-05-28 15:47:40 +08:00
bbfc33dfd2
format
...
format
2015-05-28 11:03:49 +08:00
9e477303f1
delete useless TAG
...
delete useless TAG
2015-05-28 10:55:10 +08:00
0007799794
modify Enhance API
...
modify Enhance API
2015-05-28 10:47:12 +08:00
9ee4b4af1e
Merge branch 'v3' into v3-winrt-audio
2015-05-27 11:54:21 -07:00
4501a53cfa
Added MP3 support to simple audio engine
2015-05-27 10:57:26 -07:00
999de9072a
Merge pull request #12003 from minggo/remove-unneeded-function
...
remove uneeded function
2015-05-25 16:33:38 +08:00
db0caf68c6
remove uneeded function
2015-05-25 09:50:48 +08:00
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
aa7876aefc
remove deprecated methods
2015-05-20 07:55:10 -07:00
cada493685
remove deprecated methods
2015-05-20 07:51:52 -07:00
a569d877ba
[ci skip]Remove unnecessary code.
2015-05-20 18:05:46 +08:00
df3548673f
Remove unnecessary files.
2015-05-20 10:19:32 +08:00
e700ef6d30
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
...
Add Android Studio support
2015-05-18 16:17:24 +08:00
26f094b1a7
Remove unnecessary files
2015-05-18 16:02:05 +08:00
6dd3108e42
Rename module
2015-05-18 15:01:20 +08:00
bfb3fbb1c0
Revert _checkPath
2015-05-17 19:24:57 +03:00
295e8532d2
FileUtilsWin32 correct use all unicode version winapi
...
Move to FileUtilsWin32 implements:
isDirectoryExistInternal
isDirectoryExist
createDirectory
removeDirectory
removeFile
renameFile
And use common convert to wide char.
2015-05-17 12:40:14 +03:00
dc8492948e
Add Android Studio support
2015-05-15 16:37:43 +08:00
68ec7c8ca1
Add enhance service API
...
Add enhance service API
2015-05-15 14:29:22 +08:00
5e776381aa
Merge pull request #11820 from Dimon4eg/v3
...
Fix crash in web view if illegal character in url (Android only)
2015-05-15 10:12:54 +08:00
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
0a3e6338f1
Merge pull request #11834 from pandamicro/v3_origin
...
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +08:00
8577055d5a
Implement localStorage.clear on Android
2015-05-14 10:40:25 +08:00
9d7e5e5edc
Fix crash in web view if illegal character in url (Android only)
2015-05-13 14:56:07 +03:00
134355d763
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
...
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0
But CCImage.cpp just check wheather defined or not..
2015-05-13 20:52:32 +09:00
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
f1fe802442
updated winrt keyboard support to support physical keyboard
2015-05-12 09:20:10 -07:00
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
a718c11eb6
Merge pull request #11724 from andyque/fix-binding-generator
...
fix upstream compile error
2015-05-07 11:47:20 +08:00
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
dfe30e159f
Need JNIEXPORT for -fvisibility=hidden
2015-05-06 14:24:48 +09:00
26c9be7881
Add FileUtils::getSuitableFOpen[window-universal]
2015-05-04 16:06:04 +08:00
1839564fbb
Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7
2015-05-04 10:16:47 +08:00
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
1950498b0a
Replace tab with space.
2015-04-29 18:41:10 +08:00
1d9ff11837
VideoPlayer:Fixed can't play video on Android 2.3.x
2015-04-29 18:32:59 +08:00
2d2f0aac59
fix indent
2015-04-27 16:25:24 +08:00
8c4cecca0d
fix indent and translate Chinese comment to English
2015-04-27 16:22:54 +08:00
c0b2433bb5
Merge branch 'v3' of https://github.com/qiutaoleo/cocos2d-x into check-filename-case-on-windows
2015-04-27 15:45:23 +08:00
9496a48800
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-24 18:29:23 +08:00
61cf0ad28b
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
2015-04-23 15:46:19 +08:00
ac8755868d
need to call Cleanup() if app is terminating
2015-04-22 19:13:12 -07:00
b78f830ed8
cleaned up Draw()
2015-04-22 19:11:42 -07:00
4119b0f10d
cleaned up Draw()
2015-04-22 19:11:29 -07:00
22daece170
made Cleanup() public
2015-04-22 19:08:11 -07:00
c3335551b8
added EGL_PLATFORM_ANGLE_ENABLE_AUTOMATIC_TRIM_ANGLE
2015-04-22 19:07:48 -07:00
7c77bc9587
Add the PolySprite support and adjust the project setting on the different platform
2015-04-23 00:51:47 +08:00
0f3ff6f762
Merge branch 'v3' into v3-winrt-typo-fix
2015-04-21 18:18:00 -07:00
84a47000b5
rename -win to -winrt
2015-04-21 18:17:18 -07:00
aec086a473
convert BGR and RGB to GUID_WICPixelFormat24bppRGB
2015-04-21 18:16:54 -07:00
516966a96f
check for PixelFormat::DEFAULT
2015-04-21 18:11:56 -07:00
0c47df5df2
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
2015-04-21 06:21:32 -07:00
83b68ef693
added comment on how back button event is handled
2015-04-20 18:36:58 -07:00
50f381f070
added CCLOG message to describe how to handle Windows Phone back button event
2015-04-20 18:30:52 -07:00
4169ebf5c8
Windows Phone 8.1 back button and terminate app support
2015-04-20 10:43:34 -07:00
e00b0dfbd9
Merge branch 'v3' into v3-winrt-backbutton
2015-04-20 08:17:16 -07:00
2476f2b52d
fixed win32 application return code
2015-04-20 18:27:21 +08:00
dc768dbd8c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
2015-04-20 10:06:48 +08:00
ec378b612e
added listener if back button event not handled by app
2015-04-19 18:53:10 -07:00
a97d5c5370
added support for hardware back button on Windows Phone 8.1
2015-04-19 16:31:30 -07:00
694b9adc1e
Add FileUtils::getSuitableFOpen
...
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.
Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename
all fopen use FileUtils::getSuitableFOpen
2015-04-19 14:00:27 +03:00
f1f0c5a653
start of back button support
2015-04-17 15:47:52 -07:00
79f312d101
call pause on correct thread
2015-04-17 09:31:02 -07:00
2ccff5671a
fix for encoding images with WIC
2015-04-17 09:20:23 -07:00
d3a06de6d6
remove system zlib dependency since we use our own prebuilt version of
...
zlib now.
2015-04-17 17:24:33 +08:00
1f491cf656
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
...
Conflicts:
build/cocos2d-wp8.sln
2015-04-16 17:04:07 +08:00
97f150a89f
Merge pull request #11452 from MSOpenTech/v3-remove-wp8
...
V3 remove WP8 project files
2015-04-16 14:32:11 +08:00
b1c9c34c19
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:19:38 -07:00
7d22e49642
only needed if _MSC_VER < 1900
2015-04-15 09:18:48 -07:00
68430ce4fa
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:18:23 -07:00
b700798287
removed WP8 project files
2015-04-15 07:13:54 -07:00
2dd88e8be5
Fixed JNI illegal start byte error
2015-04-15 18:20:52 +08:00
8c2413aa54
Add submodule js-bindings & html5.
2015-04-14 15:20:46 +08:00
272bb35246
Merge branch 'v3' into v3-wp8-fix
2015-04-08 07:29:45 -07:00
24c0c8d811
fix wp8 compile issue
2015-04-08 18:01:56 +08:00
4d9e376a18
Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log
...
Log message can't detect image format
2015-04-08 10:52:56 +08:00
f962e14b43
replace const_cast with mutable in path getters;
...
more getters (is*/get*) became const;
2015-04-07 17:15:15 +03:00
ba06886e01
GLViewImpl initWithRect bug size
...
glfwCreateWindow not guarantees create windows need size, watch real
create size and change setFrameSize( see declaration glfwCreateWindow)
Example Windows 7, if request height size > Desktop height make window
size: Desktop height - height Caption.
2015-04-06 14:24:22 +03:00
3931273a58
Log message can't detect image format
...
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.
Log message if format unknown
2015-04-04 13:19:47 +03:00
fc92acf587
remove interlevel argument.
2015-04-03 16:43:39 +09:00
98371e4fbb
Merge pull request #11267 from WenhaiLin/v3-at01
...
Disable MessageBox when the device does not have an accelerometer on WinRT.
2015-04-03 11:53:07 +08:00
fdba25cdde
Disable MessageBox when the device does not have an accelerometer on WinRT
2015-04-03 11:51:00 +08:00
d8b6a0aaf9
removed unused method
2015-04-02 09:11:19 -07:00
47b338e4e6
fix deprecated warnings
2015-04-02 09:08:26 -07:00
957bf48790
fire foreground and background events
2015-04-02 09:07:44 -07:00
aaae566b7b
Performance: Fixed lag if Director::setContentScaleFactor is called frequently
2015-04-02 23:35:56 +08:00
b7279524d6
Win32 correct rename file
...
Old version, check GetLastError even if all ok, but LastError can be set
other code.
Write log info.
2015-03-31 13:52:40 +03:00
b03900bbbf
fix doxygen comment
2015-03-27 17:09:54 +08:00
3d772df930
Add comment
2015-03-27 14:43:24 +08:00
17bd26e9d4
Add comments
2015-03-27 11:39:31 +08:00
f13065a038
[ci skip]Update comments
2015-03-25 11:07:11 +08:00
153d697f1a
[ci skip]Update comments.
2015-03-25 10:59:04 +08:00
89f9ae044d
[ci skip]Update comments
2015-03-24 20:29:13 +08:00
9dd778edb0
[ci skip]Update comments
2015-03-24 20:23:51 +08:00
2caff4e64d
[ci skip]Update comments
2015-03-24 14:12:58 +08:00
1450dfbc7b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-doxygen
2015-03-24 11:26:10 +08:00
4973de2b25
add more doxygen document
2015-03-24 11:15:40 +08:00
14574bdd41
add doxygen comment of CCFileUtils.h
2015-03-24 10:34:44 +08:00
78a8ba7f98
[ci skip]Update comments
2015-03-23 22:17:59 +08:00
d8a033c2ef
Action,Sprite,TmxTiledMap,UTF8,GLView
2015-03-23 18:37:28 +08:00
fc94659fd5
updated precompiled shaders for WP8
2015-03-20 23:50:48 -07:00
a29a298ec3
fix wrong comment
2015-03-20 09:49:34 +08:00
0648ac7ca0
Merge pull request #11004 from SuYaoHui/cocosapi
...
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
2015-03-19 21:47:32 +08:00
5e236fd753
progressTimer,ApplicationProtocol
2015-03-19 21:42:31 +08:00
8e32933dd3
Merge pull request #10340 from seobyeongky/network_bugfix2
...
receive content data even though status code is not 2xx
2015-03-19 21:12:51 +08:00
c295952c71
NodeGrid,Config,NS,ApplicationProtocol
2015-03-19 21:03:28 +08:00
2aec39ad56
Added Bulgarian language.
2015-03-17 15:14:02 +02:00
65c83378d0
Merge branch 'v3' into v3-wp8-fix
2015-03-16 20:22:28 -07:00
f7d5a16734
Merge pull request #10873 from konopka/fix_compiler_override_warnings
...
Fix compiler override warnings
2015-03-17 10:38:19 +08:00
e2a5eb2f9f
updated to Angle ddbf057c52
2015-03-16 08:18:26 -07:00
f25be54e95
Merge pull request #10671 from kpkhxlgy0/v3
...
enable setWritablePath on platform win32 and mac
2015-03-16 14:57:26 +08:00
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
3194da4e7d
Merge pull request #10720 from darkdukey/hide_cursor
...
Hide cursor
2015-03-13 10:48:15 -07:00
a2274162b5
merged
2015-03-12 10:06:53 +09:00
8e6d9d5dd2
Merge pull request #10740 from newnon/v3_windows_network_path
...
Windows network path fix
2015-03-10 11:25:53 +08:00
0d65dd13be
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-09 21:20:17 +09:00
a9479a1585
updated WP8 precompiled shaders
2015-03-08 21:42:27 -07:00
de284c98ce
MinGW build fix
2015-03-05 11:11:13 +03:00
215fe8a0c9
Windows network path fix
2015-03-05 11:10:03 +03:00
49912c2f62
clean up the formatting
2015-03-02 23:29:15 -08:00
395c14f07d
Hide Cursor - Feature Request #8766
...
Added the ability to hide or show the cursor on desktop builds.
2015-03-02 23:21:18 -08:00
99dea9395d
enable setWritablePath on platform win32 and mac
2015-02-28 18:21:57 +08:00
dbba9e36a1
Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
...
Fix win32 resource search path to be relative to the executable.
2015-02-25 20:24:07 -08:00
5d8071bdcf
Merge pull request #10597 from loadrunner/v3
...
added Romanian language
2015-02-26 10:51:46 +08:00
9e310ba272
added Romanian language
2015-02-25 17:25:19 +02:00
c2479adc59
Merge pull request #10549 from mogemimi/fix-typo
...
Fix typo in Image::Format
2015-02-25 09:32:58 +08:00
9e7ce0cd85
Fix typo in Image::Format
2015-02-24 02:36:20 +09:00
21dbc29ad1
adding CC_DEPRECATE(version) macro
2015-02-17 13:01:53 -08:00
0801160a37
added precompiled Particle3D shaders
2015-02-16 11:28:24 -08:00
3a4e9ced46
Merge pull request #10442 from Dhilan007/v3-accelerometer-fix
...
Fixed Accelerometer has lagged on iOS
2015-02-12 17:20:07 +08:00
cf8a7cd6da
Changed the option to be passed to calculate bounding rect size for
...
strings.
As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
2015-02-12 15:30:46 +08:00
20ad425407
Fixed Accelerometer has lagged on iOS
2015-02-11 16:28:43 +08:00
653bf1549d
win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable.
2015-02-09 02:23:01 +03:00
753335726a
receive content data even though status code is not 2xx
2015-02-03 16:28:23 +09:00
18a45e36eb
Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix
...
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 13:56:11 +08:00
05db3bfd72
Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 11:55:49 +08:00
4a218ea3e2
Fixed game awaked by the clock on Android
2015-01-28 15:30:52 +08:00
4ac50f2c26
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
...
Fixed sets the page's base URL for WebView doesn't work.
2015-01-26 13:51:08 +08:00
81198583f1
Fixed sets the page's base URL for WebView doesn't work.
2015-01-23 18:30:12 +08:00
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
e5b54f8c47
updated precompiled shaders for wp8
2015-01-21 10:50:44 -08:00
fde86c7fd2
Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix
...
Fixed the alpha channel of text color of system font not take effect
2015-01-21 11:09:27 +08:00
9f24b9a350
Merge pull request #10090 from Dhilan007/v3-issue10089
...
Fixed lose the precision of label's dimensions
2015-01-21 10:51:27 +08:00
b20d59c596
Fixed the alpha channel of text color of system font not take effect[android]
2015-01-20 17:34:13 +08:00
415bbeba21
Fixed the alpha channel of text color of system font not take effect
2015-01-20 16:04:14 +08:00
f2c6a48976
Fixed lose the precision of label's dimensions
2015-01-20 11:46:43 +08:00
56d8e62409
added support for device orienation change. Fixed gravity for winrt landscape flipped
2015-01-19 09:38:49 -08:00
7b6b02d338
catch exception for older winrt tablets not supporting accelerometer report interval
2015-01-16 15:36:16 -08:00
5988cb520d
added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite"
2015-01-16 14:59:08 -08:00
7b3154a7ee
updated precompiled shaders for WP8
2015-01-16 11:19:32 -08:00
41f53d6607
added checkfilename in win32 FileUtils
...
make win32 check filename case like linux
2015-01-16 17:24:54 +08:00
6a2ac7aaf8
[ci skip]Fixed log level within the CocosPlayClient
2015-01-15 18:21:03 +08:00
ef816a1bb9
fixed handling of default font
2015-01-14 11:10:58 -08:00
32c14710e7
allow custom shaders for WinRT Universal App
2015-01-14 10:37:04 -08:00
1e2029598d
Merge pull request #9936 from Dhilan007/v3-cocosplay
...
Integrate CocosPlayClient
2015-01-14 16:10:20 +08:00
553cf58312
Remove FileUtilsAndroid::purgeCachedEntries
2015-01-14 16:05:33 +08:00
5a4c6d75d8
clean up CC_USE_WEBP disabled for WP8 and WINRT
2015-01-13 14:37:22 -08:00
f4ac7c4e44
modify WP8 project and update precompileshader
2015-01-14 02:15:04 +08:00
58c45ca144
Integrate CocosPlayClient
2015-01-13 17:30:07 +08:00
b0d1dd2435
FileUtils::fullPathForFilename should return "" if resource is not found.
...
I Think this method should return empty string when the resource is not found.
Because, I cannot check if the file found or not with current implementation.
2015-01-10 19:30:42 +09:00
57cd4cd3c6
Fixed VideoPlayer can't play when passing the full path of video resource
2015-01-09 19:14:19 +08:00
d92a525bfa
Fixed dead loop when width of label[system font] smaller then one word of the string on android
2015-01-09 16:52:40 +08:00
b5859114b7
Merge pull request #9778 from samuele3hu/v3_4_bug_xmlhttp
...
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-07 17:45:43 +08:00
4c7377480b
Merge pull request #9837 from minggo/memory-leak
...
fix memory leak
2015-01-07 17:23:28 +08:00
1dcdd81fc4
fix memory leak
2015-01-07 15:02:27 +08:00
339a8b1abc
class rename for EGLConfigChooser
2015-01-06 16:18:01 +08:00
1180f7a41e
move class cocos2dEGLConfigChooser to Cocos2dxActivity
2015-01-06 12:44:29 +08:00
b88b9ea994
Merge pull request #9777 from ffskyfan/v3
...
fix the problem that engine can't get data from file on windows
2015-01-06 10:21:36 +08:00
ef5076983d
Merge pull request #9792 from minggo/memory-leak
...
fix memory leak
2015-01-05 14:20:49 +08:00
f155386f05
fix memory leak
2015-01-05 13:49:47 +08:00
832a87f5f0
Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection
2015-01-04 17:09:35 +08:00
cb3b760759
Update CCFileUtils-win32.cpp
...
fix the problem that engine can't get data from file while other app using the file on windows platform
2015-01-04 16:43:10 +08:00
651b7fc13c
Remove warn error on Exit
...
Change the return error on Linux to -1 to standard EXIT_SUCCESS value.
2014-12-31 18:37:59 +01:00
79e71b6c50
Merge branch 'v3' into wp8-fix2
2014-12-30 21:25:54 -08:00
09efe9be04
removed unused winrt CCPlatformDefine.h
2014-12-30 21:03:33 -08:00
3795f9cc2a
Rename HttpClient-android.cpp and unify java indent format
2014-12-31 12:03:27 +08:00
f7ed73c1e1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_httpclient
2014-12-31 10:17:12 +08:00
0e94bdda3a
Use android network module — HttpURLConnection to replace the libcurl on the android platform
2014-12-31 10:15:14 +08:00
d33fad0ac7
fixed check for header already included
2014-12-30 16:39:02 -08:00
f4cd2e311d
added missing inet_pton() for windows phone
2014-12-30 16:38:18 -08:00
42e6232113
fix typo and memory leak
2014-12-26 14:25:55 +08:00
94d70358b7
make FileUtils extendable
2014-12-26 11:34:31 +08:00
1c87c53ff8
Merge pull request #9636 from musikov/v3-language
...
added Turkish and Ukrainian language;
2014-12-26 09:31:57 +08:00
3b01762db4
Merge pull request #9638 from yinjimmy/writablepath
...
set default resource root path & writable path
2014-12-26 09:27:59 +08:00
744a9043f9
set default resource root path & writable path
2014-12-25 20:33:47 +08:00
d9b5ab4a4c
added Turkish and Ukrainian language;
...
replaced 'tabs' with 'spaces' in Application::getCurrentLanguage();
2014-12-25 12:08:23 +02:00
60893607cc
fix ci compile error
2014-12-25 15:38:51 +08:00
0c66e638f7
Merge pull request #8183 from xseekerj/patch-3
...
CCPlatformMacros.h
2014-12-25 14:02:52 +08:00
6856f03bff
fix webp format premultipliedAlpha error
2014-12-17 14:21:46 +08:00
7b23e3ab1d
remove useless function call.
2014-12-15 19:47:25 +08:00
a1c60bcf24
Merge pull request #9452 from minggo/java-style
...
[ci skip]use java coding style
2014-12-11 10:55:14 +08:00
7c07bc6a90
Merge pull request #9449 from Dhilan007/v3-keycode
...
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-11 09:58:57 +08:00
1d1028a68b
Merge pull request #9410 from andyque/fixEditBox_v3
...
Fix edit box v3
2014-12-10 18:54:20 +08:00
0e7470505f
replace tab with 4 spaces
2014-12-10 18:32:58 +08:00
8b78c181ce
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-10 18:11:07 +08:00
77ed7a47e2
use java coding style
2014-12-10 18:07:46 +08:00
dd5659b6eb
Merge pull request #9401 from minggo/iss9398-not-close-dir
...
invoke closedir after invoke opendir
2014-12-08 18:10:41 +08:00
119a68afd9
fix EditBox move animation position is wrong on iPhone6 Plus
2014-12-08 15:34:58 +08:00
c067338c17
closedir when succeed
2014-12-08 11:36:11 +08:00
74c80296aa
invoke closedir after invoke opendir
2014-12-08 09:58:58 +08:00
1d908f94ab
fixed renameFile for wp8 and winrt to pass file and assetmangers tests
2014-12-05 18:12:25 -08:00
0d89b9b742
Merge pull request #9368 from huangshiwu/v3_wincpu
...
fix win32 high cpu occupancy rate
2014-12-04 15:17:26 +08:00
0badda268a
Merge pull request #9366 from Dhilan007/v3-33rc1
...
Fixed label may show nothing when using system font on Mac
2014-12-04 15:11:50 +08:00
1212b4a6e9
fix win32 high cpu occupancy rate
2014-12-04 14:33:17 +08:00
ed86f65270
Fixed label may show nothing when using system font on Mac
2014-12-03 17:07:51 +08:00
77b5c40283
Merge pull request #9224 from pjc0247/v3
...
fix C4129 warning
2014-12-03 14:15:38 +08:00
1bfdd757a2
Fixed fail to play background music again after invoking stopBackgroundMusic
2014-12-02 15:03:26 +08:00
9b792d97c4
Merge pull request #2 from cocos2d/v3
...
update project
2014-11-28 22:52:13 +09:00
e93ff4f5b7
Merge pull request #8979 from Gamevy/bugfix/release-eaglview-on-ios
...
eaglview release leak in CCEAGLViewImpl-ios
2014-11-26 13:54:49 +08:00
d7de8a48a3
Merge pull request #9241 from dumganhar/iss8988-left-ctrl
...
issue #8988 : Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHTALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
2014-11-26 13:47:36 +08:00
dbb473fdcb
Merge pull request #9203 from dumganhar/arm64-juno
...
Some updates for neon64 instruction
2014-11-26 11:46:19 +08:00
cebfed108c
issue #8988 : Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
2014-11-26 10:41:14 +08:00
2c8cb4b3bd
updated Application::getCurrentLanguage to work on WP8 and Universal App
2014-11-25 11:21:56 -08:00
fac9d2880f
added missing OpenURL support for universal app
2014-11-25 10:05:02 -08:00
8da06fb9cc
Merge branch 'v3' into v3-win8.1-appstate
2014-11-25 08:07:29 -08:00
528f24010b
Workaround for missing __ctype_get_mb_cur_max function in ndk-r10c
2014-11-25 10:33:16 +08:00
be60a33d25
fix C4129 warning
2014-11-25 04:52:44 +09:00
97df35f346
Merge pull request #9207 from dumganhar/iss8984-remove-unused
...
#8984 : Removes unused codes in CCStdC-linux.cpp
2014-11-24 18:48:05 +08:00
88c3cc2ad9
Merge pull request #9105 from Dhilan007/v3-video-web-fix
...
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
2014-11-24 15:15:18 +08:00
cb6d81599b
#8984 : Removes unused codes in CCStdC-linux.cpp
2014-11-24 15:01:57 +08:00
fc09fa8798
Merge branch 'v3' into v3-win8.1-appstate
2014-11-21 16:27:01 -08:00
a607d41454
implemented lostDevice support when app loses the directx device
2014-11-21 16:24:51 -08:00
32fe5d07ae
fixed compiler warning. Don't use _filePath to check tga if it's length is 0
2014-11-21 16:23:54 -08:00
9fedb14354
Fixes for FileUtils
...
compiles after previous patch
2014-11-21 14:52:13 -08:00
0f268e7aaa
Merge pull request #9176 from MSOpenTech/v3-winrt-accelerometer-fix
...
Fixed accelerometer for windows store apps device orientation
2014-11-21 11:50:08 -08:00
fbd27dff9c
changed few loops for C++11 range-based for loop
2014-11-21 20:12:55 +01:00
2a86c77066
added foreground, background, lostdevice support
2014-11-21 10:31:57 -08:00
9bf15d424f
added CC_PLATFORM_WINRT to enable CC_ENABLE_CACHE_TEXTURE_DATA
2014-11-21 09:52:33 -08:00
ff172e0057
fixed accelerometer for windows store apps device orientation
2014-11-20 09:00:22 -08:00
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
9fdd85a1be
Merge pull request #9133 from pyrosphere/fix-wp8-back-key
...
Fix Back Key behaviour and Director::getInstance()->end() on WP8
2014-11-20 11:11:31 +08:00
5d2857b3c4
updated angle to commit 4a980d2612
2014-11-19 15:55:18 -08:00
1e8aeb7fd2
Minizip
...
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
2014-11-16 22:41:37 +03:00
0898af21ab
Fix Back Key behaviour and Director::getInstance()->end() on WP8
2014-11-16 10:16:16 +00:00
bc0c3d5a3f
Merge pull request #9085 from jicheol-ryu/v3
...
fix bug - potential memory leak.
2014-11-14 14:17:13 -08:00
5a8ac8f151
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
2014-11-13 18:15:41 +08:00
ee31273fa5
Merge pull request #9088 from Dhilan007/v3-audio-Lollipop
...
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() freeze on Lollipop
2014-11-13 16:02:40 +08:00
48f1bd62d7
remove unrelated modification
2014-11-13 15:43:39 +08:00
a37549d7bc
Update Cocos2dxMusic.java
2014-11-13 11:00:29 +08:00
9415b2b930
Update TouchesJni.cpp
...
fixed gamelist can't pull by mouse.
2014-11-12 14:21:48 +08:00
76c9accec9
Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop
2014-11-12 13:01:47 +08:00
c94a9ea01a
fix bugs - potential memory leak.
...
const std::string text = std::string((char*)ch,0,len); is using next
string constructor.
string (const string& str, size_t pos, size_t len = npos);
memory leak can occur while type converting char to string.
So we have to use next string constructor.
string (const char* s, size_t n);
http://www.cplusplus.com/reference/string/string/string/
2014-11-12 00:06:30 +01:00
3b8ddf1b54
Merge pull request #9005 from joshuastray/add-resource-folder-def
...
Update CCFileUtils-linux.cpp
2014-11-07 10:25:14 +08:00
7565b9b1eb
Merge pull request #8969 from kaylyun/v3
...
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
2014-11-05 17:58:28 +08:00
6e35e91642
Update CCFileUtils-linux.cpp
2014-11-04 18:23:12 +08:00
cc2653d657
eaglview shouldn't be released here
2014-10-30 14:51:07 +00:00
a2eb8977e0
Uncomment eaglview release CCEAGLViewImpl-ios
...
This is leaking the eaglview when the Director is purged.
In our case, we are leaving the cocos environment on some views which
are implemented with cocoa, and because this eaglview is not being
released, it is getting notifications for keyboard events, and trying to
access stuff on the NULL eaglview, crashing our app.
Uncommnenting this line seems to fix the problem for us, and we haven't
been able to find any nasty side effects.
2014-10-30 11:18:10 +00:00
97c076337a
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
...
Sometimes app directly at the startup on android platform.
2014-10-30 10:21:19 +08:00
060779c138
added check for WP8_SHADER_COMPILER
2014-10-28 21:01:26 -07:00
a8e0987b8d
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:59:44 -07:00
af14b40ba0
must call DisplayInformation::GetForCurrentView() from main UI thread
2014-10-27 13:40:19 -07:00
5b69a55121
added check for WP8_SHADER_COMPILER
2014-10-27 11:16:14 -07:00
510c8caed7
added DPI support for universal app
2014-10-27 11:12:54 -07:00
4dd48d5020
removed mutex. use concurrent_queue for events
2014-10-27 11:08:22 -07:00
2eccd58d45
added DPI support for universal app
2014-10-27 11:07:00 -07:00
6fb69870f9
fixed compiler warnings for winrt code
2014-10-27 10:57:57 -07:00
77c00bc77f
removed use of std::mutex. Now using lock-free concurrent_queue
2014-10-27 08:32:19 -07:00
042976265c
updated precompiled shaders for WP8
2014-10-24 07:20:16 -07:00
fa6b70cbb8
disabled xaml functions for WP8
2014-10-24 05:59:59 -07:00
f42afaa6bb
updated project files with new pch files
2014-10-23 19:40:57 -07:00
c82a75d4f7
added xaml support functions
2014-10-23 19:29:38 -07:00
2ddb692628
added flyout xaml to support uieditbox on winrt
2014-10-23 19:29:18 -07:00
96054e9c29
updated headers for change in pch.h
2014-10-23 19:28:53 -07:00
0af2f30d61
fixed WP8_SHADER_COMPILER checks
2014-10-23 08:40:34 -07:00
a4294c07c1
added check for WP8_SHADER_COMPILER
2014-10-23 08:32:31 -07:00
b5fdf892b2
added text input from keyboard support for winrt
2014-10-23 07:38:46 -07:00
cc3b784dd1
added windows 8.1 platform support files
2014-10-23 07:38:04 -07:00
1112cad792
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 07:12:51 -07:00
3d16bbc6b9
added UIEditBoxEvent. namespace refactor
2014-10-23 07:09:03 -07:00
b20015f845
updated for Universal App support
2014-10-23 07:07:58 -07:00
06913670dc
use device orientation for acceleration values
2014-10-23 07:04:13 -07:00
8af672c588
moved messagebox code to winrt cceglview to handle threading issues
2014-10-23 07:03:41 -07:00
78fd325ac7
Merge pull request #8889 from Dhilan007/v3-testcase-android
...
Fixed line wrap error for system font on MAC
2014-10-21 16:55:22 +08:00
90b2d8464b
Fixed line wrap error for system font on MAC
2014-10-21 16:46:00 +08:00
b741767b37
Rolling back text color of system font on Linux
2014-10-21 14:14:08 +08:00
e392bf9b17
fix wp8 debug mode crash - update WP8's precompileshader.h to match shader's modify
2014-10-21 11:14:07 +08:00
4765ed8494
Fix wrong text color for system font on Linux/Window
2014-10-20 14:33:33 +08:00
18ca7c936c
Merge pull request #8768 from Dhilan007/v3-33rc
...
Improve Android.mk
2014-10-17 14:09:49 +08:00
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
8b1fe93269
Merge pull request #8762 from Dhilan007/v3-33rc
...
disable warn on zero-sized structure[android].
2014-10-17 09:34:41 +08:00
41fe4a3e17
dpi for wp8 only
2014-10-16 11:16:26 -07:00
5595947dc3
disable warn on zero-sized structure[android].
2014-10-16 21:41:52 +08:00
b4867bf6e5
Merge pull request #8715 from iSevenDays/v3
...
CMakes support for Mac Os X & iOS
2014-10-16 21:16:02 +08:00
0678601f61
decrease logging verbosity - CCFileUtils-android
2014-10-16 13:03:39 +03:00
7fe2b6c0ad
Update the CCFileUtils.h
2014-10-16 11:07:15 +08:00
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
a0c8ffb943
Modify Xcode project’s configure
2014-10-15 14:32:11 +08:00
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
2b4d1c204c
updated wp8 precompiled shaders
2014-10-14 18:39:12 -07:00
420a19f222
run app after setting delegates
2014-10-14 18:12:24 -07:00
d6912c3d84
updated winrt platform files
2014-10-14 16:32:39 -07:00
ad9c729f6b
updated winrt include files
2014-10-14 14:20:02 -07:00
2ef8b291bf
updated wp8 include files
2014-10-14 14:19:47 -07:00
eeeac0a398
updated wp8 include files
2014-10-14 14:19:35 -07:00
fc35cc2efe
CMake fix for Mac Os X.
...
You can open project with CLion and see that everything works.
2014-10-15 00:19:29 +03:00
ef13db4643
updated pch include files
2014-10-14 14:19:14 -07:00
946121ec71
added CC_DLL to export classes
2014-10-14 14:18:56 -07:00
adfe072937
fixed include paths
2014-10-14 14:18:31 -07:00
37cd3dc7f9
added check for WP8_SHADER_COMPILER
2014-10-14 14:18:14 -07:00
bbca4823f5
fixed check for WINRT_NO_WINSOCK
2014-10-14 14:17:49 -07:00
7a57ea4cb8
added Windows 8.1 ANGLE support
2014-10-14 14:17:28 -07:00
e0157f7471
check for WP8_SHADER_COMPILER
2014-10-14 14:16:52 -07:00
fbc25a055c
updated winrt include
2014-10-14 14:16:24 -07:00
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
3419a38961
Merge remote-tracking branch 'upstream/v3' into v3
2014-10-11 17:40:47 +08:00
5a60e99131
Merge pull request #8577 from ntotani/detach-thread-on-exit
...
call detach method on thread exit
2014-10-11 16:54:59 +08:00
c01d1b1166
Merge pull request #8646 from huangshiwu/v3_languagecode
...
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
2014-10-11 16:23:49 +08:00
4dd9120e67
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
2014-10-11 15:19:20 +08:00
0d26b33eaa
mingw64: mirgrate to upstream minizip
2014-10-11 04:39:42 +01:00
e1814d0480
add virtual in FileUtilsAndroid::getNewFilename
2014-10-11 11:20:14 +08:00
ee3086ff8d
compiler fixes for windows
2014-10-10 17:41:11 -07:00
7fb448e90f
add 'static' for global function
2014-10-10 15:13:05 +08:00
250875b081
fixed compile error
2014-10-10 14:03:20 +08:00
6a8c4f4194
Fixed FileUtils::removeFile doesn't work on iOS
2014-10-10 11:59:35 +08:00
d5e29d285d
fix gel Config error on android
2014-10-09 18:34:14 +08:00
a26e91f839
no message
2014-10-09 18:30:39 +08:00
b0d1fb79b3
call detach method on thread exit
2014-10-08 18:34:06 +09:00
8a4b8afc6c
Android: added support for building libcocos2d
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:35 +01:00
1a7ecbe427
Finalise Mac Support for cmake
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:19 +01:00
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
d9228d31c0
added support for static and shared builds on windows
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:18 +01:00
1ef0f41e0e
Changed WIN32 to _WIN32 to support gnu c++11
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:17:55 +01:00
21081b9e1a
use reference
2014-09-30 01:07:19 +08:00
240b922271
remove '../' at path on android.
...
because AAssetManager_open do not support '../' in path.
2014-09-29 19:31:05 +08:00
88679c2437
change tab to space
2014-09-29 18:44:01 +08:00
0cd2f985e8
Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug
...
fix egl config chooser bug
2014-09-29 18:24:19 +08:00
8a5829631d
Merge pull request #8171 from huangshiwu/v3_Teivaz
...
Enable screen orientation change handling - by Teivaz
2014-09-29 18:02:03 +08:00
0bfd934d03
CCPlatformMacros.h
...
Added std::nothrow for CREATE_FUNC.
2014-09-27 19:53:44 +08:00
24e5df1644
updated wp8 precompiled shaders
2014-09-26 12:16:16 -07:00
67377b7d46
added check for WINRT_NO_WINSOCK
2014-09-26 12:05:19 -07:00
ef58fa7fd4
fixed winrt file functions to pass app certification tests.
2014-09-26 11:38:17 -07:00
d7a5c464dd
remove test code
2014-09-26 16:37:05 +08:00
7cfcdc1af8
fix egl config chooser bug
2014-09-26 16:23:54 +08:00
7a2a44ad88
Enable screen orientation change handling - by Teivaz
2014-09-26 16:16:34 +08:00
d491d9e6db
Merge pull request #8149 from andyque/fixIOS8EditBox
...
fix ios8 EditBox orientation problem
2014-09-25 13:47:23 +08:00
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
34fbca9c50
fix ios8 EditBox orientation problem
2014-09-25 11:46:42 +08:00
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
79446999bb
Merge pull request #8116 from Dhilan007/v3-labelfix
...
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
2014-09-24 15:03:40 +08:00
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
2226aa5c8a
need to reset the accelerometer before trying to enable it again
2014-09-23 10:01:42 -07:00
6e91c65e74
Windows Phone 8 can now open URLs.
2014-09-22 17:47:38 +04:00
a9a0ff35f6
Added method for converting from std::string to Platform::String.
2014-09-22 17:47:38 +04:00
2255cf91ba
openUrl function for all platform but on windows RT empty function
2014-09-22 17:47:38 +04:00
ac916c3027
Cocos2d-x used a deprecated method to get the content size of a CCLabelTTF on iOS 7.
2014-09-22 18:01:13 +08:00
41b4ba8307
fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp
2014-09-22 09:42:33 +08:00
6569f1a7f0
Merge pull request #8108 from huangshiwu/v3_wp8test
...
fix wp8 directory control bug
2014-09-19 16:57:02 +08:00
f73f1a5379
fix wp8 directory control bug --modify
2014-09-19 16:52:11 +08:00
d42cec0708
fix wp8 directory control bug
2014-09-19 15:54:18 +08:00
05f0f71cc5
Update CCDevice-ios.mm
...
On iOS, Device::setKeepScreenOn(bool value) was ignoring the value and simply always disabling the timer.
2014-09-17 14:52:30 -04:00
ae5f6e63e5
optimize decompress jpg data and fix warnings
2014-09-16 21:55:05 +08:00
8de3657f3c
optimize decompress jpg data
...
it may be unnecessary copy jpg bytes one by one when decompress jpg data
2014-09-15 23:15:01 +08:00
68ab3082b4
fix warnings
2014-09-15 16:23:57 +08:00
9e8b32b3c4
fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work
...
isPopupNotify() doesn't work
2014-09-15 14:06:04 +08:00
0addaf3912
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix
2014-09-12 15:38:29 +08:00
f1f6373b6e
fix Cocos2dShaderCompile's compile error --use chipmunk static library
2014-09-12 15:29:10 +08:00
525fecc4ce
even more cmake fixes
2014-09-11 17:36:49 -07:00
f5cd48f154
Android properties back to 10
2014-09-09 18:46:47 -07:00
d5a6289a9b
compiles on wp8
2014-09-09 18:22:11 -07:00
6b4323642a
compiles on winphone8
2014-09-09 18:15:16 -07:00
fdabaa3082
Compiles on Android
2014-09-09 17:53:08 -07:00
0972506bf5
compiles and runs on linux
2014-09-09 17:41:49 -07:00
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
73450be715
compiles and runs in Linux
2014-09-09 17:11:06 -07:00
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
2014-09-09 12:18:31 -07:00
511ee30b6e
Move constructor from private to public
...
In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.
Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.
2014-09-09 11:34:48 +09:00
0fc1baee65
Merge pull request #7954 from huangshiwu/v3_wp8fix_pr
...
fix wp8 compile error and modify default resource path
2014-09-05 11:36:32 +08:00
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
61d1b67116
Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon
2014-09-04 18:17:05 +08:00
cbe357bbca
Merge pull request #7943 from Dhilan007/v3
...
fix compile error on android.
2014-09-04 13:43:39 +08:00
64d926a75f
fix compile error on android.
2014-09-04 11:04:50 +08:00
83719db8d4
Merge pull request #7934 from wohaaitinciu/loc_ver
...
fix: win32 cpp-tests sometimes cannot display font correctly
2014-09-04 10:49:30 +08:00
89ed897f47
getAllTouches() in GLView
2014-09-03 23:25:30 +04:00
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
ed849a1863
fix: win32 cpp-tests sometimes cannot display font correctly
...
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
2014-09-03 11:34:40 +08:00
8033b1f7bb
Merge branch 'v3' into mergeExtensionEditBox
2014-09-02 00:03:16 -07:00
8f11dd7f8b
Update CCGLViewImpl.cpp
...
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
2014-09-02 11:13:30 +08:00
aef0f5e729
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
bb85ecf0da
Merge pull request #7913 from chuanweizhang2013/v3fixed
...
make debug writable path the same as release
2014-09-01 10:15:52 +08:00
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
25a7f21056
make debug writable path the same as release
2014-08-29 17:27:55 +08:00
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
cf0baef7c0
add web view javascript support
2014-08-29 11:50:08 +08:00
cd031c4493
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
2014-08-29 10:25:24 +08:00
b8447baf73
Merge pull request #7893 from slackmoehrle/glview_fix
...
Glview fix
2014-08-28 10:10:17 +08:00
781b0bc478
properties revert back to 10
2014-08-27 16:35:13 -07:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
1b5413d8b4
comment out [glview release]; and [eaglview release];
2014-08-27 10:42:27 -07:00
d4d2b8c83e
comment out [glview release]; and [eaglview release];
2014-08-27 10:26:09 -07:00
3d97ddc739
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/ui/Android.mk
2014-08-27 14:08:16 +08:00
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
d290076917
invoke nativeOnPause after onSurfaceCreated is invoked
2014-08-27 10:13:03 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
15815118a2
finish android version
2014-08-26 16:53:37 +08:00
631e1a70c4
add WebView-inl.h and refactor Android code
2014-08-26 14:26:37 +08:00
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
7f57d15cb3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs
2014-08-22 11:04:13 +08:00
7dec715288
OpenGL context attributions setting revise
2014-08-22 10:55:39 +08:00
4563e65427
fix compiling error on android and fix some coding style
2014-08-21 15:41:05 +08:00
b349ce43ae
use macro to control whether to use jpeg, tiff, webp or not
2014-08-21 15:19:26 +08:00
2369a5900d
merge v3 to v3_glviewattrs
2014-08-21 10:18:55 +08:00
2a03bea1a4
OpenGL context attributions setting
2014-08-21 09:35:32 +08:00
d91dc842de
Merge pull request #7822 from Teivaz/v3_WP8
...
Added method for custom precompiled shader program loading in WP8
2014-08-20 11:22:26 +08:00
0e5a79d486
+ [WP8] Added method for custom precompiled shader program loading
2014-08-20 12:02:16 +03:00
07eb0d373c
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
cocos/ui/Android.mk
2014-08-20 09:32:29 +08:00
bfe6513706
setKeepScreenOn method
2014-08-19 15:00:58 +04:00
0e7ec265ee
* [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res"
2014-08-20 11:54:41 +03:00
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
b842c57954
Merge pull request #7794 from minggo/seperate-jpg-tiff-webp
...
Seperate jpg tiff webp
2014-08-15 15:24:09 +08:00
e59283343a
Merge pull request #7751 from zawasp/win32_minimize
...
add minimize / restore for desktop (win32, linux, mac)
2014-08-15 15:00:13 +08:00
bf75e9996a
separate jpeg, tiff and webp
2014-08-15 14:29:10 +08:00
1643c29a00
Merge pull request #7782 from liang8305/v3
...
mLastTickInNanoSeconds is the renderStart
2014-08-14 18:11:41 +08:00
3619fb943a
mLastTickInNanoSeconds is the renderStart
...
because:
this.mLastTickInNanoSeconds = renderEnd - renderInterval;
renderInterval = renderEnd - renderStart
so:
this.mLastTickInNanoSeconds = renderEnd - ( renderEnd - renderStart );
so:
this.mLastTickInNanoSeconds = renderStart ;
so:
no need nanoTime() twice
2014-08-14 17:07:04 +08:00
d9a0c6a2ad
replace tabs with spaces
2014-08-14 10:48:09 +03:00
e2d609c05d
add UITextField color & place hold color, fix double delete bug
2014-08-13 11:28:37 +08:00
cfafeb1e87
add minimize / restore for win32
2014-08-12 22:22:47 +03:00
bed1ccf0f3
Merge pull request #7733 from huangshiwu/v3_glviewfix
...
CCGLView modefy
2014-08-12 09:51:27 +08:00
77bc3a0e60
GLView modefy additional
2014-08-11 16:55:23 +08:00
1177b0d545
CCGLView modefy
2014-08-11 16:15:02 +08:00
5e1570e36e
Fix a correct onGLFWCharCallback
2014-08-10 01:42:21 +09:00
6ce16546b5
winrt compile fix -addtional
2014-08-08 10:47:14 +08:00
8ee4340db3
fix winrt complie error
2014-08-07 18:38:11 +08:00
b7aa046cd2
wp8 compile fix -additional
2014-08-07 14:09:22 +08:00
0016c7af70
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
2014-08-07 11:58:01 +08:00
24d68305e1
WP8 compile fix
2014-08-07 11:56:28 +08:00
a7d5b7af56
Merge pull request #7691 from Dhilan007/v3
...
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:52:59 +08:00
7b11c6a74e
Merge pull request #7237 from martell/v3
...
Cmake update and remove old scripts from build folder
2014-08-07 10:36:10 +08:00
4542b1882d
Merge pull request #7617 from rny/SpriteFrameCache
...
SpriteFrameCache load from plist file content data
2014-08-07 10:20:36 +08:00
9da4ba14f5
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:04:29 +08:00
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
771996f9f3
Added a function getAssetManager() on CCFileUtilsAndroid
2014-08-06 13:36:04 +09:00
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
efcb8b9962
wp8 glview hook solution 1
2014-08-04 14:17:14 +08:00
372479d812
wp8 GLView Hook
2014-08-02 16:31:16 +08:00
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
aebe8317bd
spaces
2014-07-29 17:22:13 +08:00
d5242ef4fa
add
...
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
2014-07-29 17:06:43 +08:00
191f7a57e1
Merge pull request #7078 from reckhou/v3
...
Optimize FPS control algorithm under Android.
2014-07-28 14:00:55 +08:00
9efbd6e4ef
Merge pull request #7600 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:34:13 +08:00
823bd437d8
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:14:11 +08:00
cf7de08f22
Merge pull request #7594 from boyu0/image_premulti_alpha_refactor
...
Image premultiplied alpha refactor
2014-07-28 11:02:33 +08:00
85b9765b8f
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
2014-07-28 10:38:22 +08:00
f7a08d5697
Fix the size of VideoPlayer is incorrect on android.
2014-07-28 10:09:46 +08:00
34a8d26124
Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image.
2014-07-25 18:19:04 +08:00
e3b79f4150
delete Image::_preMulti, Deprecate Image::isPremultipliedAlpha(), change Image::hasPremultipliedAlpha() meaning.
2014-07-25 18:01:32 +08:00
20e3a61524
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
...
mac custom font fix v2
2014-07-25 11:38:38 +08:00
98943b4517
Merge pull request #7548 from yongkangchen/v3
...
fix Label::setTextColor did not have any effect.
2014-07-25 11:18:10 +08:00
b0c922d91e
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Add new file&directory apis into FileUtils and test cases
2014-07-24 22:18:10 +08:00
44c675f9ee
Fix: Application::setAnimationInterval() not implemented.
2014-07-24 19:22:17 +08:00
ae56e637f8
allow setting bundle to use in file utils
2014-07-24 11:56:59 +01:00
9501b9912d
load font v2
2014-07-24 12:25:07 +04:00
59cbc153d4
Copyright & small fixes
2014-07-22 15:49:38 +04:00
9c0493d40b
mipmaps loading fix
2014-07-22 15:49:37 +04:00
600dbebfb0
pvr 2bpp decompression fixed
2014-07-22 15:49:37 +04:00
1a617ad804
pvr display fix pvr decompression on 64 bit platforms fix
2014-07-22 15:49:36 +04:00
2acce6771f
software per decompression support
2014-07-22 15:49:36 +04:00
8cc25f82e6
fix compiling error
2014-07-22 17:03:27 +08:00
bb7d6ba3d4
fix Label::setTextColor did not have any effect.
2014-07-22 14:52:41 +08:00
bc254cab25
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CocosStudioSurpport
2014-07-21 20:46:55 +08:00
3403182f3e
change define macros to avoid run error on mac 32 bit
2014-07-21 18:12:46 +08:00
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
d2c6602dea
Refactor #5580 : Merge createDirectories to createDirectory
2014-07-21 16:51:48 +08:00
45fa2363e8
Merge pull request #7517 from dabingnn/v3_dll
...
V3 dll
2014-07-21 11:53:36 +08:00
e128a432c1
Merge pull request #7521 from andyque/fixTextFieldDeleteBug
...
fix TextField backspace delete bug
2014-07-18 18:37:07 +08:00
73b38fbc6b
fix TextField backspace delete bug
2014-07-18 18:13:17 +08:00
aef1e01ce5
Merge pull request #7518 from natural-law/android-dependencies
...
Android dependencies
2014-07-18 17:57:42 +08:00
0be2210724
rename CGSize to NSSize
2014-07-18 16:51:29 +08:00
b614854cf9
Refactor #5580 : Improve createDirectories
2014-07-18 15:09:00 +08:00
8afd7614d1
Merge branch 'v3' into v3_dll
2014-07-18 14:01:17 +08:00
24462e1ded
updated wp8 precompiled shaders
2014-07-17 09:41:07 -07:00
867fb18c5d
Merge pull request #7503 from CaiCQ/v3
...
修正Linux下中文显示问题
2014-07-17 22:05:15 +08:00
51aba5dae4
fixed magic number.
2014-07-17 21:19:09 +08:00
229b30ed8b
Fixed VideoPlayer can't quitting the full screen mode by press the back key.
2014-07-17 21:10:26 +08:00
21b3e55339
Mac dylib version works now
2014-07-17 20:58:50 +08:00
2bda9f62a1
Merge branch 'v3' of github.com:CaiCQ/cocos2d-x into v3
2014-07-17 18:58:55 +08:00
cb3b9b8405
修正Linux下中文显示不全问题
2014-07-17 18:42:23 +08:00
3c6e87d34e
Merge branch 'v3' into v3_dll
...
Conflicts:
cocos/base/ccUtils.h
2014-07-17 14:12:10 +08:00
e58626c11c
Merge pull request #7476 from Dhilan007/v3-gc0717
...
Fixed bugs[Ouya controller]
2014-07-17 11:12:31 +08:00
1ff937aa48
Fixed bugs[Ouya controller]:
...
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
2014-07-17 11:09:08 +08:00
43fe305cc9
Merge pull request #7283 from taug/v3
...
could add seach path and resolution order path in front.
2014-07-17 10:34:45 +08:00
4c7d777f25
Merge pull request #7471 from visiblelight/wp8_shader_update
...
Wp8 shader update
2014-07-17 10:14:54 +08:00
c47d844d20
update the buildin shaders on WP8. Disable the effect 3d test.
2014-07-17 10:08:49 +08:00
a653d0eb28
Merge pull request #7440 from boyu0/add_utils_atof
...
Add utils::atof(), fix bug: particle not shown on android.
2014-07-17 09:59:15 +08:00
7e76b7b9a1
Remove prompt box of connect controller[Nibiru].
2014-07-16 14:48:22 +08:00
7e7c3a1e55
Merge branch 'v3' into android-dependencies
2014-07-16 13:49:20 +08:00
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +08:00
469dbea7da
window dll version work now
2014-07-14 14:40:47 +08:00
b3017fb773
fixed crash cause by incorrect font name.
2014-07-14 10:01:29 +08:00
b0c465d96b
Adjust the dependencies between modules on android.
2014-07-14 09:48:16 +08:00
bf4b376ae5
return correct language type
2014-07-12 20:40:15 +08:00
ecb915fabf
fix warnings
2014-07-11 17:39:56 +08:00
f205c0b704
Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build
...
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
2014-07-11 13:41:33 +08:00
6c37541657
Merge pull request #7363 from Dhilan007/v3-event-clear
...
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
d94941243a
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
2014-07-11 10:27:00 +08:00
dfbeb0fb63
Update Nibiru SDK and remove prompt box of install driver .
2014-07-10 22:33:58 +08:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
eba1735d04
Merge pull request #7347 from Dhilan007/v3-memory-leak
...
fixed memory leak cause by singleton.
2014-07-08 21:13:56 +08:00
c2474ea7c0
Merge pull request #7262 from pandamicro/origin_v3
...
Indicate correct button and cursor position infomation in mouse move event
2014-07-08 21:07:09 +08:00
d597a535c1
Refactor #5580 : Make isDirectoryExist support relative path
2014-07-08 18:26:11 +08:00
10defddc2e
fixed memory leak cause by singleton.
2014-07-08 18:22:48 +08:00
b0d260d293
Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9
...
Fix UITextField IME can't auto detach
2014-07-08 10:56:16 +08:00
6e2caf1c78
fixed can's set color for LabelTTF correctly on IOS.
2014-07-08 10:31:14 +08:00
d1034fdaae
1.fixed lose disconnected event.
...
2.fixed incorrect device name and device id;
2014-07-07 17:47:07 +08:00
68bd717ea7
issue #4689 : support external key.
2014-07-07 12:06:24 +08:00
992245e744
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
2014-07-04 15:29:40 +08:00
552a9251c4
issue #4689 : Refactor controller API.
2014-07-04 15:22:53 +08:00
1a089f4a18
Merge pull request #7286 from Dhilan007/v3-gc0702
...
fixed can't get valid value from trigger button.
2014-07-02 16:24:24 +08:00
097f782c38
remove ControllerAutoAdapter project.
2014-07-02 15:17:29 +08:00
adfc010555
fixed can't get valid value from trigger button[Moga]
2014-07-02 15:09:24 +08:00
c5dc7b9cd0
fixed can't get valid value from trigger button.
2014-07-02 14:19:10 +08:00
dd81e009f8
could add seach path and resolution order path in front.
2014-07-02 10:29:09 +08:00
0fbcbec9de
Add missing file for game controller support.
...
Fix using incorrect library project.
2014-07-01 16:44:10 +08:00
6654bf1129
Merge pull request #7265 from visiblelight/beta_test
...
Fix the crash when capturing screen on WP8
2014-07-01 16:19:45 +08:00
81df54b82e
Fixed #5635 : Correction of mouse event's cursor position
2014-07-01 15:14:41 +08:00
66673d88fa
split controller adapter[android]
2014-07-01 15:08:51 +08:00
abeeb9a0c7
fixing incorrect optimization
2014-07-01 14:57:10 +08:00
584e90c097
Rotate the frame buffer for WP8 during the snapshot
2014-07-01 14:48:43 +08:00
abfbc4bffb
Fixed #5632 : Indicate the correct button in mouse move event
2014-07-01 13:01:04 +08:00
afac6b86ff
move controller support to 'libcontrollerdeleate' project.
2014-06-30 18:41:47 +08:00
74579f19f5
issue #4895:Get events from controller to engine[android]
2014-06-30 03:23:51 +08:00
5ed581758e
issue #4895:Get events from controller to engine[android]
2014-06-30 03:20:22 +08:00
33e39b5786
added source files for component to be consistent with other platforms templates
2014-06-25 09:51:32 -07:00
8db7caff2a
Merge pull request #7050 from gin0606/videoPlayerIssue
...
Fix crash when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android
2014-06-25 17:56:03 +08:00
9d450d6513
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API
2014-06-24 14:57:12 +08:00
d5bed908d3
Refactor #5580 : Fix some issues
2014-06-24 14:51:01 +08:00
ee82e9aaba
Refactor #5580 : Fix Win32 compile issue
2014-06-23 11:13:33 +08:00
83c5b7bdb0
updated wp8 precompiled shaders
2014-06-20 09:07:29 -07:00
d90116a8da
Refactor #5580 : Add new file&directory apis into FileUtils
2014-06-20 18:01:34 +08:00
433dc140cd
CCLOGINFO compilation fix
2014-06-19 20:59:08 +04:00
e374bd67c7
Merge pull request #6946 from hanjukim/skip-utf8-bom
...
Skip UTF8 BOM if it exists and bug fix for unterminated string
2014-06-19 22:02:38 +08:00
79f82b00bc
Add new line at the end of a file to *.mm
2014-06-19 20:48:50 +09:00
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
753167b5f2
updated xaml resources
2014-06-16 09:25:35 -07:00
b66269d85d
Merge branch 'v3' into wp8-v3-template
2014-06-16 09:11:27 -07:00
bc5f4d9d59
Optimize FPS control algorithm under Android.
2014-06-16 16:05:40 +08:00
0b8e6a6a83
The filename should be converted to lower case before comparing.
2014-06-13 15:32:49 +08:00
2d913470a0
updated fast resume code for app
2014-06-12 16:36:53 -07:00
29b9da34ea
updated to latest version of Angle to fix memory leak when switching apps
2014-06-12 16:35:24 -07:00
b0bc971523
fixed reloading of cocos2d-x after app switch
2014-06-12 16:34:21 -07:00
2c5b449c9c
updated app name to App
2014-06-12 16:27:09 -07:00
80c5349d75
Fix crash when videoView to remove in android
2014-06-12 16:47:08 +09:00
b268536385
fixed typo.
2014-06-12 09:46:18 +08:00
63a68632a5
fixed calculating height of multi-line string was incorrect on IOS.
2014-06-11 21:49:08 +08:00
11919413c8
Fix UITextField IME can't auto detach
2014-06-10 14:53:27 +08:00
66c7b85134
fix issue on Xcode 6
2014-06-09 17:06:40 +08:00
bbff18c96f
add some comment
2014-06-06 12:09:39 +08:00
770d5e91b7
Update CCImage.cpp
2014-06-05 18:02:45 +03:00
5f74b8568d
Fix CCImage to be compatible with UNIX2003
...
Without this wrapper I get errors below.
Mac Os X 10.9.3 Xcode 6 beta(the same problem also exists in Xcode 5)
I found a solution at http://stackoverflow.com/questions/8732393/code-coverage-with-xcode-4-2-missing-files and added one more wrapping function.
Undefined symbols for architecture i386:
"_fwrite$UNIX2003", referenced from:
_unixErrorHandler in libcocos2dx iOS.a(tif_unix.o)
_unixWarningHandler in libcocos2dx iOS.a(tif_unix.o)
_empty_output_buffer in libcocos2dx iOS.a(jdatadst.o)
_term_destination in libcocos2dx iOS.a(jdatadst.o)
_Fax3PrintDir in libcocos2dx iOS.a(tif_fax3.o)
_PredictorPrintDir in libcocos2dx iOS.a(tif_predict.o)
"_strerror$UNIX2003", referenced from:
_TIFFOpen in libcocos2dx iOS.a(tif_unix.o)
ld: symbol(s) not found for architecture i386
clang: error: linker command failed with exit code 1 (use -v to see invocation)
2014-06-05 16:54:00 +03:00
2c9c94c4a9
Merge pull request #6954 from visiblelight/AlphaIssues
...
Make PNG files premultiplied alpha when loading
2014-06-04 10:04:20 +08:00
9e6304d84c
fixed EVENT_COME_TO_BACKGROUND has not been sent on android.
2014-06-03 18:10:22 +08:00
1c4838e7f0
we are only udpating PNG now.
2014-06-03 16:22:50 +08:00
0149fd81b5
no need for handling RAW_DATA
2014-06-03 15:19:01 +08:00
8af737739b
premultiplied alpha for PNG,TGA,WEBP,RAW_DATA
2014-06-03 15:06:15 +08:00
05b992c628
Bug fix
2014-05-31 00:13:08 +02:00
28b95bd54a
* Skip UTF8 BOM if it exists
...
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
2014-05-31 00:06:56 +02:00
e5cbe5439b
Merge pull request #6922 from zawasp/android_flicker
...
prevent flickering when opening another activity
2014-05-29 15:15:15 +08:00
23b7d76797
prevent flickering when opening another activity
2014-05-28 16:33:35 +03:00
2e7865a4f6
coding style fix
2014-05-28 17:41:34 +08:00
2e70380dd9
invalidate NSTimer instance in destroy to prevent memory leak
2014-05-28 15:19:07 +08:00
013b3a328f
remove keyboard notifications from NSNotificationCenter
2014-05-28 15:17:26 +08:00
a01315e2f5
Merge pull request #6726 from visiblelight/screenshot
...
Add a new utility function to snap the screen
2014-05-27 11:18:25 +08:00
626e0acb9d
Merge pull request #6848 from newnon/v3_android_jni_improvements
...
android jni error clear & more readable log
2014-05-27 10:40:59 +08:00
c72ae9e3c5
merge from the latest v3
2014-05-26 20:18:11 +08:00
eec7a81b02
Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100).
2014-05-22 16:24:29 +05:30
3b5417a325
Merge pull request #6854 from MSOpenTech/wp8-v3-fix
...
Wp8 v3 fix for precompiled shaders and precompiled headers
2014-05-21 14:31:18 +08:00
70346c4437
Merge branch 'v3_wp8fix' of https://github.com/Dhilan007/cocos2d-x into v3-wp8
2014-05-21 10:44:48 +08:00
c0798a3c0a
updated precompiled shaders for wp8
2014-05-20 10:06:02 -07:00
3db6856d27
added missing pch files for WP8
2014-05-20 07:48:42 -07:00
0efc070104
fixed shader compiler after cocos refactor
2014-05-20 07:48:12 -07:00
cd892abc77
android uni error clear & more readable log
2014-05-20 14:52:21 +04:00
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94#33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73#31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29#29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837ceahttps://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e#24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57#18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a#11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27#8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
2014-05-18 14:49:16 -07:00
ef700f2e3a
Fixes android build issues
...
also restores file for VS
2014-05-16 18:16:20 -07:00
a1243ca9ed
Squashed commit of the following:
...
commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:37:58 2014 -0700
little fixes in project
commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:33:11 2014 -0700
CopyTemplates working
commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:22:05 2014 -0700
Re-adds CopyTemplate to VS solution
commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 16:40:22 2014 -0700
Updated shaders
and project fixes
2014-05-16 17:38:52 -07:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
pandamicro