minggo
c2bac086a7
[ci skip]update version info
2014-09-19 21:54:01 +08:00
minggo
6569f1a7f0
Merge pull request #8108 from huangshiwu/v3_wp8test
...
fix wp8 directory control bug
2014-09-19 16:57:02 +08:00
huanghsiwu
f73f1a5379
fix wp8 directory control bug --modify
2014-09-19 16:52:11 +08:00
minggo
653986a3a2
Merge pull request #8106 from super626/v3
...
add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
2014-09-19 16:16:33 +08:00
huanghsiwu
d42cec0708
fix wp8 directory control bug
2014-09-19 15:54:18 +08:00
yangxiao
5b61e569f5
light mask
2014-09-19 14:50:20 +08:00
XiaoYang
d1328cfb41
Merge pull request #132 from lvlonggame/v3
...
Deal read string length problem!
2014-09-19 14:47:59 +08:00
lvlong
eb89efe510
deal the length problem!
2014-09-19 14:30:02 +08:00
yangxiao
dd3a312eeb
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
2014-09-19 11:24:47 +08:00
yangxiao
c4d25d318f
light config
2014-09-19 11:11:23 +08:00
songchengjiang
f052e45c04
Move Light Uniforms into Meshcommand
2014-09-19 10:54:07 +08:00
Jeff
2ffbe23c50
The files name: modify underline to hyphen
2014-09-19 10:24:17 +08:00
Jeff
e4e2cea97a
link error
2014-09-18 19:59:22 +08:00
Jeff
476ede6ccb
link error
2014-09-18 19:56:53 +08:00
songchengjiang
62777e9552
compile Android
2014-09-18 18:35:18 +08:00
songchengjiang
b9ceccda74
Format
2014-09-18 18:07:20 +08:00
songchengjiang
3c67515378
Finished light reconstruction
2014-09-18 16:38:35 +08:00
Jeff
6152b70945
LE
2014-09-18 16:33:46 +08:00
minggo
7c8e1c9de5
Merge pull request #8099 from super626/billboard
...
Transparent Queue adjustment
2014-09-18 16:07:54 +08:00
minggo
d6e086d4dd
Merge pull request #8098 from CocosRobot/update_lua_bindings_1411009391
...
[AUTO]: updating luabinding automatically
2014-09-18 16:06:52 +08:00
Jeff
0ee4ee03c1
CE
2014-09-18 16:00:18 +08:00
SunLightJuly
f9fbb1b789
call getCascadeBoundingBox() properly
2014-09-18 15:40:28 +08:00
SunLightJuly
855d8d7a72
moved getCascadeBoundingBox() to utils
2014-09-18 15:27:11 +08:00
Huabing.Xu
cf4d0faad3
optimise update of particle system for free mode
2014-09-18 15:24:27 +08:00
Jeff
418ec69abf
compile error
2014-09-18 15:18:30 +08:00
SunLightJuly
1af68e9274
replaced "NULL" with "nullptr"
2014-09-18 14:30:21 +08:00
Jeff
ac6b83f8f9
fix compile error
2014-09-18 14:22:40 +08:00
Jeff
c5cc16336a
fix compile error
2014-09-18 14:04:54 +08:00
SunLightJuly
ff776d813b
added Node::getCascadeBoundingBox()
2014-09-18 13:11:10 +08:00
yangxiao
720264fb98
add comment
2014-09-18 12:04:42 +08:00
yangxiao
25091ca849
add transparent flag to render command
2014-09-18 12:00:44 +08:00
Jeff
b9ec99d7f4
compile error & code spelling error
...
1.fix compile error on win32
2.modify spelling error
2014-09-18 11:52:23 +08:00
CocosRobot
7920ff425b
[AUTO]: updating luabinding automatically
2014-09-18 03:05:04 +00:00
minggo
5e5129d0d1
Merge pull request #8085 from super626/v3
...
Shared GLProgramState by default and Fix BillBoard Anchor Point
2014-09-18 10:52:35 +08:00
minggo
442f30af1f
Merge pull request #8091 from dabingnn/v3_PageTurnZFighting
...
new version of avoid z fighting in pageTurn
2014-09-18 10:50:31 +08:00
Steve Kanter
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
Jeff
ed530454b2
fix compile error
2014-09-18 02:11:20 +08:00
Jeff
1dffbd0a7b
fix link errors
2014-09-18 01:52:08 +08:00
Jeff
e9c6f5d02b
fix compile errors
2014-09-18 01:30:14 +08:00
Jeff
08e8963b1a
fix compile errors
2014-09-18 00:04:48 +08:00
Jeff
27919dad77
add simple implement of WebView for win32
...
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
2014-09-17 22:30:15 +08:00
yangxiao
8c77130ae0
refactor light compile
2014-09-17 18:58:35 +08:00
Huabing.Xu
3a0e9be97e
new version of avoid z fighting in pageTurn
2014-09-17 18:33:18 +08:00
yangxiao
34f642377e
fix billboard anchor point
2014-09-17 18:01:18 +08:00
yangxiao
41caef878b
refactor light
2014-09-17 17:59:10 +08:00
minggo
ccbf694927
Merge pull request #8086 from huangshiwu/v3_test
...
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
2014-09-17 14:50:42 +08:00
yangxiao
584284c847
merge cocos and rename lighttest
2014-09-17 14:26:57 +08:00
huangshiwu
c8bdba69ad
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
2014-09-17 14:00:40 +08:00
yangxiao
18717cfc86
Merge branch 'newcode' into v3
2014-09-17 13:44:28 +08:00
yangxiao
c5f6f8de5b
share glprogramstate
2014-09-17 13:42:08 +08:00
minggo
6a7cfc812a
Merge pull request #8083 from CocosRobot/update_lua_bindings_1410924831
...
[AUTO]: updating luabinding automatically
2014-09-17 11:42:44 +08:00
CocosRobot
9b5d47c61e
[AUTO]: updating luabinding automatically
2014-09-17 03:35:46 +00:00
minggo
38810eeb2e
Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices
...
change indices to short for fast tmx
2014-09-17 11:31:58 +08:00
minggo
32ed437e6d
Merge pull request #8081 from andyque/addInterfaceToUI
...
add getTitleRenderer interface to UIButton
2014-09-17 11:31:16 +08:00
Huabing.Xu
725d107ae5
change indices to short for fast tmx
2014-09-17 11:06:15 +08:00
minggo
38259bd311
Merge pull request #8075 from dabingnn/v3_FixVertsAndDrawCallsForPrimitiveCommand
...
add draw calls and draw verts for PrimitiveCommand
2014-09-17 11:04:43 +08:00
andyque
6badfb30e1
add getTitleRenderer interface to UIButton
2014-09-17 10:57:40 +08:00
Huabing.Xu
34e3e23af5
Fix compile error
2014-09-17 10:35:42 +08:00
minggo
77371a025d
Merge pull request #8062 from zhongfq/v3
...
optimize decompress jpg data
2014-09-17 10:22:57 +08:00
Eric Zhong
ae5f6e63e5
optimize decompress jpg data and fix warnings
2014-09-16 21:55:05 +08:00
CocosRobot
b37659a448
[AUTO]: updating luabinding automatically
2014-09-16 09:16:17 +00:00
minggo
da29b92ff4
Merge pull request #8072 from Dhilan007/v3-audio903
...
move AudioEngine to cocos2d:experimental namespace
2014-09-16 17:12:03 +08:00
Dhilan007
369c14ed49
fix compile error
2014-09-16 14:57:58 +08:00
huangshiwu
3907e5c1a2
fix ClippingNode's memory leak bug
2014-09-16 14:50:00 +08:00
Huabing.Xu
f702b4e9b3
add draw calls and draw verts for PrimitiveCommand
2014-09-16 12:04:35 +08:00
Dhilan007
9942206c53
move AudioEngine in cocos2d:experimental namespace
2014-09-16 10:22:25 +08:00
minggo
afd1271078
Merge pull request #8071 from huangshiwu/v3_wp8test
...
fix wp8 and winrt compile error --add chipmunk static lib
2014-09-16 10:07:50 +08:00
huangshiwu
d0d3e185ce
fix wp8 and winrt compile error --add chipmunk static lib
2014-09-16 10:03:00 +08:00
CocosRobot
526c28bea9
[AUTO]: updating luabinding automatically
2014-09-15 15:21:18 +00:00
Eric Zhong
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
minggo
9a29ab2113
Merge pull request #8058 from andyque/fixWebView
...
improve webview coding style
2014-09-15 22:49:53 +08:00
andyque
af3dd215cb
improve android web view
2014-09-15 18:14:04 +08:00
andyque
5f95ad221e
improve iOS WebView
2014-09-15 18:02:11 +08:00
andyque
126ec18a89
add video player debug draw config
2014-09-15 17:59:51 +08:00
Dhilan007
39a8b8d5ea
Fix a potential crash in AudioEngine on Android.
2014-09-15 17:36:00 +08:00
andyque
71b6be678e
fix header guard
2014-09-15 16:56:51 +08:00
minggo
68ab3082b4
fix warnings
2014-09-15 16:23:57 +08:00
mailgyc
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
minggo
7bb391ce55
Merge pull request #8033 from Dhilan007/v3-audio903
...
Lua bindings of AudioEngine.
2014-09-15 13:43:27 +08:00
andyque
030fe34afa
fix UI related warnings
2014-09-15 11:13:56 +08:00
minggo
cc221e5e16
Merge pull request #8036 from CocosRobot/update_lua_bindings_1410745737
...
[AUTO]: updating luabinding automatically
2014-09-15 09:56:20 +08:00
CocosRobot
8c7eb81271
[AUTO]: updating luabinding automatically
2014-09-15 01:50:32 +00:00
minggo
df78ec90f1
Merge pull request #8032 from joewan/v3-fix-leak
...
fix memory leak when use menu_selector.
2014-09-15 09:50:05 +08:00
minggo
70f922d07a
Merge pull request #8030 from andyque/fixButtonScaleIssue
...
fix button scale issue
2014-09-15 09:49:06 +08:00
minggo
6bcab3b05d
Merge pull request #7920 from rny/audio_win32
...
win32 can not stop looping sound effect
2014-09-15 09:37:11 +08:00
minggo
788f3c5c38
Merge pull request #8025 from andyque/fixEditBoxLuaBinding
...
fix Editbox lua binding
2014-09-15 09:36:36 +08:00
minggo
8b1e928741
Merge pull request #8026 from super626/v3
...
Transparent Mesh support
2014-09-15 09:36:17 +08:00
andyque
7b0f41ed7b
remove auto scale text
2014-09-15 09:28:56 +08:00
Dhilan007
51c19d4b06
update project for lua bindings of AudioEngine
2014-09-14 23:17:39 +08:00
Dhilan007
cf2a60898f
Lua bindings of AudioEngine.
2014-09-14 22:54:04 +08:00
Dhilan007
f6992b94de
fix crash in AudioEngine
2014-09-14 22:48:41 +08:00
joewan
93fdcf1f04
fix memory leak when use menu_selector.
2014-09-14 21:41:19 +08:00
Keisuke Kobayashi
c4d2c5eaed
Rename setSSLVerification
2014-09-14 00:28:11 +09:00
andyque
880929f102
fix button scale issue
2014-09-13 22:08:02 +08:00
Keisuke Kobayashi
6b0879fe93
HttpClient SSL verification
2014-09-13 20:37:36 +09:00
yangxiao
2e0e4e58c8
support transparent object
2014-09-12 17:57:54 +08:00
minggo
0f42d9bbd8
Merge pull request #8022 from Dhilan007/v3-labelfix
...
Label:It may display incorrectly with outline feature enabled.
2014-09-12 17:54:02 +08:00
yangxiao
df5da80439
Merge branch 'newcode' into v3
2014-09-12 17:43:05 +08:00
minggo
34a015895d
Merge pull request #8020 from dabingnn/v3_MaterialIDBug
...
fix bug for MeshCommand materialID generation
2014-09-12 17:15:49 +08:00
andyque
02d2282b83
add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox
2014-09-12 17:07:06 +08:00
andyque
d4b2e8d154
remove deprecated warning
2014-09-12 17:06:13 +08:00
CocosRobot
29f9cbfd6a
[AUTO]: updating luabinding automatically
2014-09-12 08:15:54 +00:00
Dhilan007
23f1b740bf
Label:It may display incorrectly with outline feature enabled.
2014-09-12 16:03:01 +08:00
Huabing.Xu
1571367042
fix bug for MeshCommand materialID generation
2014-09-12 15:43:10 +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
huangshiwu
f1f6373b6e
fix Cocos2dShaderCompile's compile error --use chipmunk static library
2014-09-12 15:29:10 +08:00
minggo
55783b66c2
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
...
V3 drawnode prbk
2014-09-12 15:17:49 +08:00
minggo
cecdab4d62
Merge pull request #8015 from andyque/fixButtonIssue
...
Fix text only button can't be touched issue
2014-09-12 15:06:33 +08:00
huangshiwu
11d8829b3a
Deprecate DrawPrimitives and enhance DrawNode --little modify
2014-09-12 14:50:41 +08:00
andyque
294271682b
change return const value to value
2014-09-12 14:39:22 +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
yangxiao
9eb62ed1f6
Merge branch 'newcode' into v3
2014-09-12 10:00:13 +08:00
huangshiwu
147bb7301b
fix wp8 compile error --add BillBoard and BillBoardTest
2014-09-12 09:33:30 +08:00
Ricardo Quesada
525fecc4ce
even more cmake fixes
2014-09-11 17:36:49 -07:00
huangshiwu
8922121ed1
Deprecate DrawPrimitives and enhance DrawNode --make some modify
2014-09-12 07:33:34 +08:00
huangshiwu
8d8f4436db
Deprecate DrawPrimitives and enhance DrawNode --fix android compile error
2014-09-11 17:55:47 +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
75b46e9a09
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-11 16:06:00 +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
andyque
67ad24e7c1
remove orderOfArrival = 0
2014-09-11 15:44:31 +08:00
huangshiwu
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
minggo
e0df8114fa
Merge pull request #7968 from Dhilan007/v3-audio903
...
New Audio Engine[ios/android]
2014-09-11 15:23:17 +08:00
CocosRobot
434d4fbfdd
[AUTO]: updating luabinding automatically
2014-09-11 07:11:40 +00:00
minggo
138d419505
Merge pull request #8005 from andyque/fixWin32CompileError
...
fix compile error
2014-09-11 15:01:10 +08:00
minggo
a5855baac4
Merge pull request #7976 from samuele3hu/v3_check_mat
...
Added Math SSE implementation on x86 and update bindings-generator submodule
2014-09-11 14:47:39 +08:00
andyque
1945c4f31e
fix compile error
2014-09-11 14:45:55 +08:00
yangxiao
e849b997ed
modify interface
2014-09-11 12:05:49 +08:00
Dhilan007
518fd7ab6f
Optimized seek for large file and log output on IOS.
2014-09-11 10:53:01 +08:00
yangxiao
3cfc36591c
merge cocos
2014-09-11 10:13:57 +08:00
yangxiao
33cabb553a
add transparent property
2014-09-11 09:15:24 +08:00
Ricardo Quesada
e46fa14be9
Fixes Xcode 6 warnings
2014-09-10 12:01:35 -07:00
Ricardo Quesada
11dcc37d4d
Fixes cmakefile for mac
2014-09-10 09:51:56 -07:00
yangxiao
55fdcf3629
fix linux
2014-09-10 21:57:37 +08:00
Dhilan007
26142e1300
fix compile error on android.
2014-09-10 17:49:26 +08:00
Dhilan007
1d43c6ec82
Fix name of variables and coding style.
2014-09-10 17:12:46 +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
Dhilan007
e588b371bd
Replace with 'struct' for AudioInfo/ProfileHelper.
2014-09-10 14:09:42 +08:00
minggo
46d4f487bb
Merge pull request #7978 from super626/v3
...
Calculate Content Size for Sprite3D
2014-09-10 14:06:47 +08:00
minggo
f032286787
Merge pull request #7961 from andyque/addChipmunkStaticLib
...
Add chipmunk static lib
2014-09-10 14:05:10 +08:00
andyque
8aea6330a5
modify linux cmakelist
2014-09-09 22:59:55 -07:00
Dhilan007
e45a4ff1bd
1.Fix name of variables.
...
2.Fix control of volume on android.
2014-09-10 13:47:17 +08:00
andyque
499d828179
add chipmunk static library for linux
2014-09-10 10:58:20 +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
CocosRobot
0e49107514
[AUTO]: updating luabinding automatically
2014-09-10 01:52:43 +00:00
Ricardo Quesada
f5cd48f154
Android properties back to 10
2014-09-09 18:46:47 -07:00
Ricardo Quesada
d5a6289a9b
compiles on wp8
2014-09-09 18:22:11 -07:00
Ricardo Quesada
6b4323642a
compiles on winphone8
2014-09-09 18:15:16 -07:00
Ricardo Quesada
4d57e991ea
Compiles in Win32
2014-09-09 18:07:24 -07:00
Ricardo Quesada
fdabaa3082
Compiles on Android
2014-09-09 17:53:08 -07:00
Ricardo Quesada
0972506bf5
compiles and runs on linux
2014-09-09 17:41:49 -07:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
73450be715
compiles and runs in Linux
2014-09-09 17:11:06 -07:00
Ricardo Quesada
f5e54f8e69
Fixes for linux compilation
2014-09-09 17:01: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
samuele3hu
8c0f8e1eb6
Reset marco limited to `#ifdef __SSE__`
2014-09-09 23:01:37 +08:00
giginet
e9e9741a74
SceneReader sets contentSize by canvasSize.
...
We could not get the canvas size of the scene which created on CocosStudio.
Thanks to this commit, we can get scene's canvas size by Node::getContentSize()
```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
int width = scene->getContentSize().width;
int height = scene->getContentSize().height;
cocos2d::log("canvasSize = %d, %d", width, height);
```
2014-09-09 22:30:52 +09:00
samuele3hu
3151c54879
Update macro define limited
2014-09-09 19:08:01 +08:00
songchengjiang
4099015421
Sprite3D set default _contentSize by AABB
2014-09-09 17:47:34 +08:00
samuele3hu
40ace8f539
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_mat
2014-09-09 16:27:43 +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
CocosRobot
ed8835d262
[AUTO]: updating luabinding automatically
2014-09-09 06:43:49 +00:00
minggo
1ee9cebebd
Merge pull request #7925 from super626/transition
...
Animation3D
2014-09-09 14:39:15 +08:00
minggo
2ba6e73212
Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097
...
[AUTO]: updating luabinding automatically
2014-09-09 14:20:16 +08:00
minggo
162fb3ec18
Merge pull request #7967 from minggo/remove-_setLocalZOrder
...
deprecated Node::_setZOrder()
2014-09-09 14:20:00 +08:00
minggo
9373d096e8
Merge pull request #7969 from andyque/fixUI
...
deprecated ui::TextField getStringValue and setText, use getString and
2014-09-09 14:18:07 +08:00
liuliang
be72d5730c
Modify the environment configuration
2014-09-09 14:03:27 +08:00
andyque
83e14259ad
deprecated ui::TextField getStringValue and setText, use getString and
...
setString instead
2014-09-09 13:59:35 +08:00
samuele3hu
cd478a3c0d
Merge branch 'cocos2d-v3' of https://github.com/sunzhuoshi/cocos2d-x into v3_check_mat
2014-09-09 13:45:29 +08:00
Dhilan007
f2b7bd62d5
update Xcode project for audio engine
2014-09-09 11:41:17 +08:00
yangxiao
b88c462c8f
remove Sequence3D
2014-09-09 11:34:17 +08:00
minggo
905c429ff5
remove unneeded code
2014-09-09 10:58:07 +08:00
minggo
31c508ef6d
deprecated Node::_setZOrder()
2014-09-09 10:55:27 +08:00
CocosRobot
a2dcb71a24
[AUTO]: updating luabinding automatically
2014-09-09 02:53:20 +00:00
minggo
6b99ce6ec0
Merge pull request #7939 from minggo/remove-_setLocalZOrder
...
remove Node::_setLocalZOrder()
2014-09-09 10:49:09 +08:00
yangxiao
a295159a3a
Merge branch 'newcode' into transition
2014-09-09 10:37:08 +08:00
oleg-akatsuki
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
Dhilan007
1b96b2ac87
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
2014-09-09 10:32:56 +08:00
CocosRobot
af6b6bb7b9
[AUTO]: updating luabinding automatically
2014-09-09 02:32:49 +00:00
sunzhuoshi
66070868f7
Added Math SSE implementation on x86
2014-09-08 20:58:59 +08:00
Chuanren Wu
0b58ff7fce
introduce substeps for accurate physics
2014-09-08 00:14:40 +02:00
andyque
d6b96d1e46
add chipmunk to wp project
2014-09-06 13:28:00 +08:00
Ricardo Quesada
33a4cd396d
Adds missing xcshared data for missing projects
2014-09-05 14:32:14 -07:00
minggo
78d4e9797c
Merge pull request #7955 from dabingnn/v3_reverse_VBOSIZE
...
roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5
2014-09-05 18:22:46 +08:00
Huabing.Xu
73b201b702
roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5
2014-09-05 16:01:17 +08:00
andyque
2a8601ee1f
Merge branch 'addChipmunkStaticLib' of github.com:andyque/cocos2d-x into addChipmunkStaticLib
2014-09-05 15:43:59 +08:00
huangshiwu
01358f0b62
fix wp8 compile error and modify default resource path
2014-09-05 15:43:08 +08:00
samuele3hu
f100dac9b8
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
2014-09-05 15:43:07 +08:00
andyque
08c7f32627
add chipmunk static library for win32
2014-09-05 15:38:12 +08:00
yangxiao
730ab846c3
code adjustment
2014-09-05 14:59:14 +08:00
Dhilan007
1d900940ab
Refactoring API:
...
1.Remove Singleton Pattern
2.Make AudioProfile clear.
2014-09-05 14:34:30 +08:00
minggo
1bf6c79329
Merge pull request #7953 from samuele3hu/v3_check_newnon
...
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
2014-09-05 11:37:57 +08:00
minggo
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
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
samuele3hu
6209530e66
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
2014-09-05 09:39:43 +08:00
samuele3hu
8c2ab3a4e7
Add manual lua bindings for GLView::getAllTouches
2014-09-04 22:12:59 +08:00
samuele3hu
61d1b67116
Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon
2014-09-04 18:17:05 +08:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
minggo
060dfd94f3
Merge pull request #7948 from super626/v3
...
Bugs on creating user custom mesh
2014-09-04 17:39:40 +08:00
yangxiao
88ec0392a0
remove unused method
2014-09-04 17:15:28 +08:00
yangxiao
31dc3301b3
add space line
2014-09-04 17:03:46 +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
226e60a3ee
rename billboard
2014-09-04 16:26:36 +08:00
yangxiao
86d9ce381b
rename billboard
2014-09-04 16:26:11 +08:00
yangxiao
08a1405bdc
fix bug on custom mesh
2014-09-04 14:26:23 +08:00
minggo
43e2b39bc0
Merge pull request #7921 from dabingnn/v3_trianglesCommand
...
V3 triangles command
2014-09-04 13:58:50 +08:00
minggo
659ba68199
Merge pull request #7942 from andyque/deleteRedundantCode
...
remove dead code
2014-09-04 13:45:12 +08:00
minggo
cbe357bbca
Merge pull request #7943 from Dhilan007/v3
...
fix compile error on android.
2014-09-04 13:43:39 +08:00
minggo
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +08:00
minggo
7b1be80eb8
Merge pull request #7192 from kezhuw/bugfix_http_client
...
bugfix: condition variable sleep on unrelated mutex
2014-09-04 13:34:33 +08:00
Huabing.Xu
4ae2d6fc90
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-09-04 11:27:12 +08:00
Huabing.Xu
6f03e97a6d
add trianglesCommand head file to cocos2d
...
remove invoking of base class constructor
2014-09-04 11:20:43 +08:00
Dhilan007
64d926a75f
fix compile error on android.
2014-09-04 11:04:50 +08:00
andyque
a1edd4a819
remove dead code
2014-09-04 11:00:48 +08:00
minggo
99f3b371ed
Merge pull request #7744 from lite3/customguireader
...
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
2014-09-04 10:53:00 +08:00
andyque
3451672365
restore some configs
2014-09-04 10:49:45 +08:00
minggo
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
minggo
0d777bfa95
Merge pull request #7099 from newnon/v3_edit_box_fixes
...
EditBox fixes & improvements
2014-09-04 10:34:44 +08:00
minggo
139af3faa8
Merge pull request #7938 from super626/v3
...
fix bundle
2014-09-04 10:03:15 +08:00
Sergey
14853d46f2
setPlaceholderFontSize fix
2014-09-03 23:38:44 +04:00
Sergey
89ed897f47
getAllTouches() in GLView
2014-09-03 23:25:30 +04:00
Ricardo Quesada
047025696c
Merge pull request #7680 from andyque/fixNormalizedPosition
...
fix normalizedPosition bug
2014-09-03 10:07:22 -07:00
Kezhu Wang
925fb9aa38
bugfix: condition variable sleep on unrelated mutex
2014-09-03 23:56:54 +08:00
Dhilan007
d5c023740f
Implement logical codes of new audio engine on android.
2014-09-03 18:19:47 +08:00
Dhilan007
fc9a0f9be9
Implement logical codes of new audio engine on IOS.
2014-09-03 18:19:21 +08:00
yangxiao
4e65d070a1
rename BillBoard Model
2014-09-03 18:19:12 +08:00
Dhilan007
ca652cefee
New audio engine API[2d]
2014-09-03 18:18:47 +08:00
XiaoYang
58f4e84b9a
Merge pull request #126 from songchengjiang/billboard
...
Billboard
2014-09-03 18:12:08 +08:00
songchengjiang
114de83a0b
Added View_Oriented and View_Plane_Oriented Mode
2014-09-03 18:04:48 +08:00
andyque
87af0ecdd6
add back libbox2d and libspine project to our solution
2014-09-03 17:37:34 +08:00
minggo
5cca8cc87d
remove Node::_setLocalZOrder()
2014-09-03 17:26:50 +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
XiaoYang
f03c4d4790
Merge pull request #125 from liuliang2004/Meshv3
...
Set the node name
2014-09-03 15:59:49 +08:00
liuliang
c167ed17ee
Set the node name
2014-09-03 15:55:11 +08:00
yangxiao
1bd09f21d0
merge cocos
2014-09-03 15:42:58 +08:00
yangxiao
5a85cb405e
fix billboard face
2014-09-03 15:28:15 +08:00
samuele3hu
45f08d54cb
Fix the member name error in the `vec4_to_luaval `
2014-09-03 15:07:31 +08:00
andyque
2e27a6865f
update project to vs2013
2014-09-03 14:10:38 +08:00
minggo
66943eec98
Merge pull request #7932 from minggo/remove-unneeded-files
...
remove unneeded files
2014-09-03 13:36:31 +08:00
XiaoYang
4e0c358a90
Merge pull request #124 from liuliang2004/Meshv3
...
Set the node name
2014-09-03 13:12:33 +08:00
yangxiao
adda886210
tmp work
2014-09-03 11:58:09 +08:00
minggo
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
liuliang
278a3441ce
Set the node name
2014-09-03 11:43:42 +08:00
Jeff
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
CocosRobot
ffb36d577e
[AUTO]: updating luabinding automatically
2014-09-03 03:29:43 +00:00
minggo
eee9ac626a
Merge pull request #7815 from andyque/mergeExtensionEditBox
...
merge extension EditBox to ui module
2014-09-03 11:25:10 +08:00
minggo
9351caaa58
Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer
...
fix transition scene stencil buffer
2014-09-03 10:26:28 +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
yangxiao
fed2021707
Fixme: frustum culling
2014-09-03 09:02:32 +08:00
lite3
6ff1289aed
fix compile error on Xcode
2014-09-02 20:26:21 +08:00
andyque
aa929fe106
add chipmunk prebuilt lib for linux
2014-09-02 03:51:41 -07:00
andyque
3743f02c7e
finish ios/mac/android
2014-09-05 11:39:11 +08:00
lvlong
387f190ff1
Merge newcode into v3
2014-09-02 17:52:02 +08:00
lvlong
27f771744a
static model load problem of old version .
2014-09-02 17:33:22 +08:00
yangxiao
f84c6a5d27
Merge branch 'newcode' into transition
2014-09-02 17:15:05 +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
a429959e65
fix lua compile error
2014-09-02 01:31:02 -07:00
andyque
51e160beff
fix EditBox lua compile error
2014-09-02 17:37:55 +08:00
lite3
5d935c2cea
fix compile error on android
2014-09-02 16:16:36 +08:00
andyque
8033b1f7bb
Merge branch 'v3' into mergeExtensionEditBox
2014-09-02 00:03:16 -07:00
minggo
4749205b61
Merge pull request #7917 from super626/v3
...
bundle code adjustment
2014-09-02 14:58:53 +08:00
CocosRobot
dc15287ac3
[AUTO]: updating luabinding automatically
2014-09-02 05:45:07 +00:00
songchengjiang
8a88ba6142
Tab Format
2014-09-02 11:50:09 +08:00
songchengjiang
045af3f7a3
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-02 11:24:38 +08:00
songchengjiang
18d06015c6
Added More Models
...
Code optimization
2014-09-02 11:24:19 +08:00
yangxiao
de80d8c344
fix warning
2014-09-02 11:22:01 +08:00
andyque
dffdef1118
fix transition scene stencil buffer
2014-09-02 11:21:11 +08:00
kaishiqi
8f11dd7f8b
Update CCGLViewImpl.cpp
...
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
2014-09-02 11:13:30 +08:00
yangxiao
39e33cbf71
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-02 11:12:24 +08:00
yangxiao
de3921c101
fix render stats bug
2014-09-02 11:12:15 +08:00
lite3
74d8bf6f27
fix
2014-09-02 10:51:17 +08:00
yangxiao
d542624bfd
remove from map when release
2014-09-02 10:40:29 +08:00
andyque
6dc45f86e4
fix windows compile error
2014-09-02 10:05:22 +08:00
XiaoYang
2a0743e5a5
Merge pull request #121 from liuliang2004/transition
...
Configure project file
2014-09-01 17:58:22 +08:00
yangxiao
9ce30bdabd
add to linux
2014-09-01 17:52:13 +08:00
liuliang
c4242b4d0b
Configure project file
2014-09-01 17:45:45 +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
yangxiao
57a70b629f
add sequence3d
2014-09-01 16:00:50 +08:00
yangxiao
33005bedcb
add to cocos3d
2014-09-01 15:32:06 +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
97c8764ae7
remove unused header
2014-09-01 15:21:47 +08:00
Huabing.Xu
57dd8fd4e1
remove commented code
2014-09-01 15:19:02 +08:00
yangxiao
538fe2e543
Merge branch 'newcode' into transition
2014-09-01 15:14:30 +08:00
yangxiao
c24701ac79
Merge branch 'newcode' into v3
2014-09-01 15:11:27 +08:00
Huabing.Xu
6824453804
windows work for trianglesCommand
2014-09-01 15:08:09 +08:00
yangxiao
b5a3bb1c03
sequence3d work
2014-09-01 15:07:06 +08:00
Ningyu
1df8d423d0
win32 can not stop looping sound effect
2014-09-01 15:03:57 +08:00
Huabing.Xu
dad62ad6df
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/renderer/CCQuadCommand.h
2014-09-01 14:27:19 +08:00
Huabing.Xu
bfaef3574a
android works for trianglesCommand
2014-09-01 13:57:33 +08:00
Huabing.Xu
06eb6c2425
put TrianglesCommand in a seperate file
2014-09-01 11:49:04 +08:00
minggo
840f311f5c
Merge pull request #7916 from andyque/fixChipumnk
...
remove chipmunk.h include in header file
2014-09-01 11:38:12 +08:00
minggo
bb85ecf0da
Merge pull request #7913 from chuanweizhang2013/v3fixed
...
make debug writable path the same as release
2014-09-01 10:15:52 +08:00
yangxiao
49e6b098a6
check running scene when checkVisibility
2014-09-01 09:56:05 +08:00
songchengjiang
97f7d21f50
Format
2014-09-01 09:36:07 +08:00
yangxiao
f3e017e139
normalize quat
2014-09-01 09:34:09 +08:00
songchengjiang
3f8b430b3e
deleted Meshcommand
2014-09-01 09:33:08 +08:00
andyque
ff321ba1dc
fix chipmunk
2014-08-30 21:09:28 +08:00
lite3
6d462c5013
fix ccs.CustomGUIReader not in ccs table
2014-08-30 12:23:03 +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
lite3
3872ee9b59
add CustomGUIReader for lua
2014-08-29 18:50:21 +08:00
CocosRobot
cdc41711f6
[AUTO]: updating luabinding automatically
2014-08-29 10:38:25 +00:00
yangxiao
a039d6b0fc
animate3d transition
2014-08-29 18:25:42 +08:00
songchengjiang
4aa4287d28
test on Android
2014-08-29 17:29:15 +08:00
chuanweizhang2013
25a7f21056
make debug writable path the same as release
2014-08-29 17:27:55 +08:00
songchengjiang
34070677ad
Added testing Model Number
2014-08-29 17:11:18 +08:00
minggo
826e1018cb
fix conflict
2014-08-29 16:55:09 +08:00
minggo
afaea360fd
Merge pull request #7908 from dabingnn/v3_fix_bugs
...
V3 fix bugs
2014-08-29 16:45:52 +08:00
minggo
444b298028
fix compiling error on windows
2014-08-29 16:44:20 +08:00
lite3
4a374a1a2a
Merge branch 'v3' into customguireader
2014-08-29 16:36:42 +08:00
CocosRobot
3b3747d518
[AUTO]: updating luabinding automatically
2014-08-29 08:12:40 +00:00
Huabing.Xu
8e51377f2d
fix primitive draw error
2014-08-29 16:00:04 +08:00
minggo
1dcdbca4e0
revert lua-bindings
2014-08-29 15:54:20 +08:00
minggo
e4920ffdea
fix conflict
2014-08-29 15:45:21 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
minggo
58dd2f4a69
Merge pull request #7882 from andyque/addWebView
...
add WebView
2014-08-29 13:42:14 +08:00
songchengjiang
71d722854c
added mesh command
2014-08-29 12:08:28 +08:00
lvlong
496aad2fe7
remove 0.3 branch logic
2014-08-29 11:59:30 +08:00
lvlong
cbe61a4b73
modify log
2014-08-29 11:56:33 +08:00
andyque
4c046336da
fix linux
2014-08-29 11:53:39 +08:00
andyque
cf0baef7c0
add web view javascript support
2014-08-29 11:50:08 +08:00
andyque
043acb2fd4
rename webview to UIWebView
2014-08-29 11:28:28 +08:00
lvlong
15c945d89b
Merge branch 'newcode' into v3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-29 11:04:15 +08:00
songchengjiang
43eb725c27
resolve conflict
2014-08-29 11:02:34 +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
lvlong
5a1e0601a7
Code Standards
2014-08-29 10:43:26 +08:00
songchengjiang
96e6595e95
Added getInverseViewMatrix
2014-08-29 10:42:02 +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
yangxiao
18a0f34c5c
Merge branch 'newcode' into billboard
2014-08-29 10:12:00 +08:00
Huabing.Xu
528f4b5c0c
fix TextureAtlas drawNumberofQuads bug
2014-08-29 10:06:44 +08:00
minggo
a125ed0453
Merge pull request #7906 from Teivaz/v3_WP8
...
[WP8] Fixed project compilation.
2014-08-29 10:03:25 +08:00
Huabing.Xu
7c870cfcc1
fix skew matrix bug
2014-08-29 09:50:26 +08:00
songchengjiang
06e3eb955f
repaired BillBoard Depth Test
2014-08-29 09:30:59 +08:00
Ricardo Quesada
20d22a1c8a
Users new `// MARK: ` feature to mark sections
...
Instead of using `#praga mark` which was not compatible with other
compilers, it uses the `// MARK:` which is compatible with all compilers
2014-08-28 14:56:15 -07:00
songchengjiang
e6f055f3fd
calculated Z in View
...
Transparent Render
2014-08-28 19:22:01 +08:00
yangxiao
a3dd4e101a
animation transition
2014-08-28 18:53:15 +08:00