XiaoYang
|
930ea8cd9c
|
Merge pull request #284 from songchengjiang/v3
fix the bug of Particle3DModelRender
|
2015-04-03 13:47:14 +08:00 |
songchengjiang
|
e4a58d5c35
|
fix the bug of Particle3DModelRender
|
2015-04-03 12:43:14 +08:00 |
WenhaiLin
|
6f47006324
|
Add new test framework.
|
2015-04-03 11:54:39 +08:00 |
Huabing.Xu
|
98371e4fbb
|
Merge pull request #11267 from WenhaiLin/v3-at01
Disable MessageBox when the device does not have an accelerometer on WinRT.
|
2015-04-03 11:53:07 +08:00 |
WenhaiLin
|
fdba25cdde
|
Disable MessageBox when the device does not have an accelerometer on WinRT
|
2015-04-03 11:51:00 +08:00 |
Huabing.Xu
|
cb77d0145a
|
Merge pull request #11266 from WenhaiLin/v3-at01
Add getInScene,getDuration for TransitionScene class.
|
2015-04-03 11:50:44 +08:00 |
WenhaiLin
|
f2dc7958bf
|
Add getInScene,getDuration for TransitionScene class.
|
2015-04-03 11:49:15 +08:00 |
Huabing.Xu
|
bf31214796
|
Merge pull request #11263 from WenhaiLin/v3-menuitem-fix
MenuItem: Fixed crash if MenuItem::onExit is called multiple times.
|
2015-04-03 09:53:57 +08:00 |
Huabing.Xu
|
ee0a1eed91
|
Merge pull request #11264 from WenhaiLin/v3-Performance-setContentScaleFactor
Performance: Fixed lag if Director::setContentScaleFactor is called frequently
|
2015-04-03 09:48:18 +08:00 |
tangziwen
|
e4ae88ef15
|
add new line at end of file
|
2015-04-03 09:11:09 +08:00 |
Dale Stammen
|
d8b6a0aaf9
|
removed unused method
|
2015-04-02 09:11:19 -07:00 |
Dale Stammen
|
47b338e4e6
|
fix deprecated warnings
|
2015-04-02 09:08:26 -07:00 |
Dale Stammen
|
344b44bdcb
|
fire foreground and background events
|
2015-04-02 09:08:16 -07:00 |
Dale Stammen
|
957bf48790
|
fire foreground and background events
|
2015-04-02 09:07:44 -07:00 |
WenhaiLin
|
aaae566b7b
|
Performance: Fixed lag if Director::setContentScaleFactor is called frequently
|
2015-04-02 23:35:56 +08:00 |
WenhaiLin
|
a544eadab8
|
MenuItem: Fixed crash if MenuItem::onExit is called multiple times.
|
2015-04-02 23:27:07 +08:00 |
XiaoYang
|
63a27d14b7
|
Merge pull request #282 from lvlonggame/terrain
fix bug: about minFilter and magFilter
|
2015-04-02 17:26:35 +08:00 |
yangxiao
|
cfbfe3b676
|
add to linux
|
2015-04-02 16:57:38 +08:00 |
minggo
|
b648d1f25e
|
Merge pull request #11255 from CocosRobot/update_lua_bindings_1427939343
[AUTO]: updating luabinding automatically
|
2015-04-02 15:21:21 +08:00 |
lvlong
|
60bed4f461
|
revert alpha map minFilter
|
2015-04-02 15:10:51 +08:00 |
lvlong
|
c3cc8b917c
|
fix bug: about minFilter and magFilter
|
2015-04-02 15:01:14 +08:00 |
yangxiao
|
827231f5c9
|
add to cocos2d
|
2015-04-02 14:29:02 +08:00 |
yangxiao
|
1b63e5168a
|
add to linux
|
2015-04-02 14:21:51 +08:00 |
yangxiao
|
9aabbabe6e
|
reset
|
2015-04-02 14:20:36 +08:00 |
yangxiao
|
784c68f9a0
|
modify test title
|
2015-04-02 14:18:22 +08:00 |
yangxiao
|
9e115073a1
|
fix warning
|
2015-04-02 14:04:31 +08:00 |
xiaofeng11
|
46a0ceff75
|
Merge pull request #8 from doomsdayer/v3
Remove CCNodeReader.h/cpp for win8.1-universal
|
2015-04-02 10:29:01 +08:00 |
XiaoYang
|
984babc9c9
|
Merge pull request #281 from tangziwen/terrain
update terrain
|
2015-04-02 10:19:11 +08:00 |
yusheng.lu
|
82c6e623e0
|
Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters
|
2015-04-02 10:15:36 +08:00 |
samuele3hu
|
826fe4cf31
|
Update the Xcode project setting for luajit
|
2015-04-02 10:07:31 +08:00 |
CocosRobot
|
dfc2390659
|
[AUTO]: updating luabinding automatically
|
2015-04-02 01:51:14 +00:00 |
minggo
|
6cf344ded6
|
Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup
Remove useless (char*) casts in CCTMXXMLParser.cpp
|
2015-04-02 09:45:22 +08:00 |
XiaoYang
|
42e304c767
|
Merge pull request #280 from lvlonggame/terrain
fix aabbDirty bug.
|
2015-04-02 09:42:40 +08:00 |
minggo
|
e7a6c7eada
|
Merge pull request #11245 from CocosRobot/update_lua_bindings_1427857074
[AUTO]: updating luabinding automatically
|
2015-04-02 09:39:36 +08:00 |
minggo
|
332ce1a8f3
|
Merge pull request #11249 from super626/v3
Release note for texturecube skybox and animtion quality
|
2015-04-02 09:39:16 +08:00 |
minggo
|
199fb2b694
|
Merge pull request #11250 from super626/texturecube
Texturecube Modify
|
2015-04-02 09:38:26 +08:00 |
lvlong
|
1da7ef121e
|
_aabbDirty = true
|
2015-04-02 09:33:48 +08:00 |
tangziwen
|
6cd1077cb0
|
update terrain
|
2015-04-01 18:24:05 +08:00 |
yangxiao
|
2cc9814702
|
modify
|
2015-04-01 17:58:41 +08:00 |
yangxiao
|
4b7ae430a8
|
Merge branch 'texturecube' of https://github.com/super626/cocos2d-x into texturecube
|
2015-04-01 17:37:55 +08:00 |
yangxiao
|
9540fd590f
|
modify skybox
|
2015-04-01 17:34:57 +08:00 |
yangxiao
|
591fff4046
|
release note for texturecube skybox and animtion quality
|
2015-04-01 16:40:40 +08:00 |
xiaofeng11
|
ea8538117b
|
Merge pull request #7 from pipu/remove_CCNodeReader
Remove CCNodeReader.h/.cpp.
|
2015-04-01 14:12:09 +08:00 |
pipu
|
340e26d81a
|
Supplement invoke destroyInstance() of some Reader in destroyCocosStudio().
|
2015-04-01 14:08:09 +08:00 |
pipu
|
41661830ff
|
Remove CCNodeReader.h/.cpp.
|
2015-04-01 13:37:36 +08:00 |
xiaofeng11
|
759a0af83c
|
Merge pull request #6 from doomsdayer/v3
Delete CCNodeReader for Win8.1 project
|
2015-04-01 11:55:43 +08:00 |
yusheng.lu
|
fcc890ee44
|
Merge branch 'v3' of github.com:doomsdayer/cocos2d-x into v3
|
2015-04-01 11:50:46 +08:00 |
yusheng.lu
|
01a091ef2c
|
Delete CCNodeReader for Win8.1 project
|
2015-04-01 11:49:36 +08:00 |
minggo
|
0779d05ee6
|
Merge pull request #11244 from CocosRobot/update_cocosfiles_1427857055
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-01 11:00:26 +08:00 |
CocosRobot
|
17a80b0c54
|
[AUTO]: updating luabinding automatically
|
2015-04-01 02:59:47 +00:00 |