Dale Stammen
|
77c00bc77f
|
removed use of std::mutex. Now using lock-free concurrent_queue
|
2014-10-27 08:32:19 -07:00 |
yangxiao
|
7656ff2f0e
|
fix wrong vertex buffer size
|
2014-10-27 13:59:40 +08:00 |
minggo
|
34c2587f7c
|
Merge pull request #8928 from Svenito/vec_op
Add greater than operator to Vec2
|
2014-10-27 11:54:23 +08:00 |
minggo
|
23f922420a
|
Merge pull request #8919 from ahlwong/v3
Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0
|
2014-10-27 11:48:50 +08:00 |
minggo
|
baff367c94
|
Merge pull request #8918 from dumganhar/iss8843-drawpoint
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
|
2014-10-27 11:38:11 +08:00 |
minggo
|
f1ac0df761
|
Merge pull request #8921 from TimothyZhang/fix-program-cache-add
release old program with the same key before adding glprogram
|
2014-10-27 11:22:00 +08:00 |
Liam
|
d6564be67e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-10-27 11:16:58 +08:00 |
Liam
|
19ed3d1965
|
udpate for ui button state change event
|
2014-10-27 11:16:25 +08:00 |
minggo
|
7c09787324
|
Merge pull request #8925 from Teivaz/v3
* [WP8] Enabled GLProgramState restoring on render recreated
|
2014-10-27 11:13:18 +08:00 |
Timothy Zhang
|
d42f8cac65
|
replace tab with 4 spaces
|
2014-10-27 10:02:28 +08:00 |
Timothy Zhang
|
80230258d6
|
replace tab with 4 spaces
|
2014-10-27 09:59:47 +08:00 |
kaile.yin
|
dd517813a8
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
|
2014-10-25 23:02:38 +08:00 |
Liam
|
57e6631918
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-10-25 19:01:18 +08:00 |
Liam
|
f1970e98dd
|
update for ui button press event
|
2014-10-25 18:00:57 +08:00 |
minggo
|
b99f0bf321
|
Merge pull request #8926 from MSOpenTech/wp8.1-universal
WP8.1 universal app
|
2014-10-25 15:45:50 +08:00 |
yangxiao
|
0696041ea9
|
add getMeshArrayByName method
|
2014-10-25 12:27:03 +08:00 |
Sven Steinbauer
|
c9f5eacc2e
|
Add greater than operator to Vec2
|
2014-10-24 20:27:06 +01:00 |
Ahlwong
|
dfcdf10898
|
Fix Label Additional Kerning All Strings
|
2014-10-24 08:57:37 -07:00 |
Dale Stammen
|
042976265c
|
updated precompiled shaders for WP8
|
2014-10-24 07:20:16 -07:00 |
Dale Stammen
|
40e49cdc12
|
Merge branch 'v3' into wp8.1-universal
|
2014-10-24 07:08:55 -07:00 |
minggo
|
1c72b4fba8
|
Merge pull request #8924 from CocosRobot/update_lua_bindings_1414158758
[AUTO]: updating luabinding automatically
|
2014-10-24 22:04:20 +08:00 |
CocosRobot
|
0ef3887497
|
[AUTO]: updating luabinding automatically
|
2014-10-24 13:55:25 +00:00 |
minggo
|
ab365b9498
|
Merge pull request #8892 from dumganhar/rm-uthash
Removes uthash in CCGLProgram,uses std::unordered_map instead
|
2014-10-24 21:50:47 +08:00 |
minggo
|
a2eeea1d87
|
Merge pull request #8920 from super626/fixsprite
Fix sprite
|
2014-10-24 21:48:30 +08:00 |
teivaz
|
bfe83e5624
|
* [WP8] Enabled GLProgramState restoring on render recreated
|
2014-10-24 16:00:08 +03:00 |
Dale Stammen
|
fa6b70cbb8
|
disabled xaml functions for WP8
|
2014-10-24 05:59:59 -07:00 |
Timothy Zhang
|
0fb584ad92
|
release old program with the same key before adding glprogram
|
2014-10-24 18:31:00 +08:00 |
Liam
|
92bdfea638
|
update ui button size changed logic
|
2014-10-24 17:38:32 +08:00 |
yangxiao
|
4d08a08809
|
add getMeshCount method
|
2014-10-24 15:57:47 +08:00 |
yangxiao
|
f878533f85
|
load attached sprite from cache
|
2014-10-24 15:52:24 +08:00 |
XiaoYang
|
01e2d62e90
|
Merge pull request #149 from lvlonggame/v3
Fix bug: load sprite3D from cache, the attach node will be discarded.
|
2014-10-24 15:43:37 +08:00 |
yangxiao
|
7cf5b50790
|
add getMeshCount method
|
2014-10-24 15:24:36 +08:00 |
Dale Stammen
|
6fcd0ebafd
|
don't hide flyout when keyboard is hidden
|
2014-10-23 22:23:42 -07:00 |
Dale Stammen
|
5df4278e36
|
fixed reentrancy when closing flyout
|
2014-10-23 22:17:25 -07:00 |
Dale Stammen
|
b77e7a5a97
|
fixed reentrancy when closing flyout
|
2014-10-23 22:01:35 -07:00 |
Ahlwong
|
012683bf6e
|
Fix kerning on signle characters
|
2014-10-23 21:18:51 -07:00 |
James Chen
|
603700179e
|
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
|
2014-10-24 12:03:11 +08:00 |
lvlong
|
799f375802
|
Fix bug: load sprite3D from cache, the attach node will be discarded.
|
2014-10-24 12:02:55 +08:00 |
Dale Stammen
|
afa052c5c7
|
added critical section
|
2014-10-23 20:49:10 -07:00 |
Dale Stammen
|
f42afaa6bb
|
updated project files with new pch files
|
2014-10-23 19:40:57 -07:00 |
Dale Stammen
|
6e92d169cd
|
changed implementation to use xaml flyout for editbox
|
2014-10-23 19:30:32 -07:00 |
Dale Stammen
|
c82a75d4f7
|
added xaml support functions
|
2014-10-23 19:29:38 -07:00 |
Dale Stammen
|
2ddb692628
|
added flyout xaml to support uieditbox on winrt
|
2014-10-23 19:29:18 -07:00 |
Dale Stammen
|
96054e9c29
|
updated headers for change in pch.h
|
2014-10-23 19:28:53 -07:00 |
Dale Stammen
|
b6329c6c7b
|
added correct options to compile c file
|
2014-10-23 13:27:24 -07:00 |
Dale Stammen
|
b520e80e04
|
updated 2d and base file locations
|
2014-10-23 09:03:35 -07:00 |
Dale Stammen
|
0af2f30d61
|
fixed WP8_SHADER_COMPILER checks
|
2014-10-23 08:40:34 -07:00 |
Dale Stammen
|
a4294c07c1
|
added check for WP8_SHADER_COMPILER
|
2014-10-23 08:32:31 -07:00 |
Dale Stammen
|
d2f852c3cb
|
added editbox support for universal apps
|
2014-10-23 07:39:38 -07:00 |
Dale Stammen
|
b5fdf892b2
|
added text input from keyboard support for winrt
|
2014-10-23 07:38:46 -07:00 |
Dale Stammen
|
cc3b784dd1
|
added windows 8.1 platform support files
|
2014-10-23 07:38:04 -07:00 |
Dale Stammen
|
a4f13a91ab
|
added CC_NO_GL_POINTSIZE preprocessor define
|
2014-10-23 07:36:23 -07:00 |
Dale Stammen
|
89d3d7b7cf
|
added missing cocos2d files
|
2014-10-23 07:29:57 -07:00 |
Dale Stammen
|
9b2adef6b2
|
added CC_PLATFORM_WINRT
|
2014-10-23 07:15:58 -07:00 |
Dale Stammen
|
c0ebee6bc7
|
gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE
|
2014-10-23 07:15:22 -07:00 |
Dale Stammen
|
14568361aa
|
gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE
|
2014-10-23 07:14:58 -07:00 |
Dale Stammen
|
01fbcfcd31
|
Windows 8.1 ANGLE reguires vert and frag shaders to use same precision
|
2014-10-23 07:13:38 -07:00 |
Dale Stammen
|
1112cad792
|
remove PhoneDirect3DXamlAppComponent namesapce refactor
|
2014-10-23 07:12:51 -07:00 |
Dale Stammen
|
3d16bbc6b9
|
added UIEditBoxEvent. namespace refactor
|
2014-10-23 07:09:03 -07:00 |
Dale Stammen
|
b20015f845
|
updated for Universal App support
|
2014-10-23 07:07:58 -07:00 |
Dale Stammen
|
06913670dc
|
use device orientation for acceleration values
|
2014-10-23 07:04:13 -07:00 |
Dale Stammen
|
8af672c588
|
moved messagebox code to winrt cceglview to handle threading issues
|
2014-10-23 07:03:41 -07:00 |
Dale Stammen
|
bf9843a905
|
removed CMakeLists.txt
|
2014-10-23 07:02:36 -07:00 |
Dale Stammen
|
38d5be5082
|
no mp3 for winrt
|
2014-10-23 07:01:53 -07:00 |
Dale Stammen
|
00f9e888d2
|
enable console for winrt
|
2014-10-23 07:01:04 -07:00 |
Dale Stammen
|
753bc5034a
|
removed winrt/wp8 code. no longer needed
|
2014-10-23 06:59:09 -07:00 |
Mircea Rila
|
3d276db6d2
|
fix some warnings / remove TABs
|
2014-10-23 12:54:15 +03:00 |
kaile.yin
|
0f184a4982
|
add arriving last frame event
|
2014-10-23 17:38:04 +08:00 |
kaile.yin
|
e7de544231
|
1.fixed frame event may forword emit
|
2014-10-23 17:37:18 +08:00 |
James Chen
|
dd6bb0b3eb
|
Uses reference in for loop inside ccvector_std_string_to_luaval
|
2014-10-23 10:18:09 +08:00 |
Dhilan007
|
20d372b356
|
Fixed Label shifting when outline feature enabled
|
2014-10-22 14:34:01 +08:00 |
yangxiao
|
1a5ab908fd
|
Merge branch 'newcode' into v3
|
2014-10-21 19:31:15 +08:00 |
yangxiao
|
9be19cf5ac
|
remove nodetoparent
|
2014-10-21 19:29:56 +08:00 |
lvlong
|
63a47534ab
|
fix 0.2 version load bug.
|
2014-10-21 18:44:10 +08:00 |
minggo
|
14cb7518d6
|
Merge pull request #8894 from Dhilan007/v3-testcase-android
Fixed incorrect file path of audio resource in AudioEngine on Android.
|
2014-10-21 18:36:44 +08:00 |
Dhilan007
|
c66348435c
|
Fixed incorrect file path of audio resource in AudioEngine on Android.
|
2014-10-21 18:34:05 +08:00 |
James Chen
|
22776dcd88
|
Removes uthash in CCGLProgram
|
2014-10-21 17:29:24 +08:00 |
minggo
|
47697daf03
|
remove unneeded codes
|
2014-10-21 17:28:14 +08:00 |
lvlong
|
622df56614
|
fix OBB intersects bug
|
2014-10-21 17:22:42 +08:00 |
lvlong
|
8664111e4a
|
modify camera attach bug!
|
2014-10-21 17:19:50 +08:00 |
minggo
|
78fd325ac7
|
Merge pull request #8889 from Dhilan007/v3-testcase-android
Fixed line wrap error for system font on MAC
|
2014-10-21 16:55:22 +08:00 |
Dhilan007
|
90b2d8464b
|
Fixed line wrap error for system font on MAC
|
2014-10-21 16:46:00 +08:00 |
samuele3hu
|
8a2c66fc0e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-21 15:58:07 +08:00 |
samuele3hu
|
2f9dbb7142
|
Update cocos2d basic lua files and LabelTestNew.lua
|
2014-10-21 15:56:38 +08:00 |
Dhilan007
|
b741767b37
|
Rolling back text color of system font on Linux
|
2014-10-21 14:14:08 +08:00 |
minggo
|
65f007f5ff
|
Merge pull request #8857 from zhongfq/patch-2
fix memory leak when add listener to ui object
|
2014-10-21 13:57:07 +08:00 |
minggo
|
60ecec2ff6
|
Merge pull request #8881 from super626/v3
Fix Bugs
|
2014-10-21 13:55:48 +08:00 |
minggo
|
5c2ad2b151
|
Merge pull request #8878 from minggo/fix-warning
fix warning
|
2014-10-21 13:54:49 +08:00 |
yangxiao
|
25409b441a
|
adjust code
|
2014-10-21 11:59:03 +08:00 |
minggo
|
38e4acb120
|
Merge pull request #8880 from huangshiwu/v3_wp8fixbug
fix WP8 debug mode crash - update WP8's precompileshader.h
|
2014-10-21 11:58:07 +08:00 |
XiaoYang
|
9a7ecbf22b
|
Merge pull request #146 from tangziwen/v3
fix some bugs when loading Animation3D from binary file
|
2014-10-21 11:47:45 +08:00 |
tangziwen
|
61a6fda1c0
|
fix some bugs when loading Animation3D from binary file
|
2014-10-21 11:43:28 +08:00 |
minggo
|
db8dc25b01
|
fix warning
|
2014-10-21 11:40:34 +08:00 |
huanghsiwu
|
e392bf9b17
|
fix wp8 debug mode crash - update WP8's precompileshader.h to match shader's modify
|
2014-10-21 11:14:07 +08:00 |
SunLightJuly
|
0cb8a3922b
|
fixed bug of definition of utils:: getCascadeBoundingBox()
|
2014-10-21 11:07:11 +08:00 |
XiaoYang
|
bf931d5883
|
Merge pull request #145 from tangziwen/v3
fix animation3D ID bug
|
2014-10-21 10:04:46 +08:00 |
minggo
|
6313f9a622
|
Merge pull request #8868 from samuele3hu/v3_new_spine
Update LuaMinXmlHttpRequest and remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
|
2014-10-21 09:33:40 +08:00 |
yangxiao
|
1a72d89194
|
fix AABB computation
|
2014-10-20 22:53:24 +08:00 |
tangziwen
|
8f7d202816
|
fix animation3D ID bug
|
2014-10-20 19:22:00 +08:00 |
CocosRobot
|
e02558e391
|
[AUTO]: updating luabinding automatically
|
2014-10-20 10:17:27 +00:00 |
minggo
|
b2d1549686
|
Merge pull request #8869 from Dhilan007/v3-movefile
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
|
2014-10-20 18:10:52 +08:00 |
samuele3hu
|
20bcafa143
|
Fix the bug that callbacks aren’t triggered when response failed
|
2014-10-20 17:43:04 +08:00 |
minggo
|
0dd8e89bb2
|
Merge pull request #8863 from Dhilan007/v3-labelfix
Fix wrong text color for system font on Linux/Window
|
2014-10-20 16:38:32 +08:00 |
Dhilan007
|
a5f838496c
|
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
|
2014-10-20 16:25:24 +08:00 |
samuele3hu
|
72a98c154d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-20 16:07:01 +08:00 |
samuele3hu
|
38b462100b
|
Update LuaMinXmlHttpRequest.h/.cpp
|
2014-10-20 16:05:13 +08:00 |
minggo
|
f224f275ec
|
Merge pull request #8851 from pipu/#8838
Fixed #8838
|
2014-10-20 15:14:07 +08:00 |
Dhilan007
|
4765ed8494
|
Fix wrong text color for system font on Linux/Window
|
2014-10-20 14:33:33 +08:00 |
minggo
|
1fba616ba7
|
Merge pull request #8859 from super626/v3
3d shader optimize
|
2014-10-20 14:12:54 +08:00 |
minggo
|
1ae3dd7fc9
|
Merge pull request #8860 from CocosRobot/update_lua_bindings_1413785078
[AUTO]: updating luabinding automatically
|
2014-10-20 14:12:21 +08:00 |
CocosRobot
|
5e09b1e3b1
|
[AUTO]: updating luabinding automatically
|
2014-10-20 06:06:43 +00:00 |
minggo
|
f661703307
|
Merge pull request #8852 from zhongfq/patch-1
fix memory leak when reload texture
|
2014-10-20 14:06:09 +08:00 |
minggo
|
49bd79d14a
|
Merge pull request #8853 from 2youyouo2/v3_EventFrame
fixed emit frame event
|
2014-10-20 13:57:38 +08:00 |
minggo
|
2c3f22eb11
|
Merge pull request #8854 from Dhilan007/v3-labelfix
Fix Label: endless loop if not using system font, and constrained length is less than one character width
|
2014-10-20 13:52:38 +08:00 |
yangxiao
|
30733cf35e
|
shader optimize
|
2014-10-20 13:41:26 +08:00 |
pipu
|
50a8f9f3fb
|
Modify that parse "AnchorPointFrame"
|
2014-10-20 12:43:01 +08:00 |
pipu
|
8072328ca6
|
Modify that record path of .csb file
|
2014-10-20 11:56:48 +08:00 |
Eric Zhong
|
2206e4edb8
|
fix memory leak when add listener to ui object
|
2014-10-20 11:20:53 +08:00 |
samuele3hu
|
29bf39bfab
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-20 11:09:41 +08:00 |
minggo
|
8d3e4818a5
|
Merge pull request #8842 from joshuastray/v3
add needed link library for linux
|
2014-10-20 10:56:54 +08:00 |
Eric Zhong
|
fdd20b4d73
|
fix memory leak when reload texture
|
2014-10-20 10:43:18 +08:00 |
Dhilan007
|
0bb02fb34f
|
Fix Label: endless loop if not using system font, and constrained length is less than one character width
|
2014-10-20 10:41:01 +08:00 |
samuele3hu
|
1195960ea7
|
Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32
|
2014-10-20 10:22:44 +08:00 |
kaile.yin
|
400cceeae8
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
|
2014-10-20 10:18:29 +08:00 |
pipu
|
0134e9247d
|
Fixed #8838
|
2014-10-20 10:15:44 +08:00 |
kaile.yin
|
959844d9bb
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3_EventFrame
|
2014-10-20 10:03:33 +08:00 |
youyou
|
03ebe0152b
|
fixed timeline loop
|
2014-10-19 21:32:23 +08:00 |
minggo
|
c1128a227d
|
Merge pull request #8847 from samuele3hu/v3_new_spine
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
|
2014-10-19 20:10:12 +08:00 |
samuele3hu
|
634d42775e
|
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
|
2014-10-19 17:00:05 +08:00 |
Jialong Zhai
|
2befd74b0e
|
add needed link library for linux
|
2014-10-18 15:40:47 +08:00 |
CocosRobot
|
96d709aff3
|
[AUTO]: updating luabinding automatically
|
2014-10-18 07:36:54 +00:00 |
minggo
|
bca15538e3
|
Merge pull request #8823 from super626/v3
add isVisibleByVisitingCamera check
|
2014-10-18 15:11:45 +08:00 |
minggo
|
8218804c52
|
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
[LUA]Add New AudioEngine on window
|
2014-10-18 15:11:29 +08:00 |
Dhilan007
|
5ca3483dd8
|
fixed compile error
|
2014-10-18 13:44:19 +08:00 |
Dhilan007
|
c9bc80f831
|
Fix compile error
|
2014-10-18 13:03:28 +08:00 |
samuele3hu
|
529ee72432
|
Fix compile error triggered by UIHelper.cpp
|
2014-10-18 00:25:55 +08:00 |
samuele3hu
|
6502beaf95
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-18 00:14:53 +08:00 |
samuele3hu
|
3348f8300e
|
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
|
2014-10-18 00:13:22 +08:00 |
minggo
|
7e6ee9c15a
|
Merge pull request #8801 from 2youyouo2/v3
add deprecated information for Armature::drawContour
|
2014-10-17 23:02:49 +08:00 |
CocosRobot
|
20781825f2
|
[AUTO]: updating luabinding automatically
|
2014-10-17 14:56:22 +00:00 |
kaile.yin
|
5b0e2f0304
|
fixed emit last frame several times
|
2014-10-17 20:43:01 +08:00 |
Liam
|
3089317eb7
|
Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3
|
2014-10-17 19:18:12 +08:00 |
Liam
|
3f954857a8
|
update for lay out
|
2014-10-17 19:13:37 +08:00 |
yangxiao
|
cfb6a7846f
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-10-17 18:08:55 +08:00 |
yangxiao
|
66dd0807eb
|
add isVisibleByVisitingCamera check when visit
|
2014-10-17 18:07:45 +08:00 |
Dhilan007
|
81a8e80496
|
[LUA]Add New AudioEngine on window
|
2014-10-17 17:53:33 +08:00 |
minggo
|
58601fd8ec
|
Merge pull request #8804 from pipu/v3_Modify_Parse_Protobuf_Plist
Modify reader in order to parse attribute "Plist"
|
2014-10-17 17:50:02 +08:00 |
minggo
|
d241e568b0
|
Merge pull request #8788 from samuele3hu/v3_new_spine
Update the deprecated Func and update bindings-generator
|
2014-10-17 16:35:51 +08:00 |
pipu
|
1c187a4653
|
Modify reader in order to parse attribute "Plist"
|
2014-10-17 16:35:17 +08:00 |
minggo
|
7b5e4f9eba
|
Merge pull request #8800 from joshuastray/v3
fix typo of file name
|
2014-10-17 16:33:34 +08:00 |