geron-cn
|
a1a7273436
|
fix bug: fix crash when lack of projected file
|
2015-01-26 21:20:26 +08: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 |
Huabing.Xu
|
285a280bb4
|
enable attribute cache as before
|
2015-01-23 18:19:25 +08:00 |
Huabing.Xu
|
030394bffe
|
refactor the rendering and creation of DrawNode
make LayerColor rendering safer
|
2015-01-23 18:19:03 +08:00 |
minggo
|
ebc75579a2
|
Merge pull request #9838 from htlxyz/v3_origin
modify trans lua value to fontdefinition error
|
2015-01-23 16:55:01 +08:00 |
minggo
|
0addc3fb1d
|
Merge pull request #10173 from tmr111116/fix_random_int_overflow
fix random int overflow
|
2015-01-23 16:38:08 +08:00 |
minggo
|
516c6f1387
|
Merge pull request #10187 from joshuastray/fix-win32-editbox-clip
Fix win32 editbox content not clipped correctly
|
2015-01-23 16:16:00 +08:00 |
minggo
|
42b6fbd1c6
|
Merge pull request #9919 from edwardzhou/luaLoadChunksFromZIP_supports_folder_structured_lua
Lua load chunks from zip supports folder structured lua
|
2015-01-23 16:13:09 +08:00 |
Huabing.Xu
|
421310f3a8
|
Merge branch 'v3' into v3_fixCrashNoVAO
Conflicts:
cocos/renderer/ccGLStateCache.cpp
|
2015-01-23 14:50:21 +08:00 |
Huabing.Xu
|
550fc44187
|
disbale cache for s_attributeFlags
|
2015-01-23 14:32:36 +08:00 |
Jialong Zhai
|
b295c8e817
|
fix indentation
|
2015-01-23 14:13:36 +08:00 |
Jialong Zhai
|
7ef80e9dae
|
Update UIEditBoxImpl-win32.cpp
|
2015-01-23 14:11:22 +08:00 |
minggo
|
44bcee60c7
|
Merge pull request #10182 from super626/v3
Fix bug on loading .obj's .mtl file
|
2015-01-23 12:02:00 +08:00 |
kompjoefriek
|
ca48c5e5dd
|
Fixed lots of compiler warnings
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
|
2015-01-23 02:02:33 +01:00 |
minggo
|
38b0d25bc5
|
Merge pull request #10175 from andyque/fixSliderProgressRender
fix slider scale9 render
|
2015-01-22 17:59:17 +08:00 |
minggo
|
f9116f7c6d
|
Merge pull request #10166 from pipu/parse_anchorpointframe
Modify bug that parses AnchorPointFrame.
|
2015-01-22 17:58:08 +08:00 |
lvlong
|
662117e878
|
mtlPath
|
2015-01-22 17:33:24 +08:00 |
lvlong
|
c5f955466a
|
fixbug: load obj file's material.
|
2015-01-22 17:28:35 +08:00 |
andyque
|
94e35d8d95
|
fix slider scale9 render
|
2015-01-22 15:53:33 +08:00 |
tmr111116
|
757bc03ba8
|
fix random int overflow
before:
```
random(2147483648, 2147483649): -2147483648
```
after:
```
random(2147483648, 2147483649): 2147483649
```
code:
```
int64_t min = int64_t(INT_MAX) + 1;
int64_t max = int64_t(INT_MAX) + 2;
auto rand = cocos2d::random(min, max);
CCLOG("random(%lld, %lld): %lld", min, max, rand);
```
|
2015-01-22 16:46:57 +09:00 |
CocosRobot
|
ad9e5e21c3
|
[AUTO]: updating luabinding automatically
|
2015-01-22 06:08:11 +00:00 |
Huabing.Xu
|
a505c0e6e6
|
Merge pull request #10165 from samuele3hu/v3_4_rc1
Update Lua LayoutComponent Test case of UIEditTest
|
2015-01-22 14:02:31 +08:00 |
pipu
|
c0a662ff13
|
Modify bug that parses AnchorPointFrame.
|
2015-01-22 11:20:01 +08:00 |
samuele3hu
|
d74fb0e8b5
|
Update LayoutComponent Test case of UIEditTest
|
2015-01-22 10:21:38 +08:00 |
minggo
|
ece379bc64
|
Merge pull request #10162 from Dhilan007/v3-label-blockfix
Fixed label may become white/black block after resume from background on android
|
2015-01-22 09:48:10 +08:00 |
minggo
|
3eba023f2a
|
Merge pull request #10059 from cpascal/v3
Fixed inconsistent time-scale in Httpclient.
|
2015-01-22 09:47:40 +08:00 |
Dale Stammen
|
e5b54f8c47
|
updated precompiled shaders for wp8
|
2015-01-21 10:50:44 -08:00 |
Wenhai Lin
|
5076b9f008
|
Fixed crash
|
2015-01-21 22:46:31 +08:00 |
Wenhai Lin
|
342c582124
|
Fixed label may become white/black block after resume from background on android
|
2015-01-21 21:58:18 +08:00 |
minggo
|
a0091058f6
|
Merge pull request #10157 from dabingnn/v3_fixandroidCrashWithoutneon
only mathUtil.cpp compiles with neon
|
2015-01-21 20:23:20 +08:00 |
minggo
|
954f372775
|
Merge pull request #10156 from vovkasm/fix-warnings
Fix warnings
|
2015-01-21 20:23:00 +08:00 |
Huabing.Xu
|
daa6d47b40
|
only mathUtil.cpp compiles with neon
|
2015-01-21 18:29:28 +08:00 |
Vladimir Timofeev
|
6e01cab380
|
Fix, thanks @minggo!
|
2015-01-21 13:19:43 +03:00 |
Vladimir Timofeev
|
610e24b453
|
Fix warning: CCLOG_STRING_TAG not used by enclosing it in platform ifdef. Provide empty SendLogToWindow implementation by default.
|
2015-01-21 13:07:21 +03:00 |
Vladimir Timofeev
|
4e25ffbc7f
|
Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences.
|
2015-01-21 12:59:53 +03:00 |
CocosRobot
|
5e273da0ec
|
[AUTO]: updating luabinding automatically
|
2015-01-21 09:33:26 +00:00 |
minggo
|
72fb059aeb
|
Merge pull request #10144 from andyque/fixButtonPressActionIssue
fix button pressAction scale issue
|
2015-01-21 16:37:59 +08:00 |
WenhaiLin
|
5fd9ccfecb
|
Fixed AudioEngine causes game 'freeze' on Android
|
2015-01-21 16:18:47 +08:00 |
minggo
|
86b1f4594a
|
Merge pull request #10147 from geron-cn/fixProjectNodeLoader
ProjectNode's actiontimeline should jump to 0 frame when after nest i...
|
2015-01-21 15:49:39 +08:00 |
geron-cn
|
2fc79e2da5
|
ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd
|
2015-01-21 15:21:23 +08:00 |
minggo
|
97f29adf84
|
Merge pull request #10138 from dabingnn/v3_fixcrashForTextureAtlas
fix crash for textureAtlas
|
2015-01-21 15:02:06 +08:00 |
andyque
|
d58426db99
|
fix button pressAction scale issue
|
2015-01-21 14:54:37 +08:00 |
CocosRobot
|
4f7b6608c4
|
[AUTO]: updating luabinding automatically
|
2015-01-21 06:46:49 +00:00 |
minggo
|
26bdd8b532
|
Merge pull request #10140 from minggo/crash-fix
check if plist file exist
|
2015-01-21 14:41:44 +08:00 |
minggo
|
097d4f3266
|
check if plist file exist
|
2015-01-21 14:36:49 +08:00 |
Huabing.Xu
|
0ca47ab40f
|
fix crash for textureAtlas
|
2015-01-21 14:14:53 +08:00 |
minggo
|
335f69d95d
|
Merge pull request #10110 from super626/v3
Fix Animate3D speed bug and add parameter to Ray::intersects
|
2015-01-21 14:11:11 +08:00 |
minggo
|
607ae4c2ca
|
Merge pull request #10136 from andyque/fixSliderProgressBarRender
fix progress bar render issue when switch scale9
|
2015-01-21 14:10:18 +08:00 |
CocosRobot
|
b31b22491d
|
[AUTO]: updating luabinding automatically
|
2015-01-21 05:44:30 +00:00 |
andyque
|
7f7506fb99
|
fix progress bar render issue when switch scale9
|
2015-01-21 13:41:40 +08:00 |