minggo
|
9166b6430f
|
[ci skip]
|
2014-04-21 11:11:39 +08:00 |
minggo
|
1bde8a3e07
|
[ci skip]
|
2014-04-21 11:09:42 +08:00 |
minggo
|
65ffb5bb65
|
Merge pull request #6324 from kicktheken/develop
Fix lua project template crash on iOS5.1 device
|
2014-04-21 11:07:59 +08:00 |
chuanweizhang2013
|
1fe52b1557
|
translate
|
2014-04-21 11:07:14 +08:00 |
minggo
|
e3d7119716
|
Merge pull request #6326 from chuanweizhang2013/luaruntime
update android runtime
|
2014-04-21 11:06:30 +08:00 |
minggo
|
b43a051ef2
|
Merge pull request #6328 from natural-law/develop
Update the reference of submodule cocos2d-console.
|
2014-04-21 11:04:24 +08:00 |
minggo
|
fffef663a0
|
[ci skip]
|
2014-04-21 11:03:57 +08:00 |
minggo
|
1c44dbe385
|
Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios
closed #4904: fix ios Image::saveToFile crashes when save jpg file.
|
2014-04-21 11:02:11 +08:00 |
zhangbin
|
00910216b1
|
Update the reference of submodule cocos2d-console.
|
2014-04-21 11:01:39 +08:00 |
boyu0
|
4acba7bdfa
|
closed #4904: use new Xcode command line tools to compile i386 arch libjpeg.a file, and shrink the lib file.
|
2014-04-21 10:28:21 +08:00 |
boyu0
|
a1024353f1
|
issue #4904: fix iOS Image::safeToFile crashes when save jpg file.
|
2014-04-21 10:25:34 +08:00 |
Huabing.Xu
|
e74f8719cf
|
fix warning in compiling
|
2014-04-21 09:52:59 +08:00 |
Dale Stammen
|
9792a4708a
|
fixed curl DEBUGASSERT for release builds
|
2014-04-19 10:33:40 -07:00 |
Dale Stammen
|
29af6f6c7e
|
updated project settings
|
2014-04-19 10:13:12 -07:00 |
Dale Stammen
|
6646e6c860
|
input event refactor. console enabled for wp8
|
2014-04-19 10:12:34 -07:00 |
Dale Stammen
|
d235539b39
|
added missing include paths
|
2014-04-19 10:12:06 -07:00 |
Dale Stammen
|
8d6fe7be1a
|
added missing files
|
2014-04-19 10:11:44 -07:00 |
Dale Stammen
|
f71178bac5
|
added missing files
|
2014-04-19 10:11:18 -07:00 |
Dale Stammen
|
3930beda40
|
input event refactor. console enabled for wp8
|
2014-04-19 10:10:44 -07:00 |
Dale Stammen
|
617982cbe5
|
added missing projects. Fixed property sheets
|
2014-04-19 10:09:53 -07:00 |
Dale Stammen
|
4a7fa029cc
|
updated property sheet include paths and warnings
|
2014-04-19 10:09:10 -07:00 |
Dale Stammen
|
467ededeff
|
enabled console for wp8
|
2014-04-19 10:08:01 -07:00 |
Dale Stammen
|
b0adaee331
|
added missing WP8 device orientation
|
2014-04-19 10:06:27 -07:00 |
Dale Stammen
|
768e0bd53f
|
updated wp8 precompiled shaders
|
2014-04-19 10:05:21 -07:00 |
Dale Stammen
|
8f14597717
|
check if _currentUTF16String is null
|
2014-04-19 09:38:45 -07:00 |
Dale Stammen
|
9cf463bf6a
|
start of input queue support
|
2014-04-19 09:37:54 -07:00 |
Dale Stammen
|
12b01dcb25
|
input events refactor
|
2014-04-19 09:32:59 -07:00 |
Dale Stammen
|
1a56f435fe
|
added missing files
|
2014-04-19 09:32:12 -07:00 |
Dale Stammen
|
bebfe31b48
|
removed input files from refactor
|
2014-04-19 09:28:37 -07:00 |
Dale Stammen
|
66ed186a56
|
added missing files
|
2014-04-19 09:27:28 -07:00 |
Dale Stammen
|
f2b5d7c395
|
updated winrt project file
|
2014-04-19 09:26:52 -07:00 |
Dale Stammen
|
d19e898f21
|
removed ccset.h
|
2014-04-19 09:26:38 -07:00 |
Dale Stammen
|
4baa7ebacf
|
added CC_PLATFORM_WINRT
|
2014-04-19 09:25:54 -07:00 |
Dale Stammen
|
1403737d2d
|
added functions to display ip address of device
|
2014-04-19 09:12:20 -07:00 |
Dale Stammen
|
f233251f4f
|
added functions to display ip address of device
|
2014-04-19 09:12:04 -07:00 |
Dale Stammen
|
008bde1e27
|
fixed font path when fontname is empty string
|
2014-04-19 09:11:20 -07:00 |
Dale Stammen
|
b54a1064fd
|
fixed accelerometer for wp8
|
2014-04-19 09:10:34 -07:00 |
Kenneth Chan
|
a2fa6ef2d5
|
Fix lua project template crash on iOS5.1 device
|
2014-04-18 18:02:40 -07:00 |
Huabing.Xu
|
3b83d52f95
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
|
2014-04-19 00:30:34 +08:00 |
minggo
|
618e49cf86
|
[ci skip]
|
2014-04-18 17:12:32 +08:00 |
minggo
|
d8d847bd65
|
Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl
closed #4903: Build libcurl.a with openssl
|
2014-04-18 17:10:53 +08:00 |
boyu0
|
9756709473
|
closed #4903: change HttpClientTest get test 3 to https protocol.
|
2014-04-18 17:03:06 +08:00 |
James Chen
|
482fa3ece0
|
Update CHANGELOG [ci skip]
|
2014-04-18 16:53:18 +08:00 |
James Chen
|
0a1c926d10
|
Update CHANGELOG [ci skip]
|
2014-04-18 16:52:41 +08:00 |
James Chen
|
3b708f4e82
|
Merge pull request #6295 from samuele3hu/develop_fix
fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua
|
2014-04-18 16:50:57 +08:00 |
minggo
|
2aea2540b6
|
[ci skip]
|
2014-04-18 14:22:21 +08:00 |
minggo
|
5b4a65ea3a
|
[ci skip]
|
2014-04-18 14:21:06 +08:00 |
minggo
|
8e83cd7900
|
Merge pull request #6261 from iSevenDays/patch-9
Fix memory leak
|
2014-04-18 14:19:17 +08:00 |
cw
|
0f61481c40
|
add android runtime
|
2014-04-18 14:12:34 +08:00 |
minggo
|
051d4cf62d
|
[ci skip]
|
2014-04-18 14:02:26 +08:00 |