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

29798 Commits

Author SHA1 Message Date
WuHao 3c5326ba1f removed spritePolygon, merge into sprite and draft of AutoPolygon 2015-06-02 10:10:09 +08:00
WuHao 3d62805d04 Merge branch 'v3' into fix_spritepolygon 
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/2d/MarchingSquare.cpp
 2015-05-29 18:10:41 +08:00
子龙山人 839e7fbb59 Merge pull request #12100 from CocosRobot/update_cocosfiles_1432884847 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-29 17:24:50 +08:00
Jacky e69a6116fa make SpritePolygonInfo extend from Ref. 2015-05-29 16:44:06 +08:00
CocosRobot 27ed47cdfd [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 07:34:09 +00:00
子龙山人 039c0036be Merge pull request #12072 from iris-wy/v3 
Add enhance service  API
 2015-05-29 15:32:06 +08:00
Jacky 8df4920f6e fixed file name. 2015-05-29 15:03:36 +08:00
子龙山人 1d68fe8fc4 Merge pull request #12096 from CocosRobot/update_lua_bindings_1432880747 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-05-29 14:42:51 +08:00
CocosRobot 3a1b52cafd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-05-29 06:31:00 +00:00
子龙山人 b39006432f Merge pull request #12091 from joshuastray/properties 
[ci skip]fix material test
 2015-05-29 14:22:36 +08:00
子龙山人 d0236c6aba Merge pull request #12094 from CocosRobot/update_lua_bindings_1432879965 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-05-29 14:22:16 +08:00
子龙山人 a165790ba9 Merge pull request #12083 from yangws/v3 
Add opengl version project/unproject function in camera.
 2015-05-29 14:21:56 +08:00
CocosRobot 7408e5f1cb [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-05-29 06:18:20 +00:00
子龙山人 2641fc529b Merge pull request #12093 from CocosRobot/update_cocosfiles_1432879493 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-29 14:07:52 +08:00
CocosRobot 635d5a43d2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 06:04:54 +00:00
子龙山人 9567509ff1 Merge pull request #12089 from CocosRobot/update_cocosfiles_1432877907 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-29 14:00:49 +08:00
子龙山人 c823a1e494 Merge pull request #12090 from CocosRobot/update_lua_bindings_1432878025 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-29 14:00:21 +08:00
子龙山人 7d3620e33d Merge pull request #12092 from andyque/v3 
[ci skip]add ci skip to travis
 2015-05-29 14:00:00 +08:00
Jialong Zhai 9cf5c1b636 fix material test 2015-05-29 13:54:29 +08:00
andyque ff26903ddf add ci skip to travis 2015-05-29 13:47:28 +08:00
CocosRobot 892816de3a [AUTO]: updating luabinding & jsbinding automatically 2015-05-29 05:46:22 +00:00
CocosRobot 98b1700326 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 05:38:29 +00:00
子龙山人 45ad2665ae Merge pull request #12088 from andyque/v3 
[ci skip]add framework build scripts to gitignore
 2015-05-29 13:35:38 +08:00
andyque ebf6859161 add framework build scripts to gitignore 2015-05-29 13:34:59 +08:00
子龙山人 035420893e Merge pull request #12076 from andyque/update-changelog-v3 
Fix a memory issue in AudioEngine
 2015-05-29 11:44:45 +08:00
子龙山人 a968bc2d15 Merge pull request #12062 from jianglong0156/jsWebviewTest 
Js webview test
 2015-05-29 11:35:30 +08:00
Vincent Yang b714dde0ea Add opengl version project/unproject function in camera. 2015-05-29 10:44:48 +08:00
子龙山人 0838aa28aa Merge pull request #12069 from hugohuang1111/v3_del_duplicate_fw_file 
[M] remove duplicate file of framework
 2015-05-28 23:09:29 +08:00
andyque 2eeaa5c198 update changelog 2015-05-28 17:21:53 +08:00
子龙山人 a76018041e Merge pull request #12077 from WenhaiLin/v3-label-mlinefix 
Text:Fixed the scale factor may be incorrect with multiline text.
 2015-05-28 17:20:33 +08:00
子龙山人 f6f8796dfa Merge pull request #11762 from WenhaiLin/v3-audioengine-i11697 
AudioEngine:Fixed program may freeze if `AudioEngine::stop` or `AudioEngine::stopAll()` is invoked frequently on Android.
 2015-05-28 14:52:20 +08:00
jianglong0156 ab124978aa web view can not run in mac, remove it from project file 2015-05-28 14:46:29 +08:00
jianglong0156 379f536330 improve test case, remove the invalid testcase 2015-05-28 14:02:07 +08:00
WenhaiLin c60112a634 Text:Fixed the scale factor may be incorrect with multiline text. 2015-05-28 11:56:43 +08:00
jianglong0156 1dbaa5bb11 fix error log output 2015-05-28 11:56:07 +08:00
andyque 578fda54ba fix a memory issue in AudioEngine. 
This PR also update AUTHORS and CHANGELOG files.
 2015-05-28 11:49:27 +08:00
iris-wy bbfc33dfd2 format 
format
 2015-05-28 11:03:49 +08:00
子龙山人 001614a9c5 Merge pull request #11908 from flashjay/patch-1 
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
 2015-05-28 10:58:46 +08:00
子龙山人 495d9ee4fa Merge pull request #12070 from samuele3hu/v3_material 
[ci skip]Synchronize the modification of filenames about shaders to fix the bug of MateriaSystemTest
 2015-05-28 10:58:27 +08:00
iris-wy 9e477303f1 delete useless TAG 
delete useless TAG
 2015-05-28 10:55:10 +08:00
iris-wy 0007799794 modify Enhance API 
modify Enhance API
 2015-05-28 10:47:12 +08:00
samuele3hu a89e000f80 Synchronize the modification of filenames about shaders to fix the bug of MateriaSystemTest . 2015-05-28 10:46:44 +08:00
jianglong0156 c0b42fdfec modify addEventListener to setEventListener 2015-05-28 10:12:58 +08:00
andyque 63a5a65456 added mp3 support to winrt audio. 2015-05-28 09:52:18 +08:00
hugo 11ffb6545c [M] remove duplicate file of framework 2015-05-28 09:52:11 +08:00
子龙山人 432ecbad41 Merge pull request #12068 from MSOpenTech/v3-winrt-audio 
Added MP3 support to winrt audio
 2015-05-28 09:47:54 +08:00
子龙山人 2310c7aa03 Merge pull request #12064 from CocosRobot/update_cocosfiles_1432738150 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-28 07:41:12 +08:00
Dale Stammen 9ee4b4af1e Merge branch 'v3' into v3-winrt-audio 2015-05-27 11:54:21 -07:00
anniruddh.koppal 4501a53cfa Added MP3 support to simple audio engine 2015-05-27 10:57:26 -07:00
CocosRobot 509d5f5718 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-27 14:49:12 +00:00