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

27487 Commits

Author SHA1 Message Date
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 0d872ae1d7 [ci skip] Update CHANGELOG 2015-01-26 09:49:36 +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
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
yangxiao 677ee473ff 3d+2d use case, not finished 2015-01-23 18:24:15 +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 ea9d9f889c [ci skip]Update Authors 2015-01-23 16:43:22 +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 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
yangxiao e336a4c86c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-01-23 11:23:47 +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
kompjoefriek 60fc8de036 Fixes cocos2d/cocos2d-x/#8414 
Changes as suggested by @dumganhar
 2015-01-22 20:19:28 +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