Ricardo Quesada
|
047025696c
|
Merge pull request #7680 from andyque/fixNormalizedPosition
fix normalizedPosition bug
|
2014-09-03 10:07:22 -07:00 |
andyque
|
58f219fc20
|
test extension::Scale9Sprite and remove unused file compile flags
|
2014-09-03 15:00:09 +08:00 |
minggo
|
b37ef4e1c3
|
remove unneeded files
|
2014-09-03 11:52:19 +08:00 |
minggo
|
eee9ac626a
|
Merge pull request #7815 from andyque/mergeExtensionEditBox
merge extension EditBox to ui module
|
2014-09-03 11:25:10 +08:00 |
andyque
|
b00a7b3b38
|
add Node normalizedPosition bug test
|
2014-09-03 09:16:31 +08:00 |
andyque
|
a79d35d08b
|
remove NodeNormalizedPositionTest
|
2014-09-03 09:16:31 +08:00 |
andyque
|
fab9a0052b
|
fix normalizedPosition bug
|
2014-09-03 09:16:31 +08:00 |
andyque
|
dafbf28283
|
fix release mode compile error
|
2014-09-02 16:42:23 +08:00 |
andyque
|
fadfa87afd
|
fix vs2013 compile error
|
2014-09-02 16:42:04 +08:00 |
andyque
|
c13e7b7224
|
Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox
|
2014-09-02 10:06:17 +08:00 |
andyque
|
6dc45f86e4
|
fix windows compile error
|
2014-09-02 10:05:22 +08:00 |
andyque
|
fa33ab76fc
|
remove UIEditBox test
|
2014-09-01 18:23:45 +08:00 |
andyque
|
e24192aeb2
|
fix linux compile
|
2014-09-01 18:06:21 +08:00 |
andyque
|
ffee7b27d4
|
fix linux and android compile error
|
2014-09-01 17:43:40 +08:00 |
andyque
|
85ce801fdd
|
remove ccscale9sprite , cceditBox
|
2014-09-01 17:06:22 +08:00 |
andyque
|
0076953f97
|
fix iOS compile error
|
2014-09-01 15:55:09 +08:00 |
andyque
|
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 |
Ricardo Quesada
|
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 |
Ricardo Quesada
|
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 |
andyque
|
cd031c4493
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
|
2014-08-29 10:25:24 +08:00 |
zhangbin
|
e24a903c88
|
Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.
|
2014-08-28 16:13:11 +08:00 |
minggo
|
6a8270f33b
|
Merge pull request #7900 from minggo/setposition-optimize
not create Vec as possible for setting position
|
2014-08-28 14:31:54 +08:00 |
minggo
|
681c3c06f1
|
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
stopAllActionsByTag && removeAllActionsByTag
|
2014-08-28 14:24:37 +08:00 |
minggo
|
2fd6cf8f43
|
fix compiling error
|
2014-08-28 13:59:56 +08:00 |
minggo
|
9fb977ff99
|
not create Vec as possible for setting position
|
2014-08-28 11:41:18 +08:00 |
Ricardo Quesada
|
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 |
Ricardo Quesada
|
dbdd2b3e13
|
Adds ClippingNode bug test case
|
2014-08-27 10:54:15 -07:00 |
andyque
|
3d97ddc739
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/ui/Android.mk
|
2014-08-27 14:08:16 +08:00 |
minggo
|
04bfbdd5a1
|
fix conflict
|
2014-08-27 13:50:01 +08:00 |
minggo
|
d0ca9a4da5
|
remove unneeded include header files
|
2014-08-27 13:39:50 +08:00 |
samuele3hu
|
33fd605a16
|
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
|
2014-08-27 10:18:44 +08:00 |
andyque
|
4597de069d
|
improve test case and make program more robust
|
2014-08-27 08:02:22 +08:00 |
andyque
|
84c5542a0e
|
Merge branch 'v3' into addWebView
|
2014-08-26 22:11:35 +08:00 |
andyque
|
9449152caf
|
finish WebView Tests
|
2014-08-26 22:03:55 +08:00 |
andyque
|
15815118a2
|
finish android version
|
2014-08-26 16:53:37 +08:00 |
andyque
|
e12db46866
|
fix style
|
2014-08-26 12:08:26 +08:00 |
andyque
|
2226d4b420
|
change WebView namespace and add WebViewTest
|
2014-08-26 11:39:56 +08:00 |
yangxiao
|
cff5b65314
|
Merge branch 'newcode' into v3
|
2014-08-25 21:20:49 +08:00 |
yangxiao
|
dd93439c4b
|
replace model
|
2014-08-25 19:25:51 +08:00 |
samuele3hu
|
07cf4d3526
|
Fix the win32 and android compile error
|
2014-08-25 14:10:13 +08:00 |
samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
samuele3hu
|
893e0b0a08
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-25 11:45:29 +08:00 |
yangxiao
|
8bfd56c080
|
use normal walk
|
2014-08-25 11:31:38 +08:00 |
minggo
|
e5ac6e204b
|
Merge pull request #7864 from minggo/module-devide
Module devide
|
2014-08-25 11:01:19 +08:00 |
minggo
|
74fc9931e7
|
fix compiling error of cpp-tests on linux
|
2014-08-24 19:12:36 -07:00 |
samuele3hu
|
1126e950b2
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases
|
2014-08-25 09:52:48 +08:00 |
samuele3hu
|
1b985db2ff
|
adjust android.mk for lua-tests
|
2014-08-25 09:49:16 +08:00 |
samuele3hu
|
25aab05b1f
|
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform
|
2014-08-25 09:48:14 +08:00 |
minggo
|
dcea3b6134
|
Merge pull request #7843 from huangshiwu/v3_glviewattrs
V3 glviewattrs
|
2014-08-25 09:46:19 +08:00 |
minggo
|
e7050486d3
|
fix conflict
|
2014-08-24 18:56:51 +08:00 |