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

22188 Commits

Author SHA1 Message Date
Dhilan007 5d22bca240 fixed warn and replace 'printf' with 'log'; 2014-07-18 10:20:37 +08:00
minggo 2210d1fe87 Merge pull request #7512 from dulangci/v3 
fixed error for setup.py
 2014-07-18 10:05:15 +08:00
minggo 405ea3b7b9 Merge pull request #7510 from MSOpenTech/wp8-v3-fix 
Wp8 v3 shader update
 2014-07-18 10:03:48 +08:00
minggo 935bbdfd22 Merge pull request #7513 from minggo/v3 
[ci skip]update document
 2014-07-18 09:39:53 +08:00
minggo 0879d2b726 update document 2014-07-18 09:35:49 +08:00
minggo e44cd58c8e Merge pull request #7508 from samuele3hu/v3_hot_fix 
Use relative path in the cocos2dxLuaLoader for showing useful msg when lua script trigger errors
 2014-07-18 09:27:43 +08:00
minggo f6b5f8e6ce Merge pull request #7509 from chuanweizhang2013/v3luaruntime 
runtime 1.3.1 fixed log bug
 2014-07-18 09:25:41 +08:00
dulangci 7ada094e1f fixed as follow error 
fixed as follow error:
TypeError: cannot concatenate 'str' and 'NoneType' objects
 2014-07-18 09:18:33 +08:00
Mazyad Alabduljaleel a4b4efff1b [FIX]: copied data should be const 2014-07-18 03:44:39 +04:00
Dale Stammen 24462e1ded updated wp8 precompiled shaders 2014-07-17 09:41:07 -07:00
chuanweizhang2013 3e6dd0b8d2 1.3.1 2014-07-17 09:30:56 -07:00
samuele3hu b482a5e971 Use relative path in the cocos2dxLuaLoader for showing useless msg when lua script trigger errors 2014-07-17 23:53:36 +08:00
Dale Stammen 88da5d5fdb disabled custom shader tests for WP8 2014-07-17 08:13:49 -07:00
minggo ea2165e6ba Merge pull request #7507 from CocosRobot/update_lua_bindings_1405606669 
[AUTO]: updating luabinding automatically
 2014-07-17 22:21:02 +08:00
CocosRobot 8ea5083e32 [AUTO]: updating luabinding automatically 2014-07-17 14:20:04 +00:00
minggo e2aedc05d3 [ci skip] 2014-07-17 22:16:46 +08:00
minggo b92fc24cc4 [ci skip] 2014-07-17 22:13:41 +08:00
minggo ae11f7820a Merge pull request #7506 from samuele3hu/v3_hot_fix 
Update bindings-generator submodule
 2014-07-17 22:09:05 +08:00
minggo f3e106c7ad [ci skip] 2014-07-17 22:08:02 +08:00
minggo 10dc7cc563 [ci skip] 2014-07-17 22:06:24 +08:00
minggo 867fb18c5d Merge pull request #7503 from CaiCQ/v3 
修正Linux下中文显示问题
 2014-07-17 22:05:15 +08:00
samuele3hu d7d1bf037b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 21:44:25 +08:00
samuele3hu 059ecffd9c Update bindings-generator submodule 2014-07-17 21:43:10 +08:00
minggo b4c75bb7f5 Merge pull request #7504 from CocosRobot/update_lua_bindings_1405603442 
[AUTO]: updating luabinding automatically
 2014-07-17 21:41:45 +08:00
minggo 781f14d599 Merge pull request #7505 from andyque/fixIosCompileError 
fix ios comiple error
 2014-07-17 21:39:15 +08:00
andyque 76ffb2261d fix ios comiple error 2014-07-17 21:44:33 +08:00
minggo c38cda6248 [ci skip] 2014-07-17 21:35:22 +08:00
minggo 8181ef9918 [ci skip] 2014-07-17 21:31:58 +08:00
CocosRobot ffaa0d9c04 [AUTO]: updating luabinding automatically 2014-07-17 13:26:35 +00:00
minggo f418217b56 [ci skip] 2014-07-17 21:25:31 +08:00
minggo 61597e0e5a Merge pull request #7496 from Dhilan007/v3-320final 
Fixed VideoPlayer can't quitting the full screen mode by press the back key on Android.
 2014-07-17 21:19:56 +08:00
Dhilan007 51aba5dae4 fixed magic number. 2014-07-17 21:19:09 +08:00
Dhilan007 229b30ed8b Fixed VideoPlayer can't quitting the full screen mode by press the back key. 2014-07-17 21:10:26 +08:00
Huabing.Xu 21b3e55339 Mac dylib version works now 2014-07-17 20:58:50 +08:00
minggo 462f9bdd78 Merge pull request #7502 from visiblelight/render_texture_disabled 
The orientation of render texture should be rotated
 2014-07-17 20:09:01 +08:00
visiblelight 7e7c3aeb1c The orientation of render texture should be rotated when _keepMatrix is true 2014-07-17 19:53:35 +08:00
CCQ 2bda9f62a1 Merge branch 'v3' of github.com:CaiCQ/cocos2d-x into v3 2014-07-17 18:58:55 +08:00
CCQ cb3b9b8405 修正Linux下中文显示不全问题 2014-07-17 18:42:23 +08:00
minggo 1a54947409 Merge pull request #7501 from andyque/fixRichTextUTF8 
fix richText UTF8
 2014-07-17 18:33:51 +08:00
andyque 7ff78c61ba fix richText UTF8 2014-07-17 18:36:09 +08:00
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
minggo f8ecceff25 [ci skip] 2014-07-17 18:06:48 +08:00
minggo 7b7d4d6aa0 Merge pull request #7500 from cocoscodeide/v3 
lua runtime 1.3
 2014-07-17 18:01:21 +08:00
minggo 578af01ef1 Merge pull request #7499 from andyque/fixRichTextUTF8 
fix richText utf8 error
 2014-07-17 17:57:41 +08:00
andyque fc2ab110cc fix richText utf8 error 2014-07-17 17:58:40 +08:00
cocoscodeide d3489e680e Merge pull request #64 from chuanweizhang2013/v3luaruntime 
console port android 6010
 2014-07-17 17:55:57 +08:00
chuanweizhang2013 f906880c70 modify size 2014-07-17 02:48:32 -07:00
minggo 08dc96c5e5 Merge pull request #7498 from samuele3hu/v3_hot_fix 
Fix the actionTimelineTest crash on mac platform
 2014-07-17 17:42:39 +08:00
minggo 8381069c75 Merge pull request #7497 from chengstory/v3_fixesActionManagerCrash 
V3 fixes action manager crash
 2014-07-17 17:42:04 +08:00
samuele3hu a9031154e0 Fix the actionTimelineTest crash on mac platform 2014-07-17 17:38:53 +08:00