minggo
|
da29b92ff4
|
Merge pull request #8072 from Dhilan007/v3-audio903
move AudioEngine to cocos2d:experimental namespace
|
2014-09-16 17:12:03 +08:00 |
minggo
|
3de82474c0
|
SchedulerPauseResumeAll can not resume at 5s
|
2014-09-16 16:38:30 +08:00 |
huangshiwu
|
3907e5c1a2
|
fix ClippingNode's memory leak bug
|
2014-09-16 14:50:00 +08:00 |
Dhilan007
|
9942206c53
|
move AudioEngine in cocos2d:experimental namespace
|
2014-09-16 10:22:25 +08:00 |
minggo
|
27528f3e5f
|
Merge pull request #8061 from minggo/fix-cocostudio-test-crash
[ci skip]remove unneeded Android.mk
|
2014-09-15 22:53:18 +08:00 |
minggo
|
a61cda04ee
|
remove unneeded Android.mk
|
2014-09-15 22:47:44 +08:00 |
andyque
|
5f95ad221e
|
improve iOS WebView
|
2014-09-15 18:02:11 +08:00 |
minggo
|
68ab3082b4
|
fix warnings
|
2014-09-15 16:23:57 +08:00 |
minggo
|
7bb391ce55
|
Merge pull request #8033 from Dhilan007/v3-audio903
Lua bindings of AudioEngine.
|
2014-09-15 13:43:27 +08:00 |
Dhilan007
|
9cc9359b78
|
fix compile error
|
2014-09-15 11:16:27 +08:00 |
andyque
|
030fe34afa
|
fix UI related warnings
|
2014-09-15 11:13:56 +08:00 |
minggo
|
70f922d07a
|
Merge pull request #8030 from andyque/fixButtonScaleIssue
fix button scale issue
|
2014-09-15 09:49:06 +08:00 |
minggo
|
788f3c5c38
|
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
fix Editbox lua binding
|
2014-09-15 09:36:36 +08:00 |
andyque
|
7b0f41ed7b
|
remove auto scale text
|
2014-09-15 09:28:56 +08:00 |
Dhilan007
|
51e3b1af7b
|
Add lua test case of AudioEngine
|
2014-09-14 22:54:48 +08:00 |
Dhilan007
|
28af7999e5
|
update test case of AudioEngine
|
2014-09-14 22:49:27 +08:00 |
andyque
|
880929f102
|
fix button scale issue
|
2014-09-13 22:08:02 +08:00 |
andyque
|
02d2282b83
|
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
|
2014-09-12 17:07:06 +08:00 |
huangshiwu
|
0addaf3912
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix
|
2014-09-12 15:38:29 +08:00 |
minggo
|
55783b66c2
|
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
V3 drawnode prbk
|
2014-09-12 15:17:49 +08:00 |
huangshiwu
|
11d8829b3a
|
Deprecate DrawPrimitives and enhance DrawNode --little modify
|
2014-09-12 14:50:41 +08:00 |
andyque
|
c81cfc1ecf
|
fix text doesn't scale with button issue
|
2014-09-12 14:24:27 +08:00 |
andyque
|
ed22792a72
|
fix text only button issue
|
2014-09-12 13:50:13 +08:00 |
huangshiwu
|
6182a872c6
|
Deprecate DrawPrimitives and enhance DrawNode --more modify
|
2014-09-12 11:12:20 +08:00 |
huangshiwu
|
147bb7301b
|
fix wp8 compile error --add BillBoard and BillBoardTest
|
2014-09-12 09:33:30 +08:00 |
huangshiwu
|
8922121ed1
|
Deprecate DrawPrimitives and enhance DrawNode --make some modify
|
2014-09-12 07:33:34 +08:00 |
huangshiwu
|
d9634057ab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
|
2014-09-11 16:41:54 +08:00 |
yangxiao
|
5274b4f958
|
merge cocos resolve conflict
|
2014-09-11 16:02:07 +08:00 |
yangxiao
|
9901cad113
|
merge cocos
|
2014-09-11 15:55:00 +08:00 |
yangxiao
|
df9ab144fe
|
light work
|
2014-09-11 15:46:32 +08:00 |
huangshiwu
|
fb1d47900c
|
Deprecate DrawPrimitives and enhance DrawNode
|
2014-09-11 15:39:56 +08:00 |
yangxiao
|
3cfc36591c
|
merge cocos
|
2014-09-11 10:13:57 +08:00 |
yangxiao
|
bb6f5a6be5
|
Merge branch 'newcode' into billboard
|
2014-09-10 16:27:59 +08:00 |
Dhilan007
|
fc27c5e32a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-09-10 14:35:33 +08:00 |
minggo
|
46d4f487bb
|
Merge pull request #7978 from super626/v3
Calculate Content Size for Sprite3D
|
2014-09-10 14:06:47 +08:00 |
yangxiao
|
a980a2efa4
|
merge cocos
|
2014-09-10 10:28:59 +08:00 |
andyque
|
acae8a2535
|
Merge branch 'v3' into addChipmunkStaticLib
Conflicts:
CMakeLists.txt
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
cocos/CMakeLists.txt
|
2014-09-10 10:00:15 +08:00 |
Ricardo Quesada
|
f5cd48f154
|
Android properties back to 10
|
2014-09-09 18:46:47 -07:00 |
Ricardo Quesada
|
4d57e991ea
|
Compiles in Win32
|
2014-09-09 18:07:24 -07:00 |
Ricardo Quesada
|
6f3ca63f00
|
Moved base/CCPlatform* -> platform/CCPlatform*
|
2014-09-09 17:17:07 -07:00 |
Ricardo Quesada
|
9082ca18c3
|
Platform fixed
|
2014-09-09 16:50:02 -07:00 |
Ricardo Quesada
|
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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
songchengjiang
|
4099015421
|
Sprite3D set default _contentSize by AABB
|
2014-09-09 17:47:34 +08:00 |
songchengjiang
|
117c38f806
|
Sprite3DHitTest use AABB testing
|
2014-09-09 17:05:33 +08:00 |
yangxiao
|
cf9094207a
|
merge cocos
|
2014-09-09 16:00:55 +08:00 |
andyque
|
6a4397a3eb
|
change toolset from 12.0 to 4.0
|
2014-09-09 15:57:21 +08:00 |
Dhilan007
|
6697989174
|
Update test case of AudioEngine.
|
2014-09-09 10:48:07 +08:00 |
yangxiao
|
a295159a3a
|
Merge branch 'newcode' into transition
|
2014-09-09 10:37:08 +08:00 |
Dhilan007
|
1b96b2ac87
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
|
2014-09-09 10:32:56 +08:00 |
andyque
|
59dc56bfcb
|
remove chipmunk dependency
|
2014-09-05 21:59:30 +08:00 |
huangshiwu
|
01358f0b62
|
fix wp8 compile error and modify default resource path
|
2014-09-05 15:43:08 +08:00 |
yangxiao
|
730ab846c3
|
code adjustment
|
2014-09-05 14:59:14 +08:00 |
huangshiwu
|
7372604f7f
|
fix wp8 compile error and modify default resource path
|
2014-09-05 11:21:08 +08:00 |
Dhilan007
|
6b4b5ed943
|
Refactoring API:
1.Remove Singleton Pattern
2.Make AudioProfile clear.
|
2014-09-05 11:13:51 +08:00 |
yangxiao
|
8da7a4b2de
|
merge cocos reslove conflict
|
2014-09-04 17:40:14 +08:00 |
yangxiao
|
a5e1e692e8
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
|
2014-09-04 17:00:49 +08:00 |
liuliang
|
c42bef1f02
|
Add a bulletin board test example
|
2014-09-04 16:58:00 +08:00 |
yangxiao
|
d114e11a0b
|
android, linux and lua
|
2014-09-04 16:45:42 +08:00 |
yangxiao
|
ed63f01c7e
|
seperate billboard test from Sprite3D test
|
2014-09-04 16:27:18 +08:00 |
minggo
|
6539ff293d
|
Merge pull request #7940 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-04 13:41:15 +08:00 |
Ricardo Quesada
|
047025696c
|
Merge pull request #7680 from andyque/fixNormalizedPosition
fix normalizedPosition bug
|
2014-09-03 10:07:22 -07:00 |
Dhilan007
|
a352a10d38
|
Add test case for new audio engine.
|
2014-09-03 18:20:31 +08:00 |
XiaoYang
|
58f4e84b9a
|
Merge pull request #126 from songchengjiang/billboard
Billboard
|
2014-09-03 18:12:08 +08:00 |
songchengjiang
|
68ce6449e8
|
repaired camera orientation
Testing RotateBy action
|
2014-09-03 17:17:57 +08:00 |
yangxiao
|
bb90fe48ef
|
merge cocos
|
2014-09-03 16:54:17 +08:00 |
yangxiao
|
1bd09f21d0
|
merge cocos
|
2014-09-03 15:42:58 +08:00 |
andyque
|
58f219fc20
|
test extension::Scale9Sprite and remove unused file compile flags
|
2014-09-03 15:00:09 +08:00 |
andyque
|
2e27a6865f
|
update project to vs2013
|
2014-09-03 14:10:38 +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 |
yangxiao
|
8dff467b27
|
Merge branch 'newcode' into transition
|
2014-09-03 09:15:12 +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 |
songchengjiang
|
18d06015c6
|
Added More Models
Code optimization
|
2014-09-02 11:24:19 +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 |
yangxiao
|
538fe2e543
|
Merge branch 'newcode' into transition
|
2014-09-01 15:14:30 +08:00 |
songchengjiang
|
3f8b430b3e
|
deleted Meshcommand
|
2014-09-01 09:33:08 +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 |
yangxiao
|
a039d6b0fc
|
animate3d transition
|
2014-08-29 18:25:42 +08:00 |
songchengjiang
|
9f715e4e00
|
Added Sprite3D Model
|
2014-08-29 18:18:19 +08:00 |
songchengjiang
|
8d971054f2
|
Android -p 10
|
2014-08-29 18:02:17 +08:00 |
songchengjiang
|
0d75998027
|
pressure test
|
2014-08-29 17:58:20 +08:00 |
songchengjiang
|
4aa4287d28
|
test on Android
|
2014-08-29 17:29:15 +08:00 |
songchengjiang
|
34070677ad
|
Added testing Model Number
|
2014-08-29 17:11:18 +08:00 |
songchengjiang
|
71d722854c
|
added mesh command
|
2014-08-29 12:08:28 +08:00 |
songchengjiang
|
701d70fb6c
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-29 10:58:04 +08:00 |
andyque
|
cd031c4493
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
|
2014-08-29 10:25:24 +08:00 |
songchengjiang
|
f5ea9a2219
|
tab format
|
2014-08-29 09:33:28 +08:00 |
songchengjiang
|
06e3eb955f
|
repaired BillBoard Depth Test
|
2014-08-29 09:30:59 +08:00 |
songchengjiang
|
ac8158c60b
|
Tab Format
|
2014-08-29 09:14:54 +08:00 |
songchengjiang
|
e16fb5977e
|
Finished BillBorad
|
2014-08-29 09:14:22 +08:00 |
songchengjiang
|
e6f055f3fd
|
calculated Z in View
Transparent Render
|
2014-08-28 19:22:01 +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 |
songchengjiang
|
014ba0d12e
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new
|
2014-08-28 10:17:32 +08:00 |
songchengjiang
|
5067741140
|
Deleted Plane Model
|
2014-08-28 10:16:15 +08:00 |
yangxiao
|
d0943afb62
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
|
2014-08-28 09:24:04 +08:00 |
yangxiao
|
74f98b36d6
|
merge cocos
|
2014-08-28 09:22:57 +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 |
songchengjiang
|
26dc7de802
|
Repaired Light Shader BUG On ios
|
2014-08-27 21:03:52 +08:00 |
songchengjiang
|
731d1165c3
|
Spot Light Shader optimization
|
2014-08-27 17:09:20 +08: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 |
yangxiao
|
c5515874d5
|
merge cocos
|
2014-08-27 11:00:14 +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 |
yangxiao
|
7d6b8ea706
|
merge cocos
|
2014-08-26 14:58:58 +08:00 |
yangxiao
|
03390a4f46
|
merge cocos
|
2014-08-26 14:05:59 +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 |
songchengjiang
|
3d59aaf86e
|
Replaced Tab Format
|
2014-08-26 09:43:11 +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 |
songchengjiang
|
00085c157f
|
Added skeleton Model
Light On/Off
|
2014-08-25 16:32:15 +08:00 |
samuele3hu
|
07cf4d3526
|
Fix the win32 and android compile error
|
2014-08-25 14:10:13 +08:00 |
songchengjiang
|
1a1ccda3ed
|
repaired Action BUG
|
2014-08-25 13:58:15 +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 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
minggo
|
0701fe1dfb
|
Merge pull request #7853 from super626/v3
Better reskin model support
|
2014-08-22 19:18:47 +08:00 |
huangshiwu
|
07af58c0c2
|
OpenGL context attributions setting revise -2
|
2014-08-22 16:22:16 +08:00 |
yangxiao
|
1db3d14896
|
reset bone number to 60, put test in alphabetical order
|
2014-08-22 16:06:36 +08:00 |
yangxiao
|
1938817187
|
reset girl name
|
2014-08-22 14:24:40 +08:00 |
samuele3hu
|
70cba1f64a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
cocos/Android.mk
|
2014-08-22 14:01:17 +08:00 |
minggo
|
aba973b1ea
|
Merge pull request #7834 from andyque/improveUI
add click event listener to all Widget classes
|
2014-08-22 14:00:10 +08:00 |
yangxiao
|
d90572fc10
|
engine refactor hide concept of submesh
|
2014-08-22 13:52:03 +08:00 |
samuele3hu
|
1bda276392
|
Update android.mk for related cpp test cases
|
2014-08-22 13:49:54 +08:00 |
samuele3hu
|
2f60e610a2
|
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
|
2014-08-22 13:49:21 +08:00 |
minggo
|
a0b19db670
|
Merge pull request #7840 from minggo/fix-warning
fix warnings
|
2014-08-22 13:41:31 +08:00 |
minggo
|
0c9c873edb
|
Merge pull request #7846 from andyque/addUILuaBindings
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
|
2014-08-22 13:40:02 +08:00 |
yangxiao
|
2d5431353a
|
engine adjust
|
2014-08-22 13:25:26 +08:00 |
andyque
|
13003fe0a6
|
add deprecated options for ui, add Scale9Sprite bindings
|
2014-08-22 11:56:13 +08:00 |
andyque
|
84cf0ee834
|
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
|
2014-08-22 11:49:39 +08:00 |
huangshiwu
|
7dec715288
|
OpenGL context attributions setting revise
|
2014-08-22 10:55:39 +08:00 |
minggo
|
2afbc7a698
|
fix warnings
|
2014-08-21 16:21:23 +08:00 |
songchengjiang
|
5bad6e216b
|
Added No Normal Shader
|
2014-08-21 10:33:16 +08:00 |
andyque
|
3f51926c5d
|
add click event listener to Widget
|
2014-08-21 10:21:07 +08:00 |
huangshiwu
|
2369a5900d
|
merge v3 to v3_glviewattrs
|
2014-08-21 10:18:55 +08:00 |
yangxiao
|
c26a81bb55
|
Merge branch 'newcode' into v3
|
2014-08-21 09:53:06 +08:00 |
huangshiwu
|
2a03bea1a4
|
OpenGL context attributions setting
|
2014-08-21 09:35:32 +08:00 |
yangxiao
|
bd4aec4bcd
|
support multi-attribs
|
2014-08-20 18:20:19 +08:00 |
songchengjiang
|
26cb5d8bae
|
Replace Tab Format
|
2014-08-20 16:43:01 +08:00 |
songchengjiang
|
3a1c0583fb
|
optimization
|
2014-08-20 16:41:45 +08:00 |
andyque
|
2d8bec2ba9
|
remove Extension EditBox
|
2014-08-20 16:20:57 +08:00 |
songchengjiang
|
8b5bd3dbb6
|
Repaired the errors of Shader PassValue On Android
Light modification
|
2014-08-20 16:20:22 +08:00 |
andyque
|
46f3ab9b57
|
add Scale9Sprite to create method of ui::EditBox
|
2014-08-20 16:08:28 +08:00 |
andyque
|
34629f1014
|
fix windows & win8 & wp8 compile error
|
2014-08-20 12:02:12 +08:00 |
liuliang
|
a27a420a91
|
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
Conflicts:
cocos/3d/CCSprite3D.cpp
|
2014-08-20 11:45:48 +08:00 |
andyque
|
07eb0d373c
|
Merge branch 'v3' into mergeExtensionEditBox
Conflicts:
cocos/ui/Android.mk
|
2014-08-20 09:32:29 +08:00 |
songchengjiang
|
58abc4c08f
|
Light Shader modification for Android
|
2014-08-19 19:24:19 +08:00 |
andyque
|
a8ab1a85b7
|
fix linux compile error
|
2014-08-19 17:42:17 +08:00 |
Sergey
|
b7fa3624cf
|
stopAllActionsByTag test
|
2014-08-19 13:31:19 +04:00 |
songchengjiang
|
4cf1c6a47c
|
deleted redundant code
Replace Tab Format
|
2014-08-19 16:32:49 +08:00 |
songchengjiang
|
d9bf2c2b7e
|
Finished Light And Test
|
2014-08-19 15:51:30 +08:00 |
minggo
|
cdd67be77a
|
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
|
2014-08-19 15:29:40 +08:00 |
yangxiao
|
54423efe9f
|
fix reskin
|
2014-08-19 15:25:00 +08:00 |
andyque
|
534938d88c
|
fix linux compile error
|
2014-08-19 15:17:48 +08:00 |
XiaoYang
|
9f444b7010
|
Merge pull request #104 from liuliang2004/Meshv3
Modification is compatible with the old model
|
2014-08-19 14:32:05 +08:00 |
liuliang
|
94be97f724
|
Modify change interface
|
2014-08-19 14:30:27 +08:00 |
liuliang
|
06dfaf9db5
|
Modify change interface
|
2014-08-19 14:21:48 +08:00 |
liuliang
|
9d3bab3810
|
Modification is compatible with the old model
|
2014-08-19 14:03:41 +08:00 |
songchengjiang
|
680f089ae1
|
Shader: Light struct modification
|
2014-08-19 13:54:30 +08:00 |
andyque
|
8d1c422ac5
|
merge extension EditBox to ui module
|
2014-08-19 10:28:24 +08:00 |
minggo
|
38fdef614a
|
Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
add swallow touch and propagation to parent widgets customization
|
2014-08-18 23:16:22 +08:00 |
songchengjiang
|
9603366fcb
|
Fixed Android compiled Problem
|
2014-08-18 18:05:13 +08:00 |
yangxiao
|
3fd122391c
|
reset sprite3dtest
|
2014-08-18 18:01:57 +08:00 |
songchengjiang
|
10afb9b9af
|
Finished Point Light
Finished Directional Light
Finished Spot Light
|
2014-08-18 17:10:07 +08:00 |
samuele3hu
|
e0168c373c
|
Add manual lua bindings for 3d and adjust related test case on different platform
|
2014-08-18 15:04:32 +08:00 |
yangxiao
|
79a55286ce
|
refactor to new model
|
2014-08-18 11:13:08 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
songchengjiang
|
9b3a02f350
|
Added Light Test
Added Point Light
|
2014-08-17 21:33:33 +08:00 |
yangxiao
|
7159914248
|
old model work
|
2014-08-16 16:56:04 +08:00 |
songchengjiang
|
2b1efc59cb
|
GLProgram Added Light Shader
GLProgram Added Normal Matrix
|
2014-08-15 19:15:14 +08:00 |
songmiao
|
08a4ebba06
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
|
2014-08-15 17:43:04 +08:00 |
andyque
|
0517ceb0dc
|
add scrollView nested tests
|
2014-08-15 16:21:27 +08:00 |
songmiao
|
361770e0f3
|
add BillBorad and BillBoardTest
|
2014-08-15 16:15:29 +08:00 |
minggo
|
f2f8035724
|
Merge pull request #7708 from super626/obb
AABB, OBB
|
2014-08-15 15:32:14 +08:00 |
andyque
|
0e637b4d9f
|
add swallow touch and propagation customization to UIWidgets
|
2014-08-15 15:28:28 +08:00 |
minggo
|
8364e179a4
|
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
add customization to UIButton and UIPageView
|
2014-08-15 15:16:12 +08:00 |
songchengjiang
|
1e9c02dfa3
|
Added Light Class
|
2014-08-15 14:51:23 +08:00 |
minggo
|
38fb58cf29
|
Merge pull request #7792 from minggo/fix-warning
fix warnings
|
2014-08-15 13:33:08 +08:00 |
minggo
|
db17084b6d
|
fix warnings
|
2014-08-15 12:06:16 +08:00 |
yangxiao
|
2786e63824
|
Merge branch 'newcode' into obb
|
2014-08-14 18:58:46 +08:00 |
minggo
|
3f2fccb999
|
Merge pull request #7771 from samuele3hu/v3_3_module
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 18:33:53 +08:00 |
yangxiao
|
ab783d2702
|
merge cocos2d
|
2014-08-14 17:12:39 +08:00 |
minggo
|
ae11f24cc8
|
Merge pull request #7779 from dabingnn/v3_fixSkinnedOutline
V3 fix skinned outline
|
2014-08-14 11:26:35 +08:00 |
andyque
|
18851d3e81
|
add customization to UIButton and UIPageView
|
2014-08-14 11:14:24 +08:00 |
Huabing.Xu
|
a9a403013c
|
fix skinned outline effect
|
2014-08-14 10:44:03 +08:00 |
Huabing.Xu
|
5d49afec0e
|
fix ios running error
|
2014-08-14 10:04:01 +08:00 |
minggo
|
a88504b153
|
Merge pull request #7756 from andyque/fixTestCase
fix custom particle tests position
|
2014-08-14 09:44:16 +08:00 |
minggo
|
0b86e129b0
|
Merge pull request #7762 from andyque/addAlignmentToUILabel
add UITextField color & place hold color, fix double delete bug
|
2014-08-14 09:38:57 +08:00 |
samuele3hu
|
032f5ea781
|
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 00:06:28 +08:00 |
yangxiao
|
6ce3b5c20a
|
add mirror test
|
2014-08-13 17:38:16 +08:00 |
andyque
|
e2d609c05d
|
add UITextField color & place hold color, fix double delete bug
|
2014-08-13 11:28:37 +08:00 |
minggo
|
d223629477
|
Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture
add callback for RenderTexture::saveToFile
|
2014-08-13 10:05:08 +08:00 |
andyque
|
e269ad49c1
|
fix custom particle tests position
|
2014-08-13 09:56:37 +08:00 |
minggo
|
cc37780861
|
Merge pull request #7736 from dabingnn/v3_addSkinnedOutline
V3 add skinned outline
|
2014-08-12 15:07:21 +08:00 |
boyu0
|
e4bb0ad3c8
|
fix some merge errors.
|
2014-08-12 11:39:56 +08:00 |
boyu0
|
5a2564755c
|
change NULL->nullptr
|
2014-08-12 11:29:37 +08:00 |
Huabing.Xu
|
3a7b673164
|
add callback for RenderTexture::saveToFile
|
2014-08-12 10:50:57 +08:00 |
boyu0
|
790ef9e818
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
Conflicts:
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
|
2014-08-12 10:20:34 +08:00 |
Huabing.Xu
|
e387caf763
|
add create(modelPath) interface for EffectSprite3D
|
2014-08-12 09:56:25 +08:00 |
Huabing.Xu
|
0dff45cfc2
|
adjust SkinnedEffectCode
|
2014-08-12 09:51:03 +08:00 |
Huabing.Xu
|
e66d1f6f69
|
add skinned outline effect
|
2014-08-11 18:11:15 +08:00 |
minggo
|
b34e97cfd6
|
Merge pull request #7729 from andyque/fixCascadedColor
fixed Widget's Children reload textures change RGBA issue
|
2014-08-11 15:33:36 +08:00 |
andyque
|
cdb2b9f59f
|
fixed Widget's Children reload textures change RGBA issue
|
2014-08-11 15:04:00 +08:00 |
minggo
|
43a3603a8b
|
Merge pull request #7720 from samuele3hu/v3_module
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
|
2014-08-11 15:01:28 +08:00 |
samuele3hu
|
3c3c05204f
|
Split files in lua-bindings/script into different module and adjust related project
|
2014-08-11 12:54:30 +08:00 |
yangxiao
|
6d15c26a61
|
move create default camera to Scene::initWithSize
|
2014-08-11 10:55:14 +08:00 |
samuele3hu
|
47c034af5d
|
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
|
2014-08-11 10:25:40 +08:00 |
yangxiao
|
933439c6ca
|
fix linux
|
2014-08-09 09:27:48 +08:00 |
yangxiao1
|
014b6d06e4
|
Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb
|
2014-08-08 18:26:34 +08:00 |
yangxiao1
|
e904ee646a
|
windows work
|
2014-08-08 18:25:36 +08:00 |
yangxiao
|
6d5b63ec6a
|
Merge branch 'obb' of https://github.com/super626/cocos2d-x into obb
|
2014-08-08 18:15:01 +08:00 |
yangxiao
|
504ef32b97
|
linux
|
2014-08-08 18:14:41 +08:00 |
Huabing.Xu
|
7e1adeb3e9
|
add new test case
|
2014-08-08 18:01:36 +08:00 |
lvlong
|
8101e2ff1a
|
1. move drawnode3d to Sprite3DTest
2. add getAABB to sprite3D and mesh
|
2014-08-08 17:54:39 +08:00 |
samuele3hu
|
2dacbf6f26
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
|
2014-08-08 16:59:33 +08:00 |
samuele3hu
|
2ffc0e2e53
|
Modify the mechanism that files copy to lua-empty-test and lua-template
|
2014-08-08 16:56:22 +08:00 |
yangxiao
|
ceb6549ec8
|
merge cocos2d
|
2014-08-08 16:25:52 +08:00 |
minggo
|
213f2f5a6c
|
Merge pull request #7702 from super626/v3_merge
Camera and Camera test
|
2014-08-08 15:56:38 +08:00 |
samuele3hu
|
00865c8abb
|
Modify the mechanism that files copy to lua-empty-test and lua-template
|
2014-08-08 15:22:12 +08:00 |
yangxiao
|
7408250113
|
add drawline
|
2014-08-08 15:01:24 +08:00 |
andyque
|
d00e3349a3
|
fixed loadingBar change direction affect position issue
|
2014-08-08 11:17:17 +08:00 |
lvlong
|
28769c9b15
|
add obb sample
|
2014-08-08 11:16:33 +08:00 |
yangxiao
|
3c9483899e
|
camera, cameratest, drawNode3D squash
|
2014-08-07 15:23:31 +08:00 |
samuele3hu
|
cf0aa36c15
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
|
2014-08-07 14:02:50 +08:00 |
samuele3hu
|
aa4f407851
|
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
|
2014-08-07 13:53:13 +08:00 |
minggo
|
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 |
minggo
|
4542b1882d
|
Merge pull request #7617 from rny/SpriteFrameCache
SpriteFrameCache load from plist file content data
|
2014-08-07 10:20:36 +08:00 |
martell
|
75911658aa
|
Make CMake More Robust
|
2014-08-06 15:43:19 +01:00 |
samuele3hu
|
0daa30419b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
|
2014-08-06 00:37:19 +08:00 |
samuele3hu
|
99c52f0102
|
Split module for Linux on Lua and adjust related test cases
|
2014-08-06 00:15:44 +08:00 |
samuele3hu
|
d86a37110d
|
Split module for win32 and adjust related test cases
|
2014-08-05 19:46:13 +08:00 |
samuele3hu
|
da18657f4f
|
Add module Android.mk config and adjust related test cases
|
2014-08-05 13:29:54 +08:00 |
minggo
|
cc75a8e860
|
Merge pull request #7632 from super626/v3
SubMesh and AttachMement
|
2014-08-05 09:59:38 +08:00 |
andyque
|
f44906d56c
|
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
|
2014-08-05 08:11:37 +08:00 |
samuele3hu
|
cd0c82f8b7
|
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
|
2014-08-04 17:11:57 +08:00 |
yangxiao
|
11a13ce9e2
|
Merge branch 'newcode' into v3
|
2014-08-04 15:41:21 +08:00 |
samuele3hu
|
e5f9c1b488
|
Adjust common script and related test cases
|
2014-08-04 15:22:07 +08:00 |
yangxiao
|
4452d9579a
|
merge cocos2d, fix lua
|
2014-08-04 12:07:27 +08:00 |
samuele3hu
|
6f4cafcc1b
|
Add module register functions and adjust iOS and Mac test cases
|
2014-08-04 09:39:42 +08:00 |
andyque
|
5af4657fbb
|
fix windows utf8 source code file can not compile erorr
|
2014-08-01 21:20:27 +08:00 |
huangshiwu
|
575c9787c0
|
Merge branch 'v3' into v3_pr
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-01 15:11:34 +08:00 |
Ningyu
|
137de84b05
|
add test case
|
2014-08-01 14:39:45 +08:00 |
yangxiao
|
e03d284e26
|
merge cocos2d
|
2014-07-31 18:55:41 +08:00 |
samuele3hu
|
2b562ace1a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
|
2014-07-31 17:22:33 +08:00 |
minggo
|
2851bd9193
|
Merge pull request #7627 from andyque/fixScale9Sprite
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
|
2014-07-31 16:58:56 +08:00 |
samuele3hu
|
a47e52b5bc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-07-31 15:22:46 +08:00 |
samuele3hu
|
9666f1ad7f
|
Split luabindings module to some independent modules
|
2014-07-31 15:20:23 +08:00 |
minggo
|
0e7eb3614e
|
Merge pull request #7618 from dabingnn/v3_buildAllTarget
add target to build All target
|
2014-07-31 14:25:37 +08:00 |
minggo
|
a77b8e7320
|
Merge pull request #7608 from andyque/fixTextFieldUtf8Issue
add utf8 support for TextField widget
|
2014-07-31 13:41:57 +08:00 |
yangxiao
|
cd379ab412
|
add axe model
|
2014-07-31 11:26:27 +08:00 |
andyque
|
1de2b78d61
|
refactor, optimize Scale9Sprite
|
2014-07-31 11:07:20 +08:00 |
yangxiao
|
44c501ca2a
|
merge cocos2d
|
2014-07-31 09:56:23 +08:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
Huabing.Xu
|
65775f2d30
|
remove CC_CONSTUCTOR_ACCESS fow win32 release
|
2014-07-30 16:39:21 +08:00 |
Huabing.Xu
|
428e9b1b1a
|
Merge branch 'v3' into v3_buildAllTarget
|
2014-07-30 14:12:28 +08:00 |
andyque
|
f2b0528cc9
|
refactor
|
2014-07-30 10:45:35 +08:00 |
andyque
|
7abea5dc58
|
add utf8 support for UITextField
|
2014-07-30 10:34:37 +08:00 |
andyque
|
955da5d3cc
|
move utf8_substr to ui::helper class.
|
2014-07-30 10:34:37 +08:00 |
Huabing.Xu
|
d86cc0a811
|
decouple libcocos2d and cocosdenshion
|
2014-07-29 18:08:40 +08:00 |
andyque
|
5a22636441
|
fix windows compile error
|
2014-07-29 17:51:34 +08:00 |
andyque
|
c5ca0dbf10
|
fix android and linux compile error
|
2014-07-29 16:24:27 +08:00 |
andyque
|
1daaea1410
|
remove extension::Scale9Sprite dependency
|
2014-07-29 16:24:27 +08:00 |
andyque
|
ebf05d1acc
|
add UIScale9Sprite tests
|
2014-07-29 16:24:27 +08:00 |
minggo
|
5d63ce17ad
|
Merge pull request #7610 from dabingnn/v3_windowChangeModule
V3 window change module
|
2014-07-29 14:29:01 +08:00 |
Huabing.Xu
|
c722c0fcd0
|
libcocostudio for windows
|
2014-07-29 11:31:37 +08:00 |
boyu0
|
1b6cda488a
|
add ParticleResetTotalParticles test.
|
2014-07-29 11:21:11 +08:00 |
Huabing.Xu
|
d53ce4d664
|
libcocosbuilder rename for windows
|
2014-07-29 11:09:17 +08:00 |
Huabing.Xu
|
6d0b8852d1
|
libSpine rename for windows
|
2014-07-29 10:53:39 +08:00 |
yangxiao
|
da4ba95806
|
SubMesh and Attachment
|
2014-07-29 10:49:06 +08:00 |
Huabing.Xu
|
aaa65dcae4
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-29 10:20:23 +08:00 |
Huabing.Xu
|
eacf003eed
|
change libExtensions for windows
|
2014-07-29 10:07:46 +08:00 |
Huabing.Xu
|
d6bc2f4998
|
liuGUI->libui for windows
|
2014-07-28 22:12:07 +08:00 |
Huabing.Xu
|
c6956504bf
|
change CocosDenshion to libcocosdenshion
|
2014-07-28 21:35:16 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
minggo
|
b2e705acd8
|
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
fix remove self in Widget touch callback issue
|
2014-07-28 14:04:20 +08:00 |
Huabing.Xu
|
2795c10627
|
rename box2d->libbox2d
|
2014-07-28 12:05:58 +08:00 |
Huabing.Xu
|
7f5782c207
|
chang module name for windows project file
|
2014-07-28 09:20:02 +08:00 |
andyque
|
7353f8685a
|
Simplify Widget ContentSize cascade change algorithm
|
2014-07-25 14:59:58 +08:00 |
andyque
|
e56e015be2
|
minor modification of tests
|
2014-07-25 14:40:58 +08:00 |
andyque
|
3502cb0a23
|
fix remove self in Widget touch callback issue
|
2014-07-25 14:23:04 +08:00 |
minggo
|
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 |
minggo
|
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 |
Sergey
|
92ac809bfe
|
Mac fonts tests
|
2014-07-24 12:27:17 +04:00 |
Huabing.Xu
|
c7bfc934fd
|
windows works now
|
2014-07-24 12:57:39 +08:00 |
andyque
|
21f1624462
|
minor fix of RichText
|
2014-07-23 14:10:00 +08:00 |
minggo
|
524d9cb8af
|
Merge pull request #7552 from andyque/fixScale9Sprite
fix scale9Sprite addChild zorder issue
|
2014-07-22 18:39:04 +08:00 |
andyque
|
1f4c289db4
|
fix scale9Sprite addChild zorder issue
|
2014-07-22 16:26:40 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
pandamicro
|
d2c6602dea
|
Refactor #5580: Merge createDirectories to createDirectory
|
2014-07-21 16:51:48 +08:00 |
Huabing.Xu
|
e666ab88ed
|
fix windows compile error
|
2014-07-21 14:59:47 +08:00 |
minggo
|
aef1e01ce5
|
Merge pull request #7518 from natural-law/android-dependencies
Android dependencies
|
2014-07-18 17:57:42 +08:00 |
minggo
|
21647839b6
|
Merge pull request #7515 from Dhilan007/v3-320final
fixed warn and replace 'printf' with 'log';
|
2014-07-18 13:56:54 +08:00 |
LinWenhai
|
c10e49201d
|
fixed compil
|
2014-07-18 13:44:07 +08:00 |
Dhilan007
|
5d22bca240
|
fixed warn and replace 'printf' with 'log';
|
2014-07-18 10:20:37 +08:00 |
Dale Stammen
|
88da5d5fdb
|
disabled custom shader tests for WP8
|
2014-07-17 08:13:49 -07:00 |
andyque
|
7ff78c61ba
|
fix richText UTF8
|
2014-07-17 18:36:09 +08:00 |
minggo
|
578af01ef1
|
Merge pull request #7499 from andyque/fixRichTextUTF8
fix richText utf8 error
|
2014-07-17 17:57:41 +08:00 |
andyque
|
fc2ab110cc
|
fix richText utf8 error
|
2014-07-17 17:58:40 +08:00 |
zhangcheng
|
6d0bf8e143
|
Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash
|
2014-07-17 17:25:32 +08:00 |
zhangcheng
|
24d87ad05b
|
1. fixes ActionManagerEx crashes.
|
2014-07-17 17:24:41 +08:00 |
minggo
|
c482e2e14f
|
Merge pull request #7491 from Dhilan007/v3-320final
fixed text line wrap issue in UITextField.
|
2014-07-17 16:48:41 +08:00 |
minggo
|
d28fdb6752
|
Merge pull request #7490 from geron-cn/chukongv3
fix bug: cpp-test binary load test crash
|
2014-07-17 16:38:45 +08:00 |
Dhilan007
|
8ac1398037
|
fixed text line wrap issue in UITextField.
|
2014-07-17 16:23:38 +08:00 |
geron-cn
|
4e9a710053
|
fix binary test crash bug
|
2014-07-17 16:16:49 +08:00 |
geron-cn
|
441f0ebca8
|
fix binary test crash bug
|
2014-07-17 16:13:12 +08:00 |
geron-cn
|
1a2caaeebf
|
fix binary test crash bug
|
2014-07-17 16:09:17 +08:00 |
geron-cn
|
8212ed3822
|
fix binary test crash bug
|
2014-07-17 16:01:03 +08:00 |
samuele3hu
|
e975b0d5f9
|
Update experimental lua bindings、related test cases and project setting
|
2014-07-17 14:54:34 +08:00 |
samuele3hu
|
ab0fe54d32
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-17 14:11:15 +08:00 |
andyque
|
4f5cd2a368
|
change FastTileMap to TileMap
|
2014-07-17 14:09:53 +08:00 |
minggo
|
2b3fbd743a
|
Merge pull request #7478 from Dhilan007/v3-320final
update test case of game controller[lua]
|
2014-07-17 13:37:49 +08:00 |
minggo
|
c6349ef246
|
Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix
disable FastTileMapTest on WP8
|
2014-07-17 13:35:52 +08:00 |
samuele3hu
|
5682a983bb
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-17 12:57:31 +08:00 |
vision
|
c29766a4ad
|
disable FastTileMapTest on WP8
|
2014-07-17 12:56:58 +08:00 |
samuele3hu
|
eb8d1d70f7
|
Update the FastTileMapTest and VideoPlayerTest
|
2014-07-17 12:55:28 +08:00 |
Dhilan007
|
6429cf06fb
|
update test case of game controller[lua]
|
2014-07-17 11:26:26 +08:00 |
minggo
|
e58626c11c
|
Merge pull request #7476 from Dhilan007/v3-gc0717
Fixed bugs[Ouya controller]
|
2014-07-17 11:12:31 +08:00 |
Dhilan007
|
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 |
minggo
|
5a5b245e84
|
Merge pull request #7474 from andyque/fixFastTileMap
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:52:40 +08:00 |
andyque
|
880c2c4c3f
|
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:46:20 +08:00 |
minggo
|
4c7d777f25
|
Merge pull request #7471 from visiblelight/wp8_shader_update
Wp8 shader update
|
2014-07-17 10:14:54 +08:00 |
vision
|
40951d586c
|
update
|
2014-07-17 10:10:33 +08:00 |
vision
|
c47d844d20
|
update the buildin shaders on WP8. Disable the effect 3d test.
|
2014-07-17 10:08:49 +08:00 |
samuele3hu
|
ce4f5f0e96
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-17 10:02:16 +08:00 |
minggo
|
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 |
samuele3hu
|
d6d182cb59
|
Fix the action can’t be triggered in the TriggerTest
|
2014-07-16 23:18:10 +08:00 |
samuele3hu
|
b782814b4b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-16 22:08:48 +08:00 |
samuele3hu
|
1b2d389011
|
Update ListViewEventType for Lua
|
2014-07-16 17:18:01 +08:00 |
zhangcheng
|
80de57be39
|
1、 fixes lua TriggerTest bug.
|
2014-07-16 14:50:35 +08:00 |
zhangbin
|
7e7c3a1e55
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
zhangcheng
|
8bf4c8b6c9
|
1. Fixes CCTimeLine warning.
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
|
2014-07-15 18:07:33 +08:00 |
andyque
|
714048059c
|
fix loading bar switch loading method issue
|
2014-07-15 17:03:35 +08:00 |
samuele3hu
|
19cc5b9c4d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-15 13:34:46 +08:00 |
samuele3hu
|
15a7ab8450
|
Update the TextureAsyncTest
|
2014-07-15 13:33:36 +08:00 |
andyque
|
52596dc97f
|
fix Text line wrap issue
|
2014-07-15 11:46:53 +08:00 |
samuele3hu
|
55e77d8fd2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-15 11:34:57 +08:00 |
samuele3hu
|
3ab7520667
|
Delete SceneEditorTest from ExtensionTest and add related binary loading to CocoStudioSceneTest
|
2014-07-15 11:34:24 +08:00 |
boyu0
|
c7fec217ba
|
Change atof() to utils::atof()
|
2014-07-14 20:45:24 +08:00 |
samuele3hu
|
b3bfa87f51
|
Fix the TMXOrthoFlipRunTimeTest bugs.
|
2014-07-14 18:30:59 +08:00 |
samuele3hu
|
f1ed090f4f
|
Fix the OpenGLTest display bugs.
|
2014-07-14 18:30:02 +08:00 |
minggo
|
6d063fb97b
|
Merge pull request #7431 from andyque/addTextFieldTTFTest
add TextField TrueTypeFont tests
|
2014-07-14 16:31:36 +08:00 |
minggo
|
7f68bdf179
|
Merge pull request #7434 from samuele3hu/v3_hot_fix
Fix the crash that CocoStudioGuiTest in the Linux platform and error display than Sprite3DTest
|
2014-07-14 16:26:42 +08:00 |
samuele3hu
|
4cb6c1c74f
|
Add lua bindings for TextureCache::addImageAsync and update the related test cases
|
2014-07-14 16:05:48 +08:00 |
Dhilan007
|
a5317dde87
|
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
|
2014-07-14 15:50:20 +08:00 |
samuele3hu
|
5f453d0105
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-14 15:32:03 +08:00 |
samuele3hu
|
ace0d05bd4
|
Fix the crash that CocoStudioGuiTest in the Linux platform and errors than Sprite3DTest
|
2014-07-14 15:28:52 +08:00 |
andyque
|
4fe3723edf
|
add TextField TrueTypeFont tests
|
2014-07-14 14:29:28 +08:00 |
Dhilan007
|
8949d90212
|
update test case of new label[lua].
|
2014-07-14 13:48:28 +08:00 |
zhangbin
|
b0c465d96b
|
Adjust the dependencies between modules on android.
|
2014-07-14 09:48:16 +08:00 |
minggo
|
3b59b41116
|
3D:Sprite3D -> Node:Sprite3D
|
2014-07-12 22:26:46 +08:00 |
minggo
|
05b485cd41
|
Merge pull request #7407 from visiblelight/fix_wp8_errors
Fix compile errors on WP8
|
2014-07-11 18:51:23 +08:00 |
samuele3hu
|
9c7999d1c2
|
Fix the tests-lua crash on windows platform
|
2014-07-11 18:13:08 +08:00 |
samuele3hu
|
3c8dc7a596
|
Update the cocos2d.ini config
|
2014-07-11 17:21:55 +08:00 |
samuele3hu
|
01c3f2a4ed
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/tolua/cocos2dx.ini
|
2014-07-11 16:44:59 +08:00 |
vision
|
7495a611ea
|
fix conflict
|
2014-07-11 16:03:40 +08:00 |
samuele3hu
|
82070e5205
|
Remove glView setting form cpp to lua script
|
2014-07-11 15:34:56 +08:00 |
Dhilan007
|
d8cdb75851
|
Fix compile errors on WP8
|
2014-07-11 15:10:19 +08:00 |
andyque
|
74772e97c9
|
fix linux compile error
|
2014-07-11 14:17:57 +08:00 |
andyque
|
43255e2b96
|
Merge branch 'v3' into addStudio1.4
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
|
2014-07-11 13:55:13 +08:00 |
andyque
|
646f7c7e3f
|
Merge branch 'v3' into addStudio1.4
|
2014-07-11 13:39:34 +08:00 |
minggo
|
72f8ab8483
|
Merge pull request #7395 from samuele3hu/v3_controller
Add Lua bindings for controller and related test case project
|
2014-07-11 13:39:30 +08:00 |
minggo
|
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 |
minggo
|
7cf8cf42d3
|
Merge pull request #7389 from Dhilan007/v3-gc-nibiru
Update Nibiru SDK and remove prompt box of install driver .
|
2014-07-11 13:36:19 +08:00 |
samuele3hu
|
2cbe262842
|
Add newline for some files
|
2014-07-11 12:00:43 +08:00 |
samuele3hu
|
dd76ae93f6
|
Update controller lua binding and related test cases
|
2014-07-11 11:52:05 +08:00 |
Dhilan007
|
900d4b36fc
|
Enabled nibiru\moga\ouya controller support.
|
2014-07-11 09:57:26 +08:00 |
samuele3hu
|
caae8392d4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/scripting/lua-bindings/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
tools/tolua/genbindings.py
|
2014-07-10 22:42:09 +08:00 |
minggo
|
e876065d3e
|
Merge pull request #7229 from samuele3hu/v3_VideoPlayer
Add VideoPlayer Lua bindings and update bindings-generator submodule
|
2014-07-10 22:04:46 +08:00 |
minggo
|
4895e6d54a
|
Merge pull request #7362 from geron-cn/chukongv3
Chukongv3
|
2014-07-10 21:17:19 +08:00 |
andyque
|
f76f71eb5d
|
fix win32 & win8 compile error
|
2014-07-10 16:37:15 +08:00 |