yangxiao
a67825e950
use shader without light by default
2014-10-10 15:01:14 +08:00
minggo
4856b6782a
Merge pull request #7979 from giginet/scene-reader-canvas-size
...
SceneReader sets contentSize by canvasSize.
2014-10-10 15:00:28 +08:00
Huabing.Xu
e69465e428
remove texture unit 4-7, only 0 -3 is reserved
2014-10-10 14:06:37 +08:00
Huabing.Xu
f097c76e46
fix compile error for macro redefinition
2014-10-10 14:05:57 +08:00
Dhilan007
250875b081
fixed compile error
2014-10-10 14:03:20 +08:00
andyque
d5fe0758ed
fix cocostudio include path
2014-10-10 13:48:49 +08:00
pipu
d699b5809b
Modifying libprotocolbuf.a as protocolbuffer.a
2014-10-10 12:52:42 +08:00
Dhilan007
6a8c4f4194
Fixed FileUtils::removeFile doesn't work on iOS
2014-10-10 11:59:35 +08:00
minggo
2a95286329
Merge pull request #7785 from DaisukeHashimoto/fix_CCActionManagerEx_Bug
...
use fileName for _actionDic key
2014-10-10 11:13:41 +08:00
andyque
da48649370
fix button title only content size issue
2014-10-10 11:01:51 +08:00
minggo
ba5ff2e8e3
Merge pull request #8586 from super626/v3
...
Fix warning of Bundle3D and modify light
2014-10-10 10:46:24 +08:00
pipu
ee624e47cc
1. Modifying UIScale9Sprite
...
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
minggo
3aa6337974
Merge pull request #8599 from dabingnn/v3_fixEGLConfigOnAndroid
...
fix egl config error on android
2014-10-10 10:41:52 +08:00
Huabing.Xu
254ee5b873
Merge branch 'v3' into v3_fixGLProgramCrash
2014-10-10 10:09:26 +08:00
yangxiao
7a23cc3c1a
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-10 09:55:56 +08:00
yangxiao
1ef511d31f
Merge branch 'newcode' into v3
2014-10-10 09:53:57 +08:00
samuele3hu
f97a7ae52d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-10-10 09:52:29 +08:00
samuele3hu
115d81574c
Add CameraTest、OBBTest and related lua bindings
2014-10-10 09:49:25 +08:00
Ahlwong
5027f24348
Fix UIButton Scale 9 Highlight
2014-10-09 12:48:09 -07:00
Huabing.Xu
d5e29d285d
fix gel Config error on android
2014-10-09 18:34:14 +08:00
XiaoYang
b77559fe5d
Merge pull request #136 from songchengjiang/new_v3
...
Fixed CosOuterAngle error
2014-10-09 18:31:24 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Dhilan007
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
minggo
f928046f50
Merge pull request #8580 from Dhilan007/v3-labelfix
...
issue #8492:fix endless loop when dimensions that are not enough to fit one character
2014-10-09 17:05:39 +08:00
yangxiao
88fc4258ca
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-09 17:02:10 +08:00
yangxiao
222bf570f2
Merge branch 'newcode' into v3
2014-10-09 17:01:35 +08:00
songchengjiang
34efbf189a
Fixed getCosOuterAngle errors
2014-10-09 16:16:02 +08:00
minggo
b8c5ce6db3
Merge pull request #8588 from Dhilan007/v3-label8582
...
fixed issue#8582: opacity of label
2014-10-09 15:50:44 +08:00
songchengjiang
88012cf86b
Merge branch 'v3_new' into v3
...
Conflicts:
tests/lua-tests/src/Sprite3DTest/Sprite3DTest.lua
2014-10-09 15:49:50 +08:00
minggo
273863685c
Merge pull request #8595 from andyque/fixLinuxCompileError
...
Fix linux compile error
2014-10-09 14:51:56 +08:00
martell
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
Dhilan007
462e38cbc6
fixed opacity of label
2014-10-09 10:54:35 +08:00
XiaoYang
7ecd8c519a
Merge pull request #135 from lvlonggame/v3
...
Remove string err that is no used
2014-10-09 10:14:06 +08:00
yangxiao
c087f31e94
modify return type of getDirection and getDirectionInWorld
2014-10-09 10:12:52 +08:00
Ricardo Quesada
d326db427f
removes the `3d_export.h` file
2014-10-08 18:30:23 -07:00
SunLightJuly
1062dec335
modified project files and make files
2014-10-08 18:44:58 +08:00
Dhilan007
6f50143e0a
Fixed LabelAtlas opacity do not change when setting parent node's opacity
2014-10-08 18:28:24 +08:00
Dhilan007
8ea473de7b
fix endless loop when dimensions that are not enough to fit one character
2014-10-08 18:22:35 +08:00
CocosRobot
70a2195ccf
[AUTO]: updating luabinding automatically
2014-10-08 09:53:11 +00:00
Naoyuki Totani
b0d1fb79b3
call detach method on thread exit
2014-10-08 18:34:06 +09:00
SunLightJuly
763b54e5cb
added LuaStack::loadChunksFromZIP()
2014-10-08 17:30:14 +08:00
lvlong
cba155b5bc
Remove string err no used
2014-10-08 15:23:31 +08:00
minggo
8aa03e107f
Merge pull request #8209 from boyu0/fix_physics_crash
...
fix bug: physics crashes when remove/add children too quick.
2014-10-08 13:48:03 +08:00
martell
8a4b8afc6c
Android: added support for building libcocos2d
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:35 +01:00
martell
d420ae39e2
Added CC_STATIC support for 3d, all these commits will be squashed and renamed, structured and signed at the end
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:27 +01:00
martell
1a7ecbe427
Finalise Mac Support for cmake
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:19 +01:00
martell
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
martell
ecd8a02ee6
Fixed up some more cmake errors
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:01 +01:00
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
martell
fe32bcb952
added support for static and shared builds with audio and studio
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:52 +01:00
martell
c7f3594a1b
added support for static and shared builds with ui
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:38 +01:00
martell
d9228d31c0
added support for static and shared builds on windows
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:18 +01:00
martell
028d15921e
fix warning because of extra comma's
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:19:57 +01:00
martell
1ef0f41e0e
Changed WIN32 to _WIN32 to support gnu c++11
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:17:55 +01:00
Ricardo Quesada
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
Sergey
d9b0039517
Scale9Sprite capInsets set fix
2014-10-03 17:38:02 +04:00
Ricardo Quesada
42ace3e59c
Adds lambda support in node
...
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
2014-10-02 21:25:55 -07:00
Ricardo Quesada
cc3df75d1f
works on win32
...
std::iterators weren't used correctly
2014-10-02 15:46:47 -07:00
Ricardo Quesada
12e9d18ab7
Compiles on Windows Phone 8
2014-10-01 19:08:34 -07:00
minggo
44aba5b2af
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
...
Scale9Sprite improvements
2014-09-30 17:09:02 +08:00
minggo
2ecfcee2a6
Merge pull request #8216 from Dhilan007/v3-audio-fix
...
fix audio issues(log output:Too Many Objects) after play audio many times on Android
2014-09-30 15:19:46 +08:00
CocosRobot
a96a2a992d
[AUTO]: updating luabinding automatically
2014-09-30 07:13:25 +00:00
minggo
d1a0adf1a9
Merge pull request #8200 from Dhilan007/v3-audio-win32
...
New Audio Engine[Win32]
2014-09-30 15:09:00 +08:00
Dhilan007
ed9c8b2693
fix audio issues(log output:Too Many Objects) after play audio many times.
2014-09-30 15:00:52 +08:00
Sergey Perepelitsa
d9204b009e
scale9Sprite without scale9enabled scale fix
...
scale9Sprite crop > border tile bug fix
2014-09-30 10:59:20 +04:00
Dhilan007
02fcb6488a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
2014-09-30 14:19:27 +08:00
SunLightJuly
c108616a01
standardized codes
2014-09-30 13:17:03 +08:00
SunLightJuly
4ba19791ed
fixed bug in Cocos2dxLuaLoader
2014-09-30 13:11:39 +08:00
minggo
804b26344e
fix warnings
2014-09-30 11:58:38 +08:00
Dhilan007
db45794625
fix macro
2014-09-30 09:57:28 +08:00
Dhilan007
18307d52da
fix macro
2014-09-30 09:48:24 +08:00
Dhilan007
7ebe4a5548
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/audio/AudioEngine.cpp
cocos/audio/apple/AudioPlayer.h
cocos/audio/include/AudioEngine.h
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
2014-09-30 09:45:47 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
boyu0
2b0afa6063
fix bug: physics crashes when remove/add children too quick.
2014-09-30 08:15:46 +08:00
lite3
21081b9e1a
use reference
2014-09-30 01:07:19 +08:00
Ricardo Quesada
7a1dac5aa6
Fixes audio issues when using CMake on Mac
2014-09-29 14:07:11 -03:00
lite3
240b922271
remove '../' at path on android.
...
because AAssetManager_open do not support '../' in path.
2014-09-29 19:31:05 +08:00
minggo
09ebebc6d2
Merge pull request #8203 from dabingnn/v3_changeTabtoSpace
...
change tab to space
2014-09-29 18:47:22 +08:00
Huabing.Xu
88679c2437
change tab to space
2014-09-29 18:44:01 +08:00
minggo
db9c5137a0
Merge pull request #8199 from CocosRobot/update_lua_bindings_1411985319
...
[AUTO]: updating luabinding automatically
2014-09-29 18:30:52 +08:00
minggo
0cd2f985e8
Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug
...
fix egl config chooser bug
2014-09-29 18:24:19 +08:00
CocosRobot
50a06a13ad
[AUTO]: updating luabinding automatically
2014-09-29 10:11:17 +00:00
minggo
8a5829631d
Merge pull request #8171 from huangshiwu/v3_Teivaz
...
Enable screen orientation change handling - by Teivaz
2014-09-29 18:02:03 +08:00
minggo
f4b080a03f
Merge pull request #8192 from samuele3hu/v3_3D
...
Add Camera3DTest ,BillBoradTest and more Sprite3DTest for Lua, and update the related lua bindings files
2014-09-29 17:56:42 +08:00
Frank.Xu
1c1d917620
Fix pull request #6894 merge conflicts
2014-09-29 16:22:55 +08:00
SunLightJuly
fbbc90431e
standardized codes
2014-09-29 15:42:56 +08:00
SunLightJuly
e0b9878e58
added ClippingRegionNode
2014-09-29 15:07:05 +08:00
Dhilan007
65a14a6d3f
Improved thread safety
2014-09-29 14:17:51 +08:00
minggo
c4fac7b37d
Merge pull request #8193 from andyque/improveCocostudioReader
...
replace raw string literal with const external variables to keep consistence.
2014-09-29 13:49:28 +08:00
minggo
6583bf6b1f
Merge pull request #8179 from MSOpenTech/wp8-v3-fix
...
WP8 fixes for v3.3 app certification tests
2014-09-29 13:42:40 +08:00
andyque
c9b959ec82
replace raw string literal with const external variables to keep consistence.
2014-09-29 11:35:03 +08:00
samuele3hu
87fccd7881
Remove manaul lua-bindings for Armature::getOffsetPoints
2014-09-29 10:37:19 +08:00
samuele3hu
cb38f6bd5b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-29 10:27:46 +08:00
Dhilan007
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
samuele3hu
f00187d3bb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-09-29 09:48:35 +08:00
samuele3hu
99e1c6640e
Add BillBoardTest and update related bindings files
2014-09-29 09:43:22 +08:00
CocosRobot
fd9ed15d6d
[AUTO]: updating luabinding automatically
2014-09-29 01:25:31 +00:00
Dhilan007
d52144d1e0
fix linker errors on WIN32
2014-09-28 21:45:09 +08:00
songchengjiang
39deb73c3a
move light from 3d to base(Windows)
2014-09-28 17:23:25 +08:00
minggo
9511f0deb5
Merge pull request #8130 from yestein/v3
...
Add Cocostudio Armature getOffsetPoints API for Lua
2014-09-28 16:48:37 +08:00
samuele3hu
6b2acf88fc
Modify CameraTest and update related lua-bindings files
2014-09-28 16:47:06 +08:00
minggo
8ed336c681
Merge pull request #8167 from hongliang-goudou/v3
...
bugfix for UI animation playing crash if GUI JSON file is loaded again.
2014-09-28 16:42:49 +08:00
minggo
289c1edfe7
Merge pull request #8174 from lite3/v3
...
fix compile error when CC_SPRITE_DEBUG_DRAW
2014-09-28 16:21:04 +08:00
yangxiao
38873dd999
move light fix linux and android
2014-09-28 16:05:20 +08:00
yangxiao
dbf564208b
move light from 3d to base
2014-09-28 16:02:12 +08:00
samuele3hu
e50eaf684f
Add CameraTest and update related lua-bindings files
2014-09-28 14:31:58 +08:00
Sergey Perepelitsa
c1f37a6926
Misprint fix
...
scale9Image double draw fix
2014-09-28 10:30:33 +04:00
yangxiao
744e09c141
reset change to getDirectionInWorld
2014-09-28 11:03:18 +08:00
yangxiao
53dee7ef86
can ci android compile?
2014-09-28 10:21:47 +08:00
yangxiao
75e5ca30ee
merge cocos
2014-09-28 09:55:31 +08:00
Sergey Perepelitsa
ab45c582a7
Scale9Sprite improvements
...
small bugs fix
small optimizations
support for cropped sprite frames
2014-09-28 01:58:26 +04:00
xseekerj
0bfd934d03
CCPlatformMacros.h
...
Added std::nothrow for CREATE_FUNC.
2014-09-27 19:53:44 +08:00
andyque
750c61dd30
fix linux compile error
2014-09-27 01:55:41 -07:00
andyque
aea729ef01
fix cmakelists.txt of linux platform
2014-10-09 12:01:22 +08:00
Dale Stammen
3c7a22f776
removed CMakeLists.txt
2014-09-26 12:42:20 -07:00
Dale Stammen
24e5df1644
updated wp8 precompiled shaders
2014-09-26 12:16:16 -07:00
Dale Stammen
67377b7d46
added check for WINRT_NO_WINSOCK
2014-09-26 12:05:19 -07:00
Dale Stammen
fd3177d350
removed WINRT
2014-09-26 11:41:12 -07:00
Dale Stammen
ef58fa7fd4
fixed winrt file functions to pass app certification tests.
2014-09-26 11:38:17 -07:00
Dale Stammen
209f67f222
fixed property sheet
2014-09-26 11:01:43 -07:00
Dale Stammen
f24312bc77
added UNICODE
2014-09-26 11:01:05 -07:00
CocosRobot
021d21a2a7
[AUTO]: updating luabinding automatically
2014-09-26 15:37:17 +00:00
minggo
99064b091f
Merge pull request #8164 from super626/v3
...
move logic about camera from Director to scene
2014-09-26 23:29:58 +08:00
lite3
da361810a3
fix compile error when CC_SPRITE_DEBUG_DRAW
2014-09-26 17:14:55 +08:00
yangxiao
abd960725a
add to linux project
2014-09-26 16:54:01 +08:00
yangxiao
c335df1071
fix normal flag check error
2014-09-26 16:46:15 +08:00
samuele3hu
2ac96ed06e
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
2014-09-26 16:39:54 +08:00
Huabing.Xu
d7a5c464dd
remove test code
2014-09-26 16:37:05 +08:00
Huabing.Xu
7cfcdc1af8
fix egl config chooser bug
2014-09-26 16:23:54 +08:00
huanghsiwu
7a2a44ad88
Enable screen orientation change handling - by Teivaz
2014-09-26 16:16:34 +08:00
samuele3hu
691074eb7c
Add Camra3DTest and update sprite3DTest
2014-09-26 16:00:57 +08:00
yangxiao
11a7bf8697
ligthmask to unsigned int
2014-09-26 15:52:04 +08:00
yangxiao
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
yangxiao
db2ff49f26
adjust according to minggo
2014-09-26 14:13:26 +08:00
CocosRobot
963c02eb3d
[AUTO]: updating luabinding automatically
2014-09-26 05:45:33 +00:00
minggo
7d33aef5cb
Merge pull request #8156 from samuele3hu/v3_check_lua
...
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
2014-09-26 11:49:09 +08:00
Hong Liang
9448345de3
bugfix for UI animation playing crash if GUI JSON file is loaded again.
2014-09-26 11:29:48 +08:00
minggo
bd56a71b1b
CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION
2014-09-26 10:44:29 +08:00
yangxiao
6626655308
move render logic from Director to scene
2014-09-26 09:36:43 +08:00
yangxiao
e2f1b91117
remove unused variable
2014-09-25 22:25:43 +08:00
yangxiao
90523fc3d5
fix light check
2014-09-25 22:24:47 +08:00
yangxiao
02489ecad6
add light to cocos2d.h
2014-09-25 22:18:50 +08:00
yangxiao
ca9eb3d203
support ambient light without normal & optimaze code
2014-09-25 18:32:33 +08:00
minggo
615b367277
Merge pull request #8158 from dabingnn/v3_neon
...
V3 neon
2014-09-25 18:02:46 +08:00
yangxiao
8f3f37c2bb
auto switch shader according to light status
2014-09-25 17:13:46 +08:00
Huabing.Xu
af0c9ce2fa
reverse target=android-10 on android
2014-09-25 16:54:33 +08:00
yangxiao
2317720fd2
move uniformnames to cpp
2014-09-25 16:18:55 +08:00
Huabing.Xu
ed9848a782
neon works on android(only on armeabi-v7a)
2014-09-25 16:09:28 +08:00
yangxiao
eab0951c2d
reset
2014-09-25 16:07:57 +08:00
yangxiao
567c632d98
config max support light number in shader
2014-09-25 15:29:32 +08:00
samuele3hu
38530772ae
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-25 15:26:03 +08:00
samuele3hu
3e5638fe91
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_lua
2014-09-25 15:17:55 +08:00
samuele3hu
23fb2062c9
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
2014-09-25 15:05:42 +08:00
CocosRobot
7192681618
[AUTO]: updating luabinding automatically
2014-09-25 06:50:06 +00:00
minggo
9509f4cf9a
Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix
...
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
2014-09-25 14:44:28 +08:00
minggo
d491d9e6db
Merge pull request #8149 from andyque/fixIOS8EditBox
...
fix ios8 EditBox orientation problem
2014-09-25 13:47:23 +08:00
minggo
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
minggo
9510d6d946
Merge pull request #8136 from andyque/moveWinEditBox
...
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
2014-09-25 13:38:19 +08:00
andyque
34fbca9c50
fix ios8 EditBox orientation problem
2014-09-25 11:46:42 +08:00
yangxiao
56313aa895
merge cocos
2014-09-25 11:05:02 +08:00
Huabing.Xu
ab19c81371
add neon64 implementation
2014-09-25 10:53:44 +08:00
Huabing.Xu
a897f23023
refactor neon code
2014-09-25 10:46:25 +08:00
samuele3hu
2cc48d1f81
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-25 10:40:31 +08:00
minggo
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
minggo
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
huanghsiwu
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
toma
d1faf75b58
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
2014-09-25 01:46:17 +09:00
andyque
3c434ec354
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
2014-09-24 17:47:38 +08:00
Huabing.Xu
cc39ed288a
android can link with neon(neon code has some bugs)
2014-09-24 17:21:38 +08:00
andyque
53d28168fe
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
2014-09-24 16:39:32 +08:00
Huabing.Xu
2a75b7192a
enable neon on IOS and refactor code
2014-09-24 16:12:47 +08:00
yestein
b19b2c5786
replace tab to 4 spaces
2014-09-24 15:14:47 +08:00
minggo
79446999bb
Merge pull request #8116 from Dhilan007/v3-labelfix
...
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
2014-09-24 15:03:40 +08:00
minggo
dd3c295caa
Merge pull request #8125 from cpascal/fix_invalid_windows_definition
...
Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode
2014-09-24 15:02:30 +08:00
minggo
fdb30f1ee7
Merge pull request #8115 from Dhilan007/v3-audio903
...
New Audio Engine -MAC
2014-09-24 15:00:53 +08:00
yestein
72c5d77273
Add Cocostudio Armature getOffsetPoints API for Lua
2014-09-24 11:20:36 +08:00
Huabing.Xu
e1d11ae5c3
move sse code to mathUtil.cpp
2014-09-24 11:06:07 +08:00
Huabing.Xu
b18e0501fc
move code to mathUtil.cp
2014-09-24 10:32:29 +08:00
Sergey Perepelitsa
0a46a83794
fix missing includes
2014-09-23 23:19:25 +04:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
Dale Stammen
2226aa5c8a
need to reset the accelerometer before trying to enable it again
2014-09-23 10:01:42 -07:00
Huabing.Xu
e74b2f3164
add macro to enable neon on IOS
2014-09-23 18:15:26 +08:00
songchengjiang
d956148a94
Tab Format
2014-09-23 17:19:27 +08:00
songchengjiang
b51dc584d5
Light optimization
2014-09-23 17:08:28 +08:00
cpascal
a70f51b1e3
Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode
...
I modified CC_PLATFORM_WINDOWS to CC_PLATFORM_WIN32.
--
In the CCPlatformConfig.h,
the definitions are..
// win32
#if defined(WIN32) && defined(_WINDOWS)
#undef
CC_TARGET_PLATFORM
#define CC_TARGET_PLATFORM
CC_PLATFORM_WIN32
#endif
2014-09-23 17:35:57 +09:00
minggo
34799958b5
Merge pull request #8101 from SunLightJuly/get_cascade_bounding_box
...
added utils::getCascadeBoundingBox()
2014-09-23 11:13:09 +08:00
Dmitry Bushtets
d242d79443
* added default value for _batchNode in CCSprite
2014-09-22 19:00:21 +03:00
Guy Kogus
6e91c65e74
Windows Phone 8 can now open URLs.
2014-09-22 17:47:38 +04:00
Guy Kogus
a9a0ff35f6
Added method for converting from std::string to Platform::String.
2014-09-22 17:47:38 +04:00
Sergey
2255cf91ba
openUrl function for all platform but on windows RT empty function
2014-09-22 17:47:38 +04:00
songchengjiang
216c40fe9e
Modified Light Shader
2014-09-22 18:08:58 +08:00
Dhilan007
ac916c3027
Cocos2d-x used a deprecated method to get the content size of a CCLabelTTF on iOS 7.
2014-09-22 18:01:13 +08:00
Dhilan007
c37371a543
fix noise on mac
2014-09-22 16:59:24 +08:00
Dhilan007
077ffb2b43
update lua binding
2014-09-22 15:54:35 +08:00
Dhilan007
936c3b3f79
New Audio Engine -MAC
2014-09-22 15:38:12 +08:00
samuele3hu
f0608a6d70
Update lua bindings for Mesh and add a Sprite3DHitTest
2014-09-22 15:29:38 +08:00
yangxiao
61def04ca6
add light mask
2014-09-22 11:14:30 +08:00
minggo
533a454914
Merge pull request #8113 from huangshiwu/v3_wp8test
...
fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp
2014-09-22 09:54:39 +08:00
huanghsiwu
41b4ba8307
fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp
2014-09-22 09:42:33 +08:00
minggo
3f7fc6ead1
Merge pull request #8111 from joewan/v3
...
fix compile on ubuntu.
2014-09-22 09:38:52 +08:00
minggo
e8b20d8583
Merge pull request #8093 from wohaaitinciu/v3_WebView_win32
...
web view win32
2014-09-22 09:30:29 +08:00
joewanchen
3f2895beab
fix compile on ubuntu.
2014-09-21 23:49:43 +08:00
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
teivaz
1d08acac08
* [WP8] Fixed project compilation. Removed references to deleted source files
2014-08-28 13:47:14 +03:00
minggo
50a2cb2b86
remove unneeded includes
2014-08-28 17:32:23 +08:00
minggo
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
CocosRobot
ebe75e702a
[AUTO]: updating luabinding automatically
2014-08-28 08:58:52 +00:00
lite3
2b6bdac05d
Merge branch 'v3' into customguireader
2014-08-28 15:13:10 +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
yangxiao
16ab05a8cf
sequence3d
2014-08-28 13:47:17 +08:00
songchengjiang
7751762893
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-08-28 13:37:37 +08:00
yangxiao
c5a152708d
clear transparent queue
2014-08-28 13:35:32 +08:00
yangxiao
fdcef01244
remove v_normal when no lights
2014-08-28 13:04:49 +08:00
lvlong
a05d50d66e
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
2014-08-28 12:02:33 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
minggo
f0f1bf1b92
Merge pull request #7883 from giginet/set-node-name-via-ccs-scene
...
Add the feature that CCSSceneReader can load name properties as node names.
2014-08-28 11:14:15 +08:00
songchengjiang
6a2f4c635e
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-08-28 11:06:02 +08:00
Huabing.Xu
08006aa47a
Merge branch 'v3' into v3_trianglesCommand
2014-08-28 10:56:38 +08:00
yangxiao
52b2b1d2cb
transparent render queue
2014-08-28 10:53:57 +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
minggo
45b382cb1f
Merge pull request #7898 from CocosRobot/update_lua_bindings_1409191992
...
[AUTO]: updating luabinding automatically
2014-08-28 10:17:26 +08:00
minggo
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
songchengjiang
5067741140
Deleted Plane Model
2014-08-28 10:16:15 +08:00
CocosRobot
31a9997922
[AUTO]: updating luabinding automatically
2014-08-28 02:15:00 +00:00
minggo
b8447baf73
Merge pull request #7893 from slackmoehrle/glview_fix
...
Glview fix
2014-08-28 10:10:17 +08:00
Huabing.Xu
bdf92cfbd4
Renderer Only knows about Triangles Command, every command inherit from Triangles Command can be batched
2014-08-28 09:58:39 +08:00
yangxiao
6b686ae0db
android light
2014-08-28 09:46:54 +08:00
Dhilan007
837e8665b5
remove redundant LOCAL_STATIC_LIBRARIES
2014-08-28 09:46:09 +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
781b0bc478
properties revert back to 10
2014-08-27 16:35:13 -07: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
Slack-Moehrle
1b5413d8b4
comment out [glview release]; and [eaglview release];
2014-08-27 10:42:27 -07:00
Slack-Moehrle
d4d2b8c83e
comment out [glview release]; and [eaglview release];
2014-08-27 10:26:09 -07:00
songchengjiang
365c57bc2b
replaced Light Shader by optimized Light Shader
2014-08-27 23:40:49 +08:00
Dhilan007
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
Dhilan007
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
songchengjiang
26dc7de802
Repaired Light Shader BUG On ios
2014-08-27 21:03:52 +08:00
samuele3hu
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
songchengjiang
72773a806c
decompose Light Struct
2014-08-27 19:12:49 +08:00
lvlong
e05f6bc874
modify for compress
2014-08-27 18:44:31 +08:00
Huabing.Xu
c627affa5e
add triangles command, make quad command inherit from triangles command
2014-08-27 18:39:49 +08:00
yangxiao
a71f42c817
add transparent queue
2014-08-27 17:53:46 +08:00
songchengjiang
731d1165c3
Spot Light Shader optimization
2014-08-27 17:09:20 +08:00
Huabing.Xu
91e332c253
dynamic update index for quad command
2014-08-27 16:43:14 +08:00
songchengjiang
682bcf9755
Tab Format
2014-08-27 16:28:53 +08:00
songchengjiang
53ad652463
Light Shader optimization
2014-08-27 16:26:01 +08:00
minggo
17ab047b7d
fix compiling error on windows
2014-08-27 15:13:41 +08:00
Huabing.Xu
c4ecff9804
temp backup
2014-08-27 14:54:35 +08:00
yangxiao
8cb3edf91f
merge cocos light work
2014-08-27 14:53:39 +08:00
yangxiao
fdc0fad935
tmp work
2014-08-27 14:46:24 +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
minggo
ac029c3d0d
Merge pull request #7887 from super626/v3
...
2d cull only for default camera
2014-08-27 13:39:13 +08:00
yangxiao
26f7345693
2d cull only for default camera
2014-08-27 12:09:23 +08:00
samuele3hu
7a9a16d6aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test
2014-08-27 11:11:21 +08:00
yangxiao
c5515874d5
merge cocos
2014-08-27 11:00:14 +08:00
samuele3hu
471820568f
Update android.mk of cocos and lua-templates
2014-08-27 10:28:04 +08:00
samuele3hu
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
samuele3hu
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +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
minggo
31f406bbdd
Merge pull request #7884 from minggo/cocos2dxrendererjava-onpause-fix
...
invoke nativeOnPause after onSurfaceCreated is invoked
2014-08-27 10:17:42 +08:00
minggo
d290076917
invoke nativeOnPause after onSurfaceCreated is invoked
2014-08-27 10:13:03 +08:00
andyque
4597de069d
improve test case and make program more robust
2014-08-27 08:02:22 +08:00
giginet
d07903827d
Add the feature that CCSSceneReader can load name properties as node names.
...
When name property of objects on CocosStudio Scene are set.
They will be loaded and set as Node::name property.
Thanks to this commit. We are enable to access to each nodes on scene via its names.
```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
auto object = scene->getChildByName<cocos2d::Sprite *>("objectName");
```
2014-08-27 03:49:07 +09:00
andyque
fc3a30b9ca
modify cmakeList.txt
2014-08-26 23:25:07 +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
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
andyque
15815118a2
finish android version
2014-08-26 16:53:37 +08:00
minggo
3d4f22ca74
add cocos2d.h into pre-compiled header
2014-08-26 16:45:24 +08:00
songchengjiang
0bfa76b375
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-08-26 15:09:56 +08:00
yangxiao
8a38ce10be
first version billboard
2014-08-26 15:07:37 +08:00
yangxiao
7d6b8ea706
merge cocos
2014-08-26 14:58:58 +08:00
minggo
c935a39090
Merge pull request #7879 from dabingnn/v3_fixLabelStatus
...
fix LabelStatus string error when labelStatus is recreated
2014-08-26 14:51:08 +08:00
yangxiao
65b0cca132
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
2014-08-26 14:37:56 +08:00
andyque
631e1a70c4
add WebView-inl.h and refactor Android code
2014-08-26 14:26:37 +08:00
songchengjiang
3369bb7e51
Replaced Tab Format
2014-08-26 14:25:01 +08:00
yangxiao
7ff75fb397
remove warning
2014-08-26 14:19:08 +08:00
songchengjiang
cf964d62de
Light Shader optimization
2014-08-26 14:18:22 +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
andyque
736b83acb1
Merge branch 'add_webview' of https://github.com/gin0606/cocos2d-x into addWebView
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-26 10:56:10 +08:00
yangxiao
cff5b65314
Merge branch 'newcode' into v3
2014-08-25 21:20:49 +08:00
Huabing.Xu
ef472d6250
fix LabelStatus string error when labelStatus is recreated
2014-08-25 17:19:45 +08:00
samuele3hu
07cf4d3526
Fix the win32 and android compile error
2014-08-25 14:10:13 +08:00
gin0606
41011824c1
Add WebView to libui Android
2014-08-25 15:01:37 +09:00
songchengjiang
1a1ccda3ed
repaired Action BUG
2014-08-25 13:58:15 +08:00
gin0606
de429591c3
Add WebView to libui iOS
2014-08-25 14:47:42 +09: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
c7f7623320
reserve animation size
2014-08-25 11:30:34 +08:00
minggo
7ece79e7d3
Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963
...
[AUTO]: updating luabinding automatically
2014-08-25 11:01:27 +08:00
minggo
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
CocosRobot
5db16cdc23
[AUTO]: updating luabinding automatically
2014-08-25 02:34:32 +00:00
minggo
74fc9931e7
fix compiling error of cpp-tests on linux
2014-08-24 19:12:36 -07:00
samuele3hu
c495e5266a
Remove useless win32 module project and adjust the related project setting
2014-08-25 09:59:50 +08: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
281da9f1d7
Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases
2014-08-25 09:51:08 +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
zii
e8a5fc9fef
Update CCActionManager.cpp
2014-08-23 17:06:46 +08:00
zii
4763531085
Update CCActionManager.cpp
2014-08-23 17:03:26 +08:00
CocosRobot
899e0a4182
[AUTO]: updating luabinding automatically
2014-08-22 11:25:33 +00: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
samuele3hu
d1b4d43a0b
Remove CCModuleManager.h/cpp and adjust the related project
2014-08-22 15:10:46 +08:00
yangxiao
6ff2aa2755
change skin joint count to 40
2014-08-22 15:00:34 +08:00
yangxiao
3a0d63caa6
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-22 14:55:11 +08:00
yangxiao
a102946d35
android and linux
2014-08-22 14:54:26 +08:00
XiaoYang
e4737f9070
Merge pull request #112 from liuliang2004/Meshv3
...
Modify project file
2014-08-22 14:46:46 +08:00
yangxiao
39cc03173b
remove unused variable
2014-08-22 14:43:48 +08:00
liuliang
c7c091e4b6
Modify project file
2014-08-22 14:32:27 +08:00
yangxiao
81dbb0bca4
add comment
2014-08-22 14:02:51 +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
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
samuele3hu
523dcdb6fb
Update cocos2d android.mk
2014-08-22 13:43:18 +08:00
samuele3hu
ada7fa23d3
Add CC_DLL for related network files
2014-08-22 13:42:46 +08:00
samuele3hu
700699a37f
Modify MciPlayer.cpp to support Unicode
2014-08-22 13:41:48 +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
minggo
ab9c35616e
Merge pull request #7847 from andyque/addLuabindingsToUI
...
add deprecated options for ui, add Scale9Sprite bindings
2014-08-22 13:38:45 +08:00
yangxiao
7818b28ee3
Merge branch 'newcode' into v3
2014-08-22 13:32:57 +08:00
yangxiao
022b7e3fd3
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-22 13:27:14 +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
minggo
7fd1521bbf
update version
2014-08-22 11:48:14 +08:00
huangshiwu
7f57d15cb3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs
2014-08-22 11:04:13 +08:00
huangshiwu
7dec715288
OpenGL context attributions setting revise
2014-08-22 10:55:39 +08:00
minggo
21cb90bf12
Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR
...
Migrate some changes from Cocos2d-JS to -x
2014-08-21 22:38:59 +08:00
pandamicro
bb5e189f30
Fix warning or Bundle3D
2014-08-21 20:02:22 +08:00
pandamicro
59cedea6dc
Reverse useless change
2014-08-21 19:40:18 +08:00
pandamicro
634847412b
Reverse CC_CONSTRUCTOR_ACCESS modification
2014-08-21 19:36:28 +08:00
lvlong
4ce334c0c3
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
2014-08-21 18:16:21 +08:00
lvlong
d00bcbccb0
add texture coord2-7
2014-08-21 18:14:24 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
pandamicro
34b93a24ff
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
...
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
2014-08-21 16:07:19 +08:00
minggo
4563e65427
fix compiling error on android and fix some coding style
2014-08-21 15:41:05 +08:00
pandamicro
5fb9f59633
Fix small issues
2014-08-21 15:40:53 +08:00
pandamicro
9544482058
Fix Android.mk s
2014-08-21 15:40:42 +08:00
pandamicro
485dd1f7da
Update #3897 : Refactor missed protected constructors
2014-08-21 15:40:22 +08:00
minggo
b349ce43ae
use macro to control whether to use jpeg, tiff, webp or not
2014-08-21 15:19:26 +08:00
pandamicro
909dd0d397
Update #3897 : Refactor missed protected constructors
2014-08-21 15:11:33 +08:00
minggo
c0d1bfca26
Merge pull request #7832 from Teivaz/v3
...
Fixed WinRT project
2014-08-21 13:37:03 +08:00
teivaz
aecdb832a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-08-21 13:48:05 +03:00
teivaz
a70688dc96
+ [WINRT] Inserted newly added files to cocos WIN RT project
2014-08-21 13:47:53 +03:00
lvlong
7753f4c471
modify assert(0)
2014-08-21 13:30:51 +08:00
songchengjiang
e42eb950a3
Name modification
2014-08-21 11:33:00 +08:00
liuliang
9ee6683569
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-21 11:24:11 +08:00
liuliang
082689971d
Modify the model resolution
2014-08-21 11:23:31 +08:00
XiaoYang
7cf00c535d
Merge pull request #109 from lvlonggame/merge-bundle
...
fix binary load bug.
2014-08-21 10:44:00 +08:00
lvlong
1f349cb3fe
fix binary load bug.
2014-08-21 10:38:33 +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
teivaz
4697cb07e6
! Set version to 3.3 (as it is no longer 3.2)
2014-08-21 18:04:46 +03:00
andyque
34b3f1f0e3
remove warnings
2014-08-21 09:36:12 +08:00
huangshiwu
2a03bea1a4
OpenGL context attributions setting
2014-08-21 09:35:32 +08:00
lite3
c136e8e079
fix indent
2014-08-21 02:15:27 +08:00
lite3
679d525453
Merge branch 'v3' into customguireader
2014-08-21 01:22:07 +08:00
lite3
9f348962c7
Merge branch 'v3' into customguireader
2014-08-21 00:18:30 +08:00
yangxiao
3a69fc9b14
rename ModelDataNode to ModelData
2014-08-20 19:19:49 +08:00
yangxiao
fcf4d79b06
setGLProgramState support
2014-08-20 19:01:04 +08:00
yangxiao
bd4aec4bcd
support multi-attribs
2014-08-20 18:20:19 +08:00
songchengjiang
3a1c0583fb
optimization
2014-08-20 16:41:45 +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
minggo
f3b211351b
Merge pull request #7830 from dabingnn/v3_addPrimitiveheadFie
...
V3 add primitivehead fie
2014-08-20 16:04:27 +08:00
yangxiao
9a6181fdca
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-20 15:02:26 +08:00
yangxiao
79857c471b
multiply Mesh attrib support
2014-08-20 15:02:16 +08:00
Huabing.Xu
b5e5e2d8d5
add primitive head file to cocos2d.h
2014-08-20 14:48:50 +08:00
XiaoYang
82c2304e64
Merge pull request #105 from lvlonggame/merge-bundle
...
format code
2014-08-20 14:23:40 +08:00
Huabing.Xu
22db2abcaf
add != operator in Blendfunc
2014-08-20 14:21:13 +08:00
lvlong
8e0d80d4c6
Merge branch 'newcode' into merge-bundle
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-20 14:00:25 +08:00
liuliang
df272ee7f5
Modify the parsing
2014-08-20 13:53:15 +08:00
minggo
bbf5c56e83
Merge pull request #7827 from andyque/ccRandom
...
add c++11 random library support
2014-08-20 13:35:12 +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
liuliang
c6cd9b029d
Modify the parsing
2014-08-20 11:40:04 +08:00
minggo
d91dc842de
Merge pull request #7822 from Teivaz/v3_WP8
...
Added method for custom precompiled shader program loading in WP8
2014-08-20 11:22:26 +08:00
teivaz
0e5a79d486
+ [WP8] Added method for custom precompiled shader program loading
2014-08-20 12:02:16 +03:00
minggo
84f2e248d1
Merge pull request #7823 from newnon/v3_Label_fix
...
Label performance problem
2014-08-20 10:28:01 +08:00
minggo
2b709f92bb
Merge pull request #7816 from xiangxw/fix_sendPrompt
...
fix sendPrompt()
2014-08-20 10:25:30 +08:00
lvlong
93ee44c912
format code
2014-08-20 10:24:46 +08:00
minggo
74fba21fc0
Merge pull request #7825 from 2youyouo2/v3
...
remove cascade color for CorlorFrame
2014-08-20 10:23:15 +08:00
minggo
41905cb4c0
Merge pull request #7818 from andyque/fixPageViewTouchBeganPositionIssue
...
fix pageView touch location
2014-08-20 10:11:59 +08:00
andyque
9a3c2dc6a4
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-20 09:56:16 +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
Sergey
055a143f9d
Label performance problem
2014-08-19 15:02:09 +04:00
Sergey
bfe6513706
setKeepScreenOn method
2014-08-19 15:00:58 +04:00
andyque
a8ab1a85b7
fix linux compile error
2014-08-19 17:42:17 +08:00
teivaz
0e7ec265ee
* [WP8] Fixed default search path: renamed "Assets\Resources" to "Assets\res"
2014-08-20 11:54:41 +03:00
songchengjiang
4cf1c6a47c
deleted redundant code
...
Replace Tab Format
2014-08-19 16:32:49 +08:00
minggo
49c6d1e746
Merge pull request #7819 from minggo/androidmk-optimize
...
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 16:11:40 +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
kaile.yin
d884054ec9
remove cascade color for CorlorFrame
2014-08-19 15:19:47 +08:00
andyque
deb7ff64d4
fix pageView touch location
2014-08-19 15:14:07 +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
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
yangxiao
5cf30a363c
remove unused code
2014-08-19 13:54:06 +08:00
yangxiao
289b04a2ae
merge cocos2d
2014-08-19 13:19:42 +08:00
yangxiao
b2d43a4167
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-19 11:56:21 +08:00
yangxiao
f2729c7ef2
cache work
2014-08-19 11:56:09 +08:00
xiangxw
bef6a2a7f1
fix sendPrompt()
...
a extra '\0' will be sent when sizeof() is used
2014-08-19 11:46:30 +08:00
andyque
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
minggo
dd1bc70cde
Merge pull request #7271 from newnon/v3_getPreviousLocation_fix
...
bug on began touch - prevpoint
2014-08-19 09:49:01 +08:00
teivaz
db805ee2c8
* Fixed WP8 cocos library project
...
* Fixed profiling macros
2014-08-19 19:24:56 +03:00
CocosRobot
4236e89245
[AUTO]: updating luabinding automatically
2014-08-18 15:26:32 +00: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
CocosRobot
85d505b427
[AUTO]: updating luabinding automatically
2014-08-18 14:47:35 +00:00
minggo
22fa650bbf
Merge pull request #7807 from samuele3hu/v3_3_3d_module
...
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
2014-08-18 22:38:58 +08:00
lvlong
43bc54b134
delete empty line
2014-08-18 20:28:59 +08:00
lvlong
2b70cf3dd8
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-18 20:22:56 +08:00
lvlong
9c25139895
animation & animations
2014-08-18 20:22:18 +08:00
yangxiao
d5df1f3ab2
forget return true
2014-08-18 18:56:01 +08:00
yangxiao
d6ed1af1f7
compute submesh aabb error
2014-08-18 18:34:18 +08:00
minggo
2f2ee43b21
Merge pull request #7808 from 2youyouo2/v3
...
fixed ArmatureAnimation::setSpeedScale
2014-08-18 18:19:23 +08:00
songchengjiang
9603366fcb
Fixed Android compiled Problem
2014-08-18 18:05:13 +08:00
lvlong
da26fa3ca5
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-18 18:04:44 +08:00
lvlong
7311d5139b
add VERTEX_ATTRIB_TEX_COORD1
2014-08-18 18:02:58 +08:00
yangxiao
b9c28dd8d7
return true
2014-08-18 17:57:14 +08:00
yangxiao
2f600f8af4
fix bundle mac
2014-08-18 17:52:27 +08:00
liuliang
ee4e4ca455
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-18 17:39:28 +08:00
liuliang
e151b207a4
Modified binary load model, compatible with the old format
2014-08-18 17:31:04 +08:00
songchengjiang
10afb9b9af
Finished Point Light
...
Finished Directional Light
Finished Spot Light
2014-08-18 17:10:07 +08:00
yangxiao
01c1691a4f
deal aabb
2014-08-18 17:02:13 +08:00
minggo
e2829cd68a
Merge pull request #7802 from SmartCat/v3
...
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32
2014-08-18 16:56:15 +08:00
kaile.yin
6abaf27b14
fixed ArmatureAnimation::setSpeedScale
2014-08-18 16:19:54 +08:00
samuele3hu
91fd40dd3a
Add a newline for some files
2014-08-18 15:27:54 +08:00
samuele3hu
2d8ae3a917
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module
2014-08-18 15:08:04 +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
samuele3hu
7596a8a831
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-18 14:58:57 +08:00
yangxiao
30ce92f677
obj work, make code clean
2014-08-18 14:16:34 +08:00
yangxiao
219404bd7d
change tex param
2014-08-18 11:42:41 +08:00
yangxiao
cd4da73beb
merge, obj not work now
2014-08-18 11:28:57 +08:00
yangxiao
79a55286ce
refactor to new model
2014-08-18 11:13:08 +08:00
liuliang
2f816aea2c
Modified load static model
2014-08-18 10:32:23 +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
yangxiao
1e961e00b7
obj loader work
2014-08-17 22:49:53 +08:00
songchengjiang
9b3a02f350
Added Light Test
...
Added Point Light
2014-08-17 21:33:33 +08:00
lvlong
da63032a46
draw sub mesh bug
2014-08-16 20:38:00 +08:00
lvlong
b1c9fb99e3
animation is ok.
2014-08-16 19:51:59 +08:00
lvlong
9c41b1a826
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 18:20:29 +08:00
lvlong
4f4b8dc25c
for testing
2014-08-16 18:19:41 +08:00
yangxiao
fb1b7ca3bb
fix skeleton
2014-08-16 18:18:15 +08:00
lvlong
24bb827ef4
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 16:58:02 +08:00
yangxiao
7159914248
old model work
2014-08-16 16:56:04 +08:00
lvlong
4dd9102e87
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
2014-08-16 15:45:28 +08:00
lvlong
5b59b8a987
fixed some loading problems.
2014-08-16 15:40:00 +08:00
yangxiao
a11ac316bf
create model
2014-08-16 14:52:44 +08:00
yangxiao
8a5bbabe21
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:49:47 +08:00
yangxiao
47d15a4aa1
load
2014-08-16 14:49:38 +08:00
lvlong
84dcff2f7a
Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle
...
Conflicts:
cocos/3d/CCBundle3D.cpp
2014-08-16 14:44:41 +08:00
lvlong
d60a7734b1
merge bundle.
2014-08-16 14:28:15 +08:00
yangxiao
ae361c91cd
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-16 14:16:27 +08:00
yangxiao
ef2db59825
modify render
2014-08-16 14:16:17 +08:00
liuliang
ae79603791
Modify the material parsing
2014-08-16 14:14:37 +08:00
lvlong
f8f416cd3c
merge bundle
2014-08-16 11:12:26 +08:00
liuliang
21dcc51c0f
Modify the material parsing
2014-08-16 10:41:42 +08:00
liuliang
1b92409d78
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-16 09:59:25 +08:00
liuliang
f35dd346eb
Modify Analytic
2014-08-16 09:59:08 +08:00
yangxiao
3ab7c6b952
create from bundle data
2014-08-15 20:52:45 +08:00
songchengjiang
def3f8220b
Fixed GLProgram
2014-08-15 19:24:06 +08:00
songchengjiang
2b1efc59cb
GLProgram Added Light Shader
...
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
liuliang
b4a20feabc
Parse the data file
2014-08-15 18:27:28 +08:00
yangxiao
9ab48bd71e
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 18:27:03 +08:00
yangxiao
a740841f5e
submeshid
2014-08-15 18:21:58 +08:00
Dmitry Bushtets
1257f642c7
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)
2014-08-15 13:20:37 +03:00
liuliang
0db924d7cd
Parse the data file
2014-08-15 18:20:37 +08:00
liuliang
c533f66b9f
Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
2014-08-15 17:46:40 +08:00
liuliang
b5665a4723
Modify the binary parsing
2014-08-15 17:46:21 +08:00
liuliang
ab80c5026d
Modify the binary parsing
2014-08-15 17:45:37 +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
yangxiao
d09695b118
create from data
2014-08-15 17:41:04 +08:00
yangxiao
6f0fc48e8e
merge cocos2d
2014-08-15 16:36:17 +08:00
songmiao
361770e0f3
add BillBorad and BillBoardTest
2014-08-15 16:15:29 +08:00
yangxiao
e2312bd353
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-08-15 15:55:32 +08:00
yangxiao
42916bcbe6
newmodel
2014-08-15 15:55:21 +08:00
CocosRobot
bdfc48b127
[AUTO]: updating luabinding automatically
2014-08-15 07:44:57 +00:00
liuliang
4c8b24d113
Modify the binary parsing
2014-08-15 15:32:15 +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
andyque
cf8e40f8ce
deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead
2014-08-15 15:26:19 +08:00
minggo
b842c57954
Merge pull request #7794 from minggo/seperate-jpg-tiff-webp
...
Seperate jpg tiff webp
2014-08-15 15:24:09 +08:00
CocosRobot
24f0e8aada
[AUTO]: updating luabinding automatically
2014-08-15 07:23:17 +00:00
minggo
8364e179a4
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
...
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
minggo
e59283343a
Merge pull request #7751 from zawasp/win32_minimize
...
add minimize / restore for desktop (win32, linux, mac)
2014-08-15 15:00:13 +08:00
yangxiao
88bb1482e3
newmodel
2014-08-15 14:58:30 +08:00
minggo
11b4793d75
Merge pull request #7793 from dabingnn/v3_fixRandomCrashForPrimitive
...
fix android background and foreground crash for primitive
2014-08-15 14:56:49 +08:00
songchengjiang
1e9c02dfa3
Added Light Class
2014-08-15 14:51:23 +08:00
minggo
408472625c
add CCModuleManager into CMakeLists.txt
2014-08-15 14:46:21 +08:00
minggo
aa052eb1c1
add CCModuleManager into vs project
2014-08-15 14:39:15 +08:00
minggo
bf75e9996a
separate jpeg, tiff and webp
2014-08-15 14:29:10 +08:00
Huabing.Xu
5e7b75c5c7
fix android background and foreground crash for primitive
2014-08-15 14:05:17 +08:00
minggo
bcbb589cfb
Merge pull request #7784 from Teivaz/v3
...
Fixed WP8 compilation errors
2014-08-15 13:39:05 +08:00
minggo
38fb58cf29
Merge pull request #7792 from minggo/fix-warning
...
fix warnings
2014-08-15 13:33:08 +08:00
yangxiao
fdcec51cf4
struct for newmodel
2014-08-15 13:03:53 +08:00
minggo
db17084b6d
fix warnings
2014-08-15 12:06:16 +08:00
songchengjiang
7ed40a8051
Added Light
2014-08-15 10:32:07 +08:00
teivaz
90e5870499
* Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project)
2014-08-14 15:35:36 +03:00
teivaz
885fd16b9e
* Fixed WP8 compilation error (Added missing files CCCamera.h/cpp to the project)
2014-08-14 15:20:48 +03:00
teivaz
e9563696db
* Fixed WP8 compilation errors (added path to CCGLView.h)
...
- Modified filters for CCCamera.h/cpp
2014-08-14 15:14:25 +03:00
Daisuke Hashimoto
5b620fbfe1
use fileName for _actionDic key
2014-08-14 21:10:51 +09:00
yangxiao
a508477eda
remove unused code
2014-08-14 19:07:40 +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
minggo
1643c29a00
Merge pull request #7782 from liang8305/v3
...
mLastTickInNanoSeconds is the renderStart
2014-08-14 18:11:41 +08:00
yangxiao
84bb22780a
merge cocos2d
2014-08-14 17:16:20 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
胖梁
3619fb943a
mLastTickInNanoSeconds is the renderStart
...
because:
this.mLastTickInNanoSeconds = renderEnd - renderInterval;
renderInterval = renderEnd - renderStart
so:
this.mLastTickInNanoSeconds = renderEnd - ( renderEnd - renderStart );
so:
this.mLastTickInNanoSeconds = renderStart ;
so:
no need nanoTime() twice
2014-08-14 17:07:04 +08:00
andyque
e8a5147b92
copy new added widget property to clone method
2014-08-14 16:56:15 +08:00
Mircea Rila
d9a0c6a2ad
replace tabs with spaces
2014-08-14 10:48:09 +03:00
andyque
e27a2aee91
fix typo
2014-08-14 14:36:30 +08:00
yangxiao
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
lvlong
dbf58b8873
modify function name and add default to switch block.
2014-08-14 13:15:37 +08:00
andyque
18851d3e81
add customization to UIButton and UIPageView
2014-08-14 11:14:24 +08:00
samuele3hu
85ad4241a0
Modify Xcode project setting
2014-08-14 11:10:52 +08:00
minggo
888da8eee8
Merge pull request #7776 from CocosRobot/update_lua_bindings_1407982527
...
[AUTO]: updating luabinding automatically
2014-08-14 10:38:21 +08:00
yangxiao
f6da3b76b5
use renderer passed instead of get from global
2014-08-14 10:29:17 +08:00
yangxiao
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
CocosRobot
6467dcaa57
[AUTO]: updating luabinding automatically
2014-08-14 02:17:25 +00:00
minggo
f9e6dab507
Merge pull request #7770 from Dhilan007/v3-label-issue
...
close issue#5734:Label:The letters sometimes slightly cut.
2014-08-14 10:04:00 +08:00
yangxiao
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
minggo
e468beea86
Merge pull request #7760 from dabingnn/v3_addCallBackForRenderTexture
...
add comment for the limit of RenderTextue::saveToFile
2014-08-14 09:43:54 +08:00
minggo
a6c75c0eb6
Merge pull request #7767 from super626/v3_merge2
...
reset camera position in initDefault, Fix some tile map can not show bug
2014-08-14 09:43:40 +08:00
minggo
d76724b6aa
Merge pull request #7773 from CocosRobot/update_lua_bindings_1407980273
...
[AUTO]: updating luabinding automatically
2014-08-14 09:43:08 +08:00
CocosRobot
7a99220aad
[AUTO]: updating luabinding automatically
2014-08-14 01:39:44 +00: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
minggo
f1ae73bf30
Merge pull request #7766 from samuele3hu/v3_3_fix
...
Add release_print lua binding
2014-08-14 09:35:16 +08:00
minggo
91d5f69584
Merge pull request #7768 from andyque/addDisableStateToControl
...
add missing safe guard in checkbox callback
2014-08-14 09:34:55 +08:00
minggo
234f100187
Merge pull request #7769 from super626/mirrortest
...
add mirror test
2014-08-14 09:31:57 +08:00
minggo
7d2ca95988
Merge pull request #7749 from zawasp/virtual_pause_resume
...
virtual Node::pause() / Node::resume()
2014-08-14 09:31:10 +08:00
yangxiao
7bfd636b16
reset default camera rotation
2014-08-14 09:06:06 +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
Dhilan007
ff147b6cf8
close issue#5734:Label:The letters sometimes slightly cut.
2014-08-13 18:40:35 +08:00
yangxiao
6ce3b5c20a
add mirror test
2014-08-13 17:38:16 +08:00
andyque
3ee6a9ab10
add missing safe guard in checkbox callback
2014-08-13 17:15:15 +08:00
yangxiao
b4ec344bcf
reset camera position in initDefault
2014-08-13 15:57:22 +08:00
CocosRobot
df7c0ae1cb
[AUTO]: updating luabinding automatically
2014-08-13 06:42:14 +00:00
yangxiao
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
andyque
e2d609c05d
add UITextField color & place hold color, fix double delete bug
2014-08-13 11:28:37 +08:00
samuele3hu
5b1ceb5e5d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_fix
2014-08-13 10:31:12 +08:00
samuele3hu
8ab7647b54
Add release_print lua bindings
2014-08-13 10:27:06 +08:00
Huabing.Xu
5b99ee71c1
add comment for the limit of RenderTextue::saveToFile
2014-08-13 10:14:26 +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
minggo
9ae20d1bd3
Merge pull request #7740 from GavinThornton/v3
...
Update CCEventTouch.h
2014-08-13 09:39:17 +08:00
Mircea Rila
cfafeb1e87
add minimize / restore for win32
2014-08-12 22:22:47 +03:00
Mircea Rila
0154f7a94a
virtual Node::pause() / Node::resume()
2014-08-12 21:05:09 +03:00
yangxiao
5ce9afbd69
create default camera at Scene constructor
2014-08-12 23:34:06 +08:00
lite3
fa83d63c5d
replace NULL to nullptr
...
fix compile error
2014-08-12 17:35:18 +08:00
yangxiao
46e59f1150
Merge branch 'newcode' into v3_merge
2014-08-12 17:34:58 +08:00
lite3
8f59d8ac93
add GUIReader::registerTypeAndCallBack for std::function
2014-08-12 17:19:52 +08:00
gin0606
17aa2833db
Fix xcode warning that cause `getEngine` inline expansion
2014-08-12 18:07:17 +09:00
lite3
69e2b815ed
fix: copy map when getParseCallBackMap() and getParseObjectMap()
2014-08-12 17:05:23 +08:00
minggo
46cdd6f8dd
Merge pull request #7701 from dabingnn/v3_renderPrimitive
...
V3 render primitive
2014-08-12 16:11:40 +08:00
GavinThornton
1d0deb0bc1
Update CCEventTouch.h
...
MAX_TOUCHES=5 is less than most touch devices, iPad/Android tablets can almost all handle all 10-11 touches. Perhaps a value of 15 would be better?
Note: There is a #define IOS_MAX_TOUCHES_COUNT 10 in CCEAGLView.mm already for this, but multitouch fails on touch 5 in "void GLViewProtocol::handleTouchesBegin" at the code:-
// The touches is more than MAX_TOUCHES ?
if (unusedIndex == -1) {
CCLOG("The touches is more than MAX_TOUCHES, unusedIndex = %d", unusedIndex);
continue;
}
2014-08-12 01:02:06 -07:00
minggo
cc37780861
Merge pull request #7736 from dabingnn/v3_addSkinnedOutline
...
V3 add skinned outline
2014-08-12 15:07:21 +08:00
yangxiao
32645c1622
fix default camera, add listener for projection change
2014-08-12 14:42:08 +08:00
Huabing.Xu
cb8c80de0d
export MeshSkin as CC_DLL
2014-08-12 14:41:25 +08:00
lvlong
f191bebe72
optimize Sprite3D get aabb.
2014-08-12 13:45:06 +08:00
minggo
d80d7ed714
Merge pull request #7037 from boyu0/feature5537_physics_step
...
closed #5537 : add setAutoStep, isAutoStep and step method for PhysicsWorld
2014-08-12 13:37:29 +08:00
Huabing.Xu
6cf2e7d091
add CC_DLL for primitive classes
2014-08-12 11:56:21 +08:00
Huabing.Xu
1145859d38
remove commented codes
2014-08-12 11:44:06 +08:00
gin0606
89cf0c1e8c
fix getEngine
2014-08-12 12:01:27 +09: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
CocosRobot
cbbe7b9c60
[AUTO]: updating luabinding automatically
2014-08-12 02:08:16 +00:00
minggo
bed1ccf0f3
Merge pull request #7733 from huangshiwu/v3_glviewfix
...
CCGLView modefy
2014-08-12 09:51:27 +08:00
minggo
e3723d8398
Merge pull request #7734 from 2youyouo2/v3
...
fixed bone rotation isn't right
2014-08-12 09:51:12 +08:00
minggo
ba092ede25
Merge pull request #7732 from andyque/addDLLExportToLayoutParameter
...
add virtual destructor
2014-08-12 09:49:29 +08:00
kaile.yin
358b1f6736
fixed bone rotation isn't right
2014-08-11 19:53:51 +08:00
huangshiwu
77bc3a0e60
GLView modefy additional
2014-08-11 16:55:23 +08:00
minggo
e0ef4d16d3
Merge pull request #7724 from cpascal/fix_ime
...
Fix a correct onGLFWCharCallback
2014-08-11 16:18:59 +08:00
minggo
ec1864cb7a
Merge pull request #7731 from dabingnn/v3_add_CC_DLL_For_cocos2dVersion
...
add missed CC_DLL for cocos2dVersion function
2014-08-11 16:18:31 +08:00
huangshiwu
1177b0d545
CCGLView modefy
2014-08-11 16:15:02 +08:00
andyque
3e1f7119f9
add virtual destructor
2014-08-11 15:54:40 +08:00
Huabing.Xu
5086758063
add missed CC_DLL for cocos2dVersion function
2014-08-11 15:50:48 +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
minggo
3704800fa5
Merge pull request #7728 from super626/v3_merge
...
Fix Camera
2014-08-11 14:59:31 +08:00
Huabing.Xu
c1a71453d5
Merge branch 'v3_renderPrimitive' into v3
2014-08-11 14:39:16 +08:00
Huabing.Xu
031efaf242
Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3
2014-08-11 14:37:43 +08:00
Huabing.Xu
6aff707eab
windows work now for renderPrimitive
2014-08-11 14:18:07 +08:00
yangxiao
fd314261b7
Merge branch 'newcode' into obb
2014-08-11 13:21:44 +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
Huabing.Xu
2a28744dc5
Merge branch 'v3' into v3_renderPrimitive
2014-08-11 12:48:23 +08:00
yangxiao
6d15c26a61
move create default camera to Scene::initWithSize
2014-08-11 10:55:14 +08:00
lvlong
c592ac4248
for pull request modify!!
2014-08-11 10:40:34 +08:00
minggo
0f942d3417
Merge pull request #7719 from boyu0/physics_bitmask_fix
...
fix PhysicsBody bitmask bug.
2014-08-11 10:35:06 +08:00
samuele3hu
47c034af5d
Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure
2014-08-11 10:25:40 +08:00
yangxiao
2576622778
move create camera to Scene::initWithSize
2014-08-11 10:07:23 +08:00
minggo
437257e7e6
Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity
...
Let Widget class don't support cascaded opacity and cascaded color on default.
2014-08-11 09:37:51 +08:00
CocosRobot
3d222ab73a
[AUTO]: updating luabinding automatically
2014-08-11 01:31:04 +00:00
cpascal
5e1570e36e
Fix a correct onGLFWCharCallback
2014-08-10 01:42:21 +09:00
jimmystar
63c9780c49
Update CCScene.cpp
...
in line 157, here need to create and add camera, if not ,in the function createWithPhysics, will show black screen.
2014-08-09 17:37:18 +08:00
yangxiao
53c143c679
remove normalize
2014-08-09 00:02:40 +08:00
yangxiao
73a0b7701d
remove normalize
2014-08-09 00:02:19 +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
bo yu
517b26e343
fix typo
2014-08-08 16:56:48 +08:00
boyu0
ee3a8da13c
fix PhysicsBody bitmask bug.
2014-08-08 16:38:20 +08:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
samuele3hu
8919ebc011
Add build all lualibs target for iOS and Mac
2014-08-08 16:08:24 +08:00
minggo
213f2f5a6c
Merge pull request #7702 from super626/v3_merge
...
Camera and Camera test
2014-08-08 15:56:38 +08:00
yangxiao1
61eaa082a2
fix windows
2014-08-08 15:33:30 +08:00
samuele3hu
6aa667c912
Add CC_DLL for FontFNT
2014-08-08 15:22:43 +08:00
yangxiao
97edd303b5
remove DrawNode3D
2014-08-08 15:06:45 +08:00
lvlong
fe58c43b2d
add abb and obb to vc2012-project
2014-08-08 14:06:54 +08:00
minggo
c5851f988b
fix conflict
2014-08-08 14:04:38 +08:00
Huabing.Xu
be4bcf7c36
add init value for flag
2014-08-08 13:47:50 +08:00
minggo
29888b9d74
Merge pull request #7705 from zii/patch-1
...
让replaceScene更安全
2014-08-08 12:03:48 +08:00
minggo
3ccce066b0
Merge pull request #7712 from andyque/testLoadingBar
...
fixed loadingBar change direction affect position issue
2014-08-08 11:57:28 +08:00
yangxiao
911144b720
wrong parameter for visit
2014-08-08 11:52:40 +08:00
yangxiao
4dce59582b
visiting camera
2014-08-08 11:49:59 +08:00
minggo
800ab18457
Merge pull request #7700 from GavinThornton/patch-1
...
Update CCSpriteBatchNode.cpp
2014-08-08 11:49:39 +08:00
minggo
2a7e3dced8
Merge pull request #7711 from CocosRobot/update_lua_bindings_1407466030
...
[AUTO]: updating luabinding automatically
2014-08-08 11:49:14 +08:00
minggo
b9e84370f6
Merge pull request #7699 from huangshiwu/v3_wp8fix
...
V3 wp8fix
2014-08-08 11:49:02 +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
CocosRobot
aa68a63757
[AUTO]: updating luabinding automatically
2014-08-08 02:49:17 +00:00
huangshiwu
6ce16546b5
winrt compile fix -addtional
2014-08-08 10:47:14 +08:00
minggo
2f638c67fd
Merge pull request #7598 from AppleJDay/master
...
Add Feature :EventMouse should support getDelta, getDeltaX, getDelt...
2014-08-08 10:43:32 +08:00
samuele3hu
201b33b465
Set intermediate directory for related lua bindings projects on win32 platform
2014-08-08 09:40:13 +08:00
yangxiao
9471b572f7
add to cocos2d.h
2014-08-08 00:05:02 +08:00
yangxiao
813e954f4e
aabb, obb
2014-08-08 00:00:58 +08:00
gin0606
2ca881287f
CCRANDOM macro use ccRandom
2014-08-07 21:17:41 +09:00
gin0606
5349aa7efb
Add ccRandom.h
2014-08-07 21:17:36 +09:00
huangshiwu
8ee4340db3
fix winrt complie error
2014-08-07 18:38:11 +08:00
zii
212e059917
让replaceScene更安全
...
如果可以这样的话 就不用担心用runWithScene还是replaceScene了. 可以省略getRunningScene判断.
2014-08-07 18:34:21 +08:00
Huabing.Xu
e7e94ffe70
add const constrain for getVertexData() and getIndexData()
2014-08-07 17:59:36 +08:00
Huabing.Xu
274140fbf8
linux work now
2014-08-07 02:35:04 -07:00
yangxiao
1e15131b2b
simplify code
2014-08-07 16:24:44 +08:00
samuele3hu
53eb0345a5
Remove useless library for cocos2d_lua_bindings
2014-08-07 16:15:42 +08:00
yangxiao
34f6368ff7
change function to const
2014-08-07 15:57:15 +08:00
Huabing.Xu
9891f438ba
change copyright
2014-08-07 15:53:20 +08:00
Huabing.Xu
ba2ae6826c
Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive
2014-08-07 15:36:41 +08:00
yangxiao
579ae882e3
add to cocos2d.h
2014-08-07 15:33:23 +08:00
GavinThornton
8cc5e66e73
Update CCSpriteBatchNode.cpp
...
Setting opacity of a sprite (via setOpacity or FadeOut/In action) has the sprite turning black, it should simply be opaque.
Cause is in bool SpriteBatchNode::initWithTexture, third line, "if(tex->hasPremultipliedAlpha())"
Fix is making it "!if(!tex->hasPremultipliedAlpha())"
2014-08-07 00:31:33 -07:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
Huabing.Xu
9978065d00
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive
2014-08-07 15:13:47 +08:00
samuele3hu
3c31af4523
Update CMakeLists.txt for storage
2014-08-07 15:07:29 +08:00
Huabing.Xu
16842b4a69
android work now, add shadowBuffer to recreate VBO
2014-08-07 14:15:49 +08:00
huangshiwu
b7aa046cd2
wp8 compile fix -additional
2014-08-07 14:09:22 +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
huangshiwu
0016c7af70
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
2014-08-07 11:58:01 +08:00
huangshiwu
24d68305e1
WP8 compile fix
2014-08-07 11:56:28 +08:00
minggo
1ece703945
Merge pull request #7694 from CocosRobot/update_lua_bindings_1407379142
...
[AUTO]: updating luabinding automatically
2014-08-07 10:56:04 +08:00
minggo
a7d5b7af56
Merge pull request #7691 from Dhilan007/v3
...
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:52:59 +08:00
CocosRobot
91b297b085
[AUTO]: updating luabinding automatically
2014-08-07 02:40:46 +00: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
Dhilan007
9da4ba14f5
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:04:29 +08:00
martell
b71e0cde3a
Fix libaudio.a outpur directory
2014-08-06 15:45:27 +01:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
CocosRobot
f47d11cce0
[AUTO]: updating luabinding automatically
2014-08-06 09:14:13 +00:00
minggo
7a833d66d1
Merge pull request #7676 from samuele3hu/v3_module
...
Split luabindings into serval modules and adjust project settings of test cases
2014-08-06 17:09:12 +08:00
andyque
ab33e6f9a2
Let Widget class don't support cascaded opacity and cascaded color on default.
2014-08-06 16:21:00 +08:00
Huabing.Xu
64c2ede765
IOS work now
...
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
samuele3hu
497847f7e8
Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files.
2014-08-06 14:46:30 +08:00
minggo
6ee0c4171f
Merge pull request #7622 from rny/LabelTTF
...
fix LabelTTF::getBoundingBox() position error
2014-08-06 14:33:28 +08:00
minggo
f786190349
Merge pull request #7652 from zhiqiangxu/labelbmfont_getboundingbox
...
bug fix for LabelBMFont::getBoundingBox()
2014-08-06 14:28:52 +08:00
minggo
187dc29f6d
Merge pull request #7679 from andyque/fixComponentContainerRemoveIssue
...
add safe guard when remove component from node componentContainer
2014-08-06 14:21:49 +08:00
samuele3hu
9912b596f8
Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake
2014-08-06 13:51:46 +08:00
andyque
e2e8325f58
add safe guard when remove component from node componentContainer
2014-08-06 13:51:16 +08:00
Kenichi Hamada
771996f9f3
Added a function getAssetManager() on CCFileUtilsAndroid
2014-08-06 13:36:04 +09:00
minggo
9f51adfafa
Merge pull request #7461 from joshuastray/fix_constructor_access
...
fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS
2014-08-06 10:15:02 +08:00
samuele3hu
63b3f838b6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-06 09:56:07 +08:00
minggo
e43b05955f
Merge pull request #7674 from darkdukey/patch-12
...
Fix opacity for Slider
2014-08-06 09:50:47 +08:00
minggo
16653bf24e
Merge pull request #7675 from darkdukey/chore/reuse-file-utils-for-video-path
...
Chore/reuse file utils for video path
2014-08-06 09:41:28 +08:00
Nite Luo
0a2afe983c
Fix spacing
2014-08-05 17:56:55 -07:00
Nite Luo
9f34a5c0f2
Fix build for ios
2014-08-05 17:53:15 -07:00
Nite Luo
ac20f51f7b
Fix formatting
2014-08-05 16:53:00 -07:00
Nite Luo
e0855d64df
Merge branch 'v3' into patch-12
...
Conflicts:
cocos/ui/UISlider.cpp
2014-08-05 16:51:02 -07: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
6f763917a7
Delte liblua project for win32 and adjust cocos2d-win32 project
2014-08-06 00:26:02 +08:00
samuele3hu
4d4d5374df
Delete Android.mk for cocos_lua_static
2014-08-06 00:18:56 +08:00
samuele3hu
99c52f0102
Split module for Linux on Lua and adjust related test cases
2014-08-06 00:15:44 +08:00
David Partouche
118d4d39f0
Fixed the video player not showing on iOS if it's not in FullScreen mode
2014-08-05 16:07:28 +02:00
samuele3hu
d86a37110d
Split module for win32 and adjust related test cases
2014-08-05 19:46:13 +08:00
Huabing.Xu
b1954ef516
clean up primitive code
2014-08-05 17:49:35 +08:00
Huabing.Xu
01b69c9e4f
Merge branch 'v3' into v3_migrateFastTMX
2014-08-05 17:30:11 +08:00
Huabing.Xu
7353f036db
Merge branch 'v3' into v3_addNewAttribFlag
2014-08-05 15:23:14 +08:00
Huabing.Xu
7fbd81aeca
add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib
2014-08-05 15:15:17 +08:00
Huabing.Xu
56551e6787
fast_tmx migrate to primitive command
2014-08-05 15:08:01 +08:00
minggo
1bad9ddbc2
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
...
V3 wp8glviewhookpr
2014-08-05 13:51:15 +08:00
CocosRobot
24da61e443
[AUTO]: updating luabinding automatically
2014-08-05 05:35:12 +00:00
minggo
cd98034f16
Merge pull request #7631 from maltium/v3
...
added 3D rotation support to the RotateTo action
2014-08-05 13:30:43 +08:00
samuele3hu
da18657f4f
Add module Android.mk config and adjust related test cases
2014-08-05 13:29:54 +08:00
CocosRobot
f3e2ebf215
[AUTO]: updating luabinding automatically
2014-08-05 03:57:51 +00:00
CocosRobot
8dd1be5172
[AUTO]: updating luabinding automatically
2014-08-05 02:05:02 +00:00
minggo
cc75a8e860
Merge pull request #7632 from super626/v3
...
SubMesh and AttachMement
2014-08-05 09:59:38 +08:00
minggo
6d09b00e1d
Merge pull request #7649 from andyque/fixPotentialCarshWhenRemoveSelfInCallback
...
fix potential crash when user remove self in widgets callback
2014-08-05 09:46:00 +08:00
minggo
34a0603a52
Merge pull request #7658 from andyque/fixButtonOpacityIssue
...
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled
2014-08-05 09:39:13 +08:00
minggo
007e42faa0
Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak
...
Fix iOS VideoPlayer memory leak.
2014-08-05 09:30:52 +08:00
andyque
f44906d56c
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
2014-08-05 08:11:37 +08:00
Huabing.Xu
f7ad98b15b
using primitve->draw in Fast_tmx on draw
2014-08-04 17:57:31 +08:00
Huabing.Xu
95a8b23d64
fix draw bug in primitive when using indices
2014-08-04 17:56:56 +08:00
huangshiwu
9c87522199
little more modefy
2014-08-04 17:34:50 +08:00
Huabing.Xu
a0d1b0dad8
allow null index buffer when create primitive
2014-08-04 17:21:23 +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
Huabing.Xu
2dca0a4809
remove IndexData class
2014-08-04 17:00:08 +08:00
huangshiwu
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
Huabing.Xu
414d67851f
add _vertexBuffer back in Fast_tmx
2014-08-04 16:36:20 +08:00
minggo
93ee009366
Merge pull request #7656 from zii/v3
...
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
2014-08-04 16:30:41 +08:00
Huabing.Xu
bbf11f5d06
refactor vertex data
...
using vertex data in fast_tmx
2014-08-04 16:08:54 +08:00
yangxiao
8ffd0fe16e
spelling error
2014-08-04 16:07:16 +08:00
yangxiao
4084fdc461
add new file to cmake
2014-08-04 15:49:12 +08:00
yangxiao
11a13ce9e2
Merge branch 'newcode' into v3
2014-08-04 15:41:21 +08:00
minggo
5deb273486
Merge pull request #7644 from 2youyouo2/v3
...
update ActionTimeline
2014-08-04 15:35:35 +08:00
samuele3hu
e5f9c1b488
Adjust common script and related test cases
2014-08-04 15:22:07 +08:00
zii
20c43e5684
Update ccUtils.h
2014-08-04 15:21:10 +08:00
zii
7659a1623f
Update ccUtils.h
2014-08-04 15:20:45 +08:00
zii
e151795c43
Update ccUtils.cpp
2014-08-04 15:18:01 +08:00
yangxiao
47838ce945
reset
2014-08-04 14:37:26 +08:00
yangxiao
01e0192a2d
reset
2014-08-04 14:29:55 +08:00
huangshiwu
efcb8b9962
wp8 glview hook solution 1
2014-08-04 14:17:14 +08:00
yangxiao
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
zii
825209dd04
Update ccUtils.cpp
2014-08-04 11:48:23 +08:00
zii
97f06306e3
Update ccUtils.cpp
...
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
2014-08-04 11:45:50 +08:00
Huabing.Xu
a44f4c95e1
using indexBuffer instead of raw VBO
2014-08-04 10:40:07 +08:00
samuele3hu
6f4cafcc1b
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +08:00
huangshiwu
372479d812
wp8 GLView Hook
2014-08-02 16:31:16 +08:00
xuzhiqiang
85dd898319
bug fix
2014-08-02 08:04:29 +08:00
andyque
d7b17c598d
fix potential crash when user remove self in widgets callback
2014-08-01 20:58:42 +08:00
Huabing.Xu
3d4bfe7780
using VertexBuffer instead of raw buffer
2014-08-01 17:50:22 +08:00
AppleJDay
b736202a55
replace tab to spaces. Fix compile error of UIRichTextTest.cpp in windows visual studio vs2013.
2014-08-01 17:37:30 +08:00
AppleJDay
2239fafade
Merge branch 'v3' of github.com:AppleJDay/cocos2d-x
2014-08-01 17:22:43 +08:00
CocosRobot
fda11428bf
[AUTO]: updating luabinding automatically
2014-08-01 07:53:19 +00:00
huangshiwu
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
Huabing.Xu
f269d7345e
original version of PrimitiveCommand
2014-08-01 14:46:35 +08:00
kaile.yin
3dcdb1cde4
remove some update condition of Frame::apply function
2014-08-01 14:40:42 +08:00
CocosRobot
26c76f5cf1
[AUTO]: updating luabinding automatically
2014-08-01 04:02:13 +00:00
minggo
0b6254d095
Merge pull request #7587 from dzl-ian/fixTextWidgetColor
...
Add getter and setter for TextColor to Text Widget
2014-08-01 11:57:10 +08:00
kaile.yin
d1407ca929
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-08-01 11:42:18 +08:00
AppleJDay
bcecf09b6c
Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git
2014-08-01 09:18:22 +08:00
maltium
baba808391
RotateBy action now uses just Vec3() to keep track of the state
2014-07-31 23:28:33 +02:00
maltium
98354e9f8e
RotateTo action now uses Vec3() to keep track of the state
2014-07-31 23:05:58 +02:00
yangxiao
52d3c4461f
adjust
2014-07-31 20:20:29 +08:00
yangxiao
7562214c63
adjust
2014-07-31 20:19:43 +08:00
yangxiao
342dc05890
adjust
2014-07-31 20:17:51 +08:00
yangxiao
4aec1d37c8
code adjust
2014-07-31 20:14:43 +08:00
yangxiao
e03d284e26
merge cocos2d
2014-07-31 18:55:41 +08:00
yangxiao
49052ab28d
code adjust
2014-07-31 18:42:58 +08:00
yangxiao
ca0afcfa92
add Quaternion::ZERO
2014-07-31 18:36:30 +08:00
yangxiao
17304b4775
add comment
2014-07-31 18:28:52 +08:00
yangxiao
780914687e
code style adjust according minggo
2014-07-31 18:14:01 +08:00
kaile.yin
2fc082cac1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-31 17:52:49 +08:00
samuele3hu
6bb21c0f4d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
tools/tolua/cocos2dx.ini
2014-07-31 17:52:22 +08:00
zhangbin
d224c77bd4
Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8.
2014-07-31 17:51:06 +08:00
kaile.yin
170e1a5d7b
init widget properties
2014-07-31 17:48:45 +08:00
minggo
d44a359a1f
Merge pull request #7635 from samuele3hu/v3_new_module
...
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 17:39:01 +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
ee4e479ce1
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 16:38:55 +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
Huabing.Xu
a5add07fb5
Merge branch 'v3' into v3_renderPrimitive
2014-07-31 14:31:24 +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
songmiao
58c32e52c7
windows works
2014-07-31 14:08:05 +08:00
Huabing.Xu
dfee337db1
original version of Primitive
2014-07-31 13:52:39 +08:00
CocosRobot
095d4ed3c5
[AUTO]: updating luabinding automatically
2014-07-31 05:49:25 +00: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
f6ad1df092
android work
2014-07-31 11:47:47 +08:00
andyque
1de2b78d61
refactor, optimize Scale9Sprite
2014-07-31 11:07:20 +08:00
yangxiao
38c86f7697
skeleton retain
2014-07-31 10:57:19 +08:00
yangxiao
2c29560514
add CC_DLL
2014-07-31 10:28:39 +08:00
yangxiao
44c501ca2a
merge cocos2d
2014-07-31 09:56:23 +08:00
maltium
3d44439e2a
added 3D rotation support to the RotateTo action
2014-07-30 21:42:47 +02:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
yangxiao
9f1cfbfca5
add skeleton and refactor skin
2014-07-30 18:32:34 +08:00
andyque
03368d42f2
refactor, improve imageView stability
2014-07-30 17:29:22 +08:00
andyque
e6b85fbd77
fix minor bugs of UISlider and remove unused header include in ListView
2014-07-30 16:55:16 +08:00
Huabing.Xu
65775f2d30
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-30 16:39:21 +08:00
andyque
83298171d9
refactor Layout
2014-07-30 16:33:37 +08:00
Ningyu
d53cdc39df
tab to spaces
2014-07-30 16:20:58 +08:00
Ningyu
52ca596b3d
code tidy
2014-07-30 16:19:05 +08:00
andyque
7bcb31f225
refactor loadingBar
2014-07-30 16:08:29 +08:00
andyque
c5d2585049
refactor Slider control
2014-07-30 15:52:27 +08:00
Huabing.Xu
99eed6a0be
finish index data
2014-07-30 15:51:41 +08:00
andyque
6492167974
refactor ImageView
2014-07-30 15:27:18 +08:00
andyque
a6e376f93c
refactor UIButton
2014-07-30 15:19:39 +08:00
Huabing.Xu
23406c6463
Merge branch 'v3' into v3_renderPrimitive
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-07-30 15:09:25 +08:00
Huabing.Xu
428e9b1b1a
Merge branch 'v3' into v3_buildAllTarget
2014-07-30 14:12:28 +08:00
Ningyu
61a87e7e8b
fix LabelTTF::getBoundingBox() position error
2014-07-30 14:00:01 +08:00
andyque
f2b0528cc9
refactor
2014-07-30 10:45:35 +08:00
andyque
e7da7b3e42
change unsigned long to size_type
2014-07-30 10:34:37 +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
andyque
4a40604955
refactor getScale9Enabled to isScale9Enabled
2014-07-30 10:31:40 +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
Ningyu
aebe8317bd
spaces
2014-07-29 17:22:13 +08:00
Ningyu
d5242ef4fa
add
...
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
2014-07-29 17:06:43 +08:00
Ningyu
23e0ed3767
add
...
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
2014-07-29 16:58:33 +08:00
gin0606
ef4852b7ec
Fix iOS VideoPlayer memory leak.
2014-07-29 17:56:03 +09: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
andyque
717f20571b
add UIScale9Sprite implementation
2014-07-29 16:24:27 +08:00
andyque
32ed796657
add UIScale9Sprite
2014-07-29 16:24:27 +08:00
minggo
4c2fd90286
Merge pull request #7614 from andyque/fixBindingGenerate
...
fix binding generator can nott regonize unsigned long arguments
2014-07-29 16:13:26 +08:00
andyque
98ef180ca8
add default value to luaval_to_ulong
2014-07-29 15:59:49 +08:00
andyque
cfe7e57561
fix binding generator can nott regonize unsigned long arguments
2014-07-29 15:48:12 +08:00
Huabing.Xu
bca92772dd
remove unused windows localstorage project file
2014-07-29 15:23:07 +08:00
Huabing.Xu
ea802580a2
add script to copy sqllite3.dll to output dir on windows
2014-07-29 15:02:34 +08:00
minggo
5d63ce17ad
Merge pull request #7610 from dabingnn/v3_windowChangeModule
...
V3 window change module
2014-07-29 14:29:01 +08:00
minggo
52dfb7224e
Merge pull request #7609 from boyu0/bug5762_setTotalParticles
...
Closed #5762 : ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
2014-07-29 13:55:33 +08:00
dzl-ian
b8248a165b
Correct some typos/mistakes in declarations
2014-07-29 13:47:21 +09:00
Huabing.Xu
c722c0fcd0
libcocostudio for windows
2014-07-29 11:31:37 +08:00
Huabing.Xu
e91fa0e9fc
libcocosbuilder rename for windows
2014-07-29 11:09:02 +08:00
yangxiao
da4ba95806
SubMesh and Attachment
2014-07-29 10:49:06 +08:00
boyu0
c63d64e385
set emission rate when setTotalParticles()
2014-07-29 10:48:20 +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
bf287252df
change libnetwork and libSpine
2014-07-29 09:31:52 +08:00
AppleJDay
0bd4b608b7
Merge pull request #1 from cocos2d/v3
...
Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
2014-07-29 08:34:15 +08:00
Unai Orbe
406a718a4c
reuse file utils when resolving video path (ios)
2014-07-28 15:24:17 +01: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
8f9ce2e282
change cocosbuilder to lowercase
2014-07-28 21:09:43 +08:00
Huabing.Xu
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
minggo
bf6e706ab9
fix xcode project setting
2014-07-28 15:37:00 +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
minggo
191f7a57e1
Merge pull request #7078 from reckhou/v3
...
Optimize FPS control algorithm under Android.
2014-07-28 14:00:55 +08:00
CocosRobot
12042bfd9d
[AUTO]: updating luabinding automatically
2014-07-28 03:38:12 +00:00
minggo
9efbd6e4ef
Merge pull request #7600 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:34:13 +08:00
pandamicro
823bd437d8
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:14:11 +08:00
minggo
cf7de08f22
Merge pull request #7594 from boyu0/image_premulti_alpha_refactor
...
Image premultiplied alpha refactor
2014-07-28 11:02:33 +08:00
minggo
7ad7b5b3f7
Merge pull request #7585 from wagulu/patch-1
...
Update CCParticleSystem.cpp
2014-07-28 10:54:05 +08:00
minggo
11012478ad
Merge pull request #7597 from Dhilan007/v3-video-android
...
Fix the size of VideoPlayer is incorrect on android.
2014-07-28 10:47:19 +08:00
minggo
a8bb2462de
Merge pull request #7052 from gin0606/videoPlayerScaleIssue
...
Fix video scale issue in iOS
2014-07-28 10:43:13 +08:00
minggo
b58569151b
Merge pull request #7590 from andyque/fixWidgetContentSize
...
Simplify Widget ContentSize cascade change algorithm
2014-07-28 10:40:05 +08:00
AppleJDay
bd5ca6a244
Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions
2014-07-28 10:39:35 +08:00
boyu0
85b9765b8f
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
2014-07-28 10:38:22 +08:00