Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,161 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

27161 Commits

Author SHA1 Message Date
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 53754221e8 [ci skip] Update CHANGELOG 2015-01-23 16:17:53 +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
minggo eaba6ad9c3 Merge pull request #10191 from fusijie/multipletouches 
[ci skip]add multiple touches toggle to iOS.
 2015-01-23 15:56:54 +08:00
minggo ba1058c03c Merge pull request #10192 from samuele3hu/v3_4_rc1 
[ci skip]Fix some lua test cases bug
 2015-01-23 15:54:51 +08:00
minggo c0c8af9248 [ci skip] Update CHANGELOG 2015-01-23 15:37:12 +08:00
samuele3hu 6e055ba41f Fix some lua test cases bug 2015-01-23 15:35:15 +08:00
Jacky da76cfdc79 add multiple touches toggle to iOS. 2015-01-23 15:09:46 +08:00
minggo 2b3cc6c62b Merge pull request #10188 from samuele3hu/v3_4_issue9537 
Update plugin submodule
 2015-01-23 14:57:44 +08:00
minggo deaa6098e9 Merge pull request #10189 from dabingnn/v3_fixCrashNoVAO 
disbale cache for s_attributeFlags
 2015-01-23 14:55:13 +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
samuele3hu 80bca0c876 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9537 2015-01-23 14:13:19 +08:00
Jialong Zhai 7ef80e9dae Update UIEditBoxImpl-win32.cpp 2015-01-23 14:11:22 +08:00
samuele3hu 29c8b2c3f2 Update plugin submodule 2015-01-23 14:08:19 +08:00
minggo e423babd64 Merge pull request #10184 from pandamicro/v3_origin 
Fix AssetsManagerEx small issues
 2015-01-23 13:34:05 +08:00
pandamicro 5e8baa4f39 Fix AssetsManagerEx small issues 2015-01-23 12:10:32 +08:00
minggo 938b5dc5c6 [ci skip] Update CHANGELOG 2015-01-23 12:04:55 +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
XiaoYang 1bd07f68f8 Merge pull request #220 from lvlonggame/v3 
fixbug: load obj file's material.
 2015-01-23 11:23:32 +08:00
minggo 3c430a636c Merge pull request #10180 from andyque/updateChangeLog 
[ci skip]modify change log
 2015-01-23 10:02:42 +08:00
andyque 417f3db20a modify change log 2015-01-23 09:57:26 +08:00
minggo 6ec03fd602 [ci skip] Update CHANGELOG 2015-01-23 09:46:11 +08:00
minggo e36bc542e8 Merge pull request #10179 from kompjoefriek/v3-compilewarnings 
Fixed some compiler warnings
 2015-01-23 09:41:55 +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
minggo 88ce4e7802 Merge pull request #10167 from CocosRobot/update_lua_bindings_1421906768 
[AUTO]: updating luabinding automatically
 2015-01-22 17:57:39 +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 0c8d10b8dd [ci skip] Update CHANGELOG 2015-01-22 09:49:41 +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
minggo bd8c27b370 Merge pull request #10163 from MSOpenTech/wp8-fix 
Updated precompiled shaders for WP8. Fixes issue 10161
 2015-01-22 09:36:30 +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 7eaa4fed5d [ci skip] Update CHANGELOG 2015-01-21 21:01:41 +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
minggo 0f46dec0c8 Merge pull request #10159 from samuele3hu/v3_4_rc1 
[ci skip]Add checked lua test codes for issue #10107
 2015-01-21 19:39:07 +08:00
samuele3hu 01bfe09c05 Add checked lua codes for issue #10107 2015-01-21 19:33:42 +08:00