Ray
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +08:00
Ray
8eb201797d
工程文件修改
2015-02-19 17:52:50 +08:00
Ray
73e40f1c4b
Node3DReader Test
2015-02-19 16:18:54 +08:00
Ray
2f01deee89
3D Editor Reader
...
Node3DReader
2015-02-19 12:08:09 +08:00
Jongryul Kook
c05dd4357d
Fixed HttpClient-ios request to work when the data is started by 0x00.
2015-02-18 16:51:12 +09:00
mannewalis
21dbc29ad1
adding CC_DEPRECATE(version) macro
2015-02-17 13:01:53 -08:00
Dale Stammen
0801160a37
added precompiled Particle3D shaders
2015-02-16 11:28:24 -08:00
Dale Stammen
76233d4c6e
added missing Particle3D files and tests
2015-02-16 10:41:03 -08:00
Dale Stammen
795f65c85f
added missing Particle3D files and tests
2015-02-16 10:01:09 -08:00
CocosRobot
6a91450f7c
[AUTO]: updating luabinding automatically
2015-02-15 11:53:55 +00:00
minggo
c8eaa4aeba
Merge pull request #10447 from super626/particle_merge
...
add 3d particle (Particle Universe)
2015-02-15 19:48:18 +08:00
minggo
d5e82521de
Merge pull request #10359 from flamefox/3dattachnode
...
getAttachNode should failed when there is no bone with name
2015-02-15 19:03:52 +08:00
minggo
dd7d8a61ef
Merge pull request #8980 from fspadoni/v3
...
CCPhysicsWorld.cpp Remove cpArbiterIgnore call from collisionPreSolveCallback
2015-02-15 18:58:17 +08:00
samuele3hu
3a7cbe9d67
Add Particle3DTest for Lua and update related configure files
2015-02-15 15:56:20 +08:00
Vladimir Perminov
9f5efe5153
Fix visual studio project out of date
...
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
2015-02-13 11:18:14 +03:00
yangxiao
9b117bf87c
resolve conflict
2015-02-13 15:46:19 +08:00
Justin Fraize
3667cc6e1f
Cleaned up CCAction.cpp
...
*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
2015-02-12 21:00:12 -08:00
minggo
87e444873f
Merge pull request #10268 from kompjoefriek/Fixing-warnings
...
Fixed some compiler warnings
2015-02-13 10:04:19 +08:00
yangxiao
d4ace2a08c
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
2015-02-13 09:49:07 +08:00
yangxiao
2789ad1393
remove unused code
2015-02-13 09:48:27 +08:00
kompjoefriek
a2ef1abef3
Fixed unwanted changes
2015-02-12 23:07:24 +01:00
zhukaixy
acc0476f01
Solve compile errors on win32 platform
2015-02-12 19:36:03 +08:00
Jeff Oh
e33854f3eb
apply custom request header for every request type (ios)
2015-02-12 20:07:19 +09:00
CocosRobot
a643691795
[AUTO]: updating luabinding automatically
2015-02-12 10:47:08 +00:00
minggo
afd4e94c4c
Merge pull request #10160 from lite3/wildpointer
...
fix wild pointer
2015-02-12 18:01:10 +08:00
minggo
7fd6b5bfe7
Merge pull request #10172 from sergeant-wizard/make_tmx_object_group_name_getter_const
...
make CCTMXObjectGroup::getGroupName const
2015-02-12 18:00:49 +08:00
minggo
8716164a5d
Merge pull request #10206 from sergeant-wizard/specify_default_capacity_for_sprite_batch_node
...
Specify default capacity for sprite batch node
2015-02-12 17:58:59 +08:00
minggo
3a4e9ced46
Merge pull request #10442 from Dhilan007/v3-accelerometer-fix
...
Fixed Accelerometer has lagged on iOS
2015-02-12 17:20:07 +08:00
yangxiao
58bfae2e57
adjust and remove unused code
2015-02-12 16:58:34 +08:00
minggo
f44ea6468e
Merge pull request #10461 from ntotani/fix-lua-framework-v3
...
fix SpriteEx
2015-02-12 16:17:46 +08:00
yangxiao
8f290b2d24
modify according to minggo
2015-02-12 16:09:08 +08:00
minggo
9d6f399584
Merge pull request #10467 from minggo/audio-issue
...
audio resume issue
2015-02-12 15:39:48 +08:00
Wenhai Lin
eb7a7a9fb7
Fixed audio can't resume after the interruption of audio session has ended on iOS.
2015-02-12 15:38:44 +08:00
sawada_yasuharu
cf8a7cd6da
Changed the option to be passed to calculate bounding rect size for
...
strings.
As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
2015-02-12 15:30:46 +08:00
Naoyuki Totani
2b43c12b88
fix SpriteEx
2015-02-12 15:16:48 +09:00
lvlong
ee03bb8eea
setCameraMask for cocostudio-ui
2015-02-12 09:24:04 +08:00
yangxiao
79a0c0152a
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
WenhaiLin
20ad425407
Fixed Accelerometer has lagged on iOS
2015-02-11 16:28:43 +08:00
lvlong
6304a89462
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
2015-02-11 14:27:25 +08:00
KompjoeFriek
7f28230311
Fixed merge error
2015-02-10 21:37:18 +01:00
kompjoefriek
00edc542cb
Merged with upstream/v3
...
Merged with upstream/v3 and resolved merge conflicts
2015-02-10 21:27:20 +01:00
minggo
1e11f3b3da
Merge pull request #10310 from perminovVS/v3
...
Fix visual studio project out of date
2015-02-10 14:18:13 +08:00
Chad
befbc0a14e
FIX for Build error when CC_USE_CULLING=0 #10373
...
Fix for build error when using CC_USE_CULLING
2015-02-09 18:15:22 -08:00
Vladimir Timofeev
653bf1549d
win32: Search resources in the executable directory by default instead of the current directory. Because new default location is much more predictable.
2015-02-09 02:23:01 +03:00
yangxiao
2ac0b35283
fix render state
2015-02-06 10:09:23 +08:00
Nite Luo
ee2781e6a6
Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core
...
Cmake build system fixes for MSVC (partial)
2015-02-04 23:18:08 -08:00
lvlong
6152925739
If parse the vertex attribute is fail, then discard the vertex attribute.
2015-02-04 16:19:30 +08:00
flamefox
4b405db77d
fix tab to space
2015-02-04 10:36:16 +08:00
flamefox
c2e17d6b1d
getAttachNode should failed when there is no bone with name
2015-02-04 10:32:44 +08:00
XiaoYang
c9fe5251a9
Merge pull request #229 from lvlonggame/v3
...
add Camera::project
2015-02-04 09:38:31 +08:00
lvlong
a0c7723edb
add GP_ASSERT
2015-02-03 14:21:12 +08:00
lvlong
6d92b7adc9
modify Camera::project
2015-02-03 11:59:43 +08:00
Nite Luo
6f53719772
Merge pull request #10317 from darkdukey/G17hao-patch-12
...
Improve group command
2015-02-02 14:12:50 -08:00
byeonggee.seo
23e0320cac
HttpResponse reference counting bug fixed
2015-02-02 12:23:15 +09:00
lvlonggame
23df00b0b9
Merge branch 'v3' of github.com:lvlonggame/cocos2d-x into v3
2015-02-01 21:17:12 +08:00
lvlonggame
4c65332550
add project function to camera
2015-02-01 21:14:37 +08:00
Nite Luo
e9b4e4e19c
Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:59 -08:00
Nite Luo
07cda0db37
Merge branch 'patch-12' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12
2015-01-31 09:46:31 -08:00
samuele3hu
fec0d9c41d
Set default value for `Content-Type` of headfield in `PUT` method
2015-01-31 22:15:15 +08:00
samuele3hu
75dc45bfea
Remove useless blank line
2015-01-31 15:21:03 +08:00
samuele3hu
e6d50d7086
Fix the error that the binary data would be truncated
2015-01-31 14:31:24 +08:00
Vladimir Perminov
bb2d2c9a07
Fix visual studio project out of date
...
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
2015-01-30 17:37:19 +03:00
minggo
8efbafd09e
Merge pull request #10281 from Dhilan007/v3-win32-fix
...
Fixed compile error on win32
2015-01-29 19:48:29 +08:00
WenhaiLin
6873713c31
Fixed compile error on win32
2015-01-29 19:38:55 +08:00
minggo
dff7d6f639
Merge pull request #10277 from super626/v3
...
fix bug on loading .mtl
2015-01-29 19:21:31 +08:00
byeonggee.seo
fa683ec98b
MotionStreak MoveTo/MoveBy action OK
2015-01-29 19:30:00 +09:00
huangshiwu
cd00de572d
add glBindBuffer for drawnode and clippingnode to avoid crash
2015-01-29 18:06:20 +08:00
yangxiao
3eeeaf051f
fix load mtl
2015-01-29 17:54:22 +08:00
kompjoefriek
89152b2856
Tabs to spaces
...
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
minggo
73e8026336
Merge pull request #10274 from darkdukey/forceDepthTest
...
Force depth test
2015-01-29 16:29:13 +08:00
Nite Luo
f914297703
Fix force depth write logic
2015-01-28 23:55:26 -08:00
minggo
18a45e36eb
Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix
...
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 13:56:11 +08:00
Dale Stammen
652baed1ee
increase build heap memory option to /Zm384
2015-01-28 20:37:39 -08:00
Dale Stammen
be8075b29c
increase build heap memory option to /Zm384
2015-01-28 20:32:32 -08:00
WenhaiLin
05db3bfd72
Fixed system font can't display the proper text when the text contains '&' on win32.
2015-01-29 11:55:49 +08:00
CocosRobot
fcf0a2272f
[AUTO]: updating luabinding automatically
2015-01-29 02:27:42 +00:00
minggo
de3e9be2c5
Merge pull request #10265 from samuele3hu/v3_4_fi
...
Add AsyncLoadSprite3D test case and update the related lua binding
2015-01-29 10:16:49 +08:00
minggo
8b635fea1c
Merge pull request #10250 from samuele3hu/v3_4_rc1
...
Fix the error that HttpClient-android didn’t set responseCode when connecting failed
2015-01-29 10:14:00 +08:00
minggo
2f04e7a6ac
Merge pull request #10239 from super626/v3
...
fix bug on uniform cache
2015-01-29 10:13:11 +08:00
samuele3hu
0ec8510f00
Fix linux compile error
2015-01-29 09:19:57 +08:00
kompjoefriek
0c70660551
Fixed warnings
...
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
Nite Luo
c0ff8d1177
Don't clear depth between queues
2015-01-28 15:28:14 -08:00
Nite Luo
94d5810efd
Merge pull request #10254 from super626/fixbillboard
...
Tested locally fix the billboad testcase
2015-01-28 14:06:53 -08:00
samuele3hu
80c2e0c153
Add AsyncLoadSprite3D test case and update the related lua binding
2015-01-28 21:47:52 +08:00
andyque
ac3d79a516
add constructor to AnimationInfo
2015-01-28 16:59:27 +08:00
minggo
34c132280e
Merge pull request #10244 from geron-cn/fixProjectNodeLoader
...
Fix project node crash in simulator and add its test-cpp
2015-01-28 15:30:53 +08:00
minggo
757c4a6cdb
Merge pull request #10253 from CocosRobot/update_lua_bindings_1422429538
...
[AUTO]: updating luabinding automatically
2015-01-28 15:24:52 +08:00
minggo
80cf4439f2
Merge pull request #10241 from Dhilan007/v3-scheduled-fix
...
Fixed may access wrong memory address in Scheduler::schedule
2015-01-28 15:22:40 +08:00
yangxiao
fc1dbf49fb
fix billboard
2015-01-28 15:21:57 +08:00
CocosRobot
ba5b23d2a5
[AUTO]: updating luabinding automatically
2015-01-28 07:21:15 +00:00
minggo
b233d6928e
Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix
...
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
2015-01-28 15:16:23 +08:00
minggo
2738745614
Merge pull request #10248 from dabingnn/v3_fixRenderer
...
V3 fix renderer
2015-01-28 15:15:08 +08:00
samuele3hu
93665c5c6d
Fix the error that HttpClient didn’t setResponseCode when connecting failed
2015-01-28 13:49:19 +08:00
CocosRobot
78463a4a66
[AUTO]: updating luabinding automatically
2015-01-28 05:46:25 +00:00
minggo
f54916cf69
Merge pull request #10247 from samuele3hu/v3_4_fi
...
Add more 3D test case and adjust some binding function
2015-01-28 13:41:34 +08:00
samuele3hu
cd42806367
Fix the error of tolua_cocos2d_Mat4_decompose
2015-01-28 11:12:12 +08:00
Huabing.Xu
c8a783e4ac
use const auto&
2015-01-28 10:59:29 +08:00
samuele3hu
82a95bf2fc
Modify some script files
2015-01-28 10:57:30 +08:00
Huabing.Xu
5f5c00b7d2
remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE
2015-01-28 10:32:22 +08:00
minggo
8d681dfe7d
Merge pull request #10218 from andyque/fixIssue10183
...
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
2015-01-28 09:57:34 +08:00
samuele3hu
6208e9cba5
Add more test cases about 3D
2015-01-28 09:40:20 +08:00
Nite Luo
be6ca1b6d2
add force depth write
2015-01-27 17:05:51 -08:00
Nite Luo
c364323bbc
Not using static value to save previous render state since other commands like custom command could change them
2015-01-27 16:26:31 -08:00
Nite Luo
8f539a0107
Make PositionZ independent from global Z
2015-01-27 15:41:58 -08:00
Nite Luo
b89e255099
Finish organize the render queue
2015-01-27 14:41:16 -08:00
Nite Luo
78d8a694c8
Merge branch 'v3' into v3_fixRenderer
...
Conflicts:
cocos/renderer/CCRenderer.cpp
cocos/renderer/CCRenderer.h
2015-01-27 11:23:48 -08:00
Nite Luo
3c635d044e
Add Queue_count for render queues
2015-01-27 11:12:51 -08:00
Nite Luo
2be140fccc
Merge pull request #10225 from darkdukey/saveRenderState
...
save/restore render state
2015-01-27 11:12:05 -08:00
Nite Luo
75253d66ff
Merge branch 'v3' into v3_fixRenderer
2015-01-27 10:56:28 -08:00
geron-cn
df10a974fa
fix projectnode
2015-01-27 23:19:27 +08:00
minggo
f09626bcfb
Merge pull request #10235 from pipu/modify_parse_ignoresize
...
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 18:44:01 +08:00
WenhaiLin
d9bb6192dc
Fixed may access wrong memory in Scheduler::schedule
2015-01-27 17:29:12 +08:00
Huabing.Xu
cee1df2278
Merge branch 'v3' into v3_fixRenderer
2015-01-27 16:54:35 +08:00
yangxiao
220b34d105
Merge branch 'newcode' into v3
2015-01-27 16:35:54 +08:00
yangxiao
fad8f9f1da
format
2015-01-27 16:31:15 +08:00
yangxiao
af8a6c16b1
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-01-27 16:24:07 +08:00
Wenhai Lin
f2335fb3bc
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
2015-01-27 16:13:45 +08:00
lvlong
57970da398
Do some optimize
2015-01-27 15:50:05 +08:00
minggo
15bf919000
Merge pull request #10231 from geron-cn/fixanimationlistclone
...
FIX BUG: animationinfos lost after actiontimeline clone
2015-01-27 15:24:25 +08:00
pipu
ed1b7edce7
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 15:09:48 +08:00
Huabing.Xu
a38b210803
add depth in renderCommand
...
refactor rendering order of renderQueue
2015-01-27 14:29:09 +08:00
minggo
5a4fbf691b
Merge pull request #10234 from CocosRobot/update_lua_bindings_1422338223
...
[AUTO]: updating luabinding automatically
2015-01-27 14:00:36 +08:00
CocosRobot
4792a44a87
[AUTO]: updating luabinding automatically
2015-01-27 05:58:53 +00:00
minggo
880abfe814
Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
...
Fix loading bar reload texture issue
2015-01-27 13:50:38 +08:00
minggo
e1afb7c789
Merge pull request #10226 from andyque/removeDuplicateCode
...
remove unused code
2015-01-27 13:50:15 +08:00
minggo
2a94ede427
Merge pull request #10227 from cpascal/add_EditBox_getDescription
...
Added override of ui::EditBox::getDescription()
2015-01-27 13:49:55 +08:00
geron-cn
390c336a19
FIX animationfio lost after actiontimeline clone
2015-01-27 12:04:14 +08:00
andyque
7b81f3a811
remove unused code
2015-01-27 10:17:41 +08:00
cpascal
d857164768
Added override of ui::EditBox::getDescription()
2015-01-27 11:10:04 +09:00
Nite Luo
15adaf2877
save/restore render state
2015-01-26 16:37:11 -08:00
geron-cn
d3baae0304
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader
2015-01-26 21:21:31 +08:00
geron-cn
a1a7273436
fix bug: fix crash when lack of projected file
2015-01-26 21:20:26 +08:00
lvlong
bb419719aa
fix bug: about caching uniform.
2015-01-26 18:40:00 +08:00
andyque
95e8072afa
fixed issue #10183
2015-01-26 18:26:59 +08:00
minggo
f54c6c93bb
Merge pull request #10215 from andyque/fixIssue10210
...
don't release the scale9Image when updateSprites
2015-01-26 17:58:21 +08:00
andyque
732050d940
don't release the scale9Image when updateSprites
2015-01-26 16:04:43 +08:00
minggo
5dc09d8489
Merge pull request #10208 from pipu/modify_parse_TMXTiledMap
...
Checking whether tileset is valid during parses TMXTiledMap.
2015-01-26 15:52:18 +08:00
Vladimir Timofeev
b6201f9328
cmake: try to fix lua-bindings for msvc
2015-01-26 10:09:49 +03:00
Vladimir Timofeev
991ea4532d
cmake: fix using of external/xxhash for msvc generated project
2015-01-26 10:03:49 +03:00
andyque
0e67cfcbff
improve loading Bar Test
2015-01-26 14:39:44 +08:00
minggo
cba0e19252
Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield
...
Change the order of detach and attach of TextField::upadate
2015-01-26 14:00:58 +08:00
minggo
4ac50f2c26
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
...
Fixed sets the page's base URL for WebView doesn't work.
2015-01-26 13:51:08 +08:00
andyque
fdbf84a118
add uploading switch scale9 tests
2015-01-26 13:49:54 +08:00
minggo
988a2729d7
Merge pull request #10203 from Dhilan007/v3-bmf-performance
...
Improved the parsing performance of bitmap fonts
2015-01-26 13:46:04 +08:00
pipu
35c1e73b8f
Checking whether tileset is valid during parses TMXTiledMap in GameMapReader.
2015-01-26 13:14:17 +08:00
Ryo Miyajima
d1d4ec2ac6
fix grammar in comment
2015-01-26 10:56:43 +09:00
Ryo Miyajima
4985653f5b
specify default capacity
2015-01-26 10:56:38 +09:00
minggo
bc1b588062
Merge pull request #10202 from dabingnn/v3_fixCrashWithNoVAO
...
V3 fix crash with no vao
2015-01-26 09:48:25 +08:00
WenhaiLin
9afa871164
Improved the parsing performance of bitmap fonts
2015-01-24 16:23:30 +08:00
Wenhai Lin
81198583f1
Fixed sets the page's base URL for WebView doesn't work.
2015-01-23 18:30:12 +08:00