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

30062 Commits

Author SHA1 Message Date
Oscar Utbult 853058102d Fix two issues with download-deps.py 
- No extra leading space while downloading.
- Clears the line before printing the download completed message.
 2015-06-11 23:48:20 +02:00
pandamicro 1a9056cf14 Merge pull request #12300 from jianglong0156/textFieldShowString 
[ci skip]add textfield show textString
 2015-06-11 19:33:21 +08:00
pandamicro 12de53726d Merge pull request #12182 from VisualSJ/v3-jsb 
[ci skip] Synchronization studio parser
 2015-06-11 17:35:15 +08:00
pandamicro 902f1696e8 Merge pull request #12290 from jianglong0156/issue#2928texture2d 
[ci skip]add pr#2928 test case, load same remote img. can callback the function
 2015-06-11 16:51:59 +08:00
子龙山人 43555272d5 Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix 
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
 2015-06-11 16:34:45 +08:00
WenhaiLin aff2f8c2c4 Fixed compile error. 2015-06-11 14:42:03 +08:00
pandamicro 8e3e928efd Merge pull request #12040 from geron-cn/v3 
fix bug:  fix actiontimeline can not step to last frame when loop play
 2015-06-11 14:36:08 +08:00
子龙山人 03814a569d Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix 
SimpleAudioEngine:Fixed thread safety problem on android.
 2015-06-11 14:30:36 +08:00
子龙山人 f1c183f785 Merge pull request #12294 from CocosRobot/update_lua_bindings_1434003034 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-11 14:25:31 +08:00
子龙山人 b79e167900 Merge pull request #12293 from CocosRobot/update_cocosfiles_1434003160 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-11 14:25:09 +08:00
CocosRobot 94a47fabcf [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-11 06:16:36 +00:00
CocosRobot c58927e7fc [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-11 06:12:41 +00:00
pandamicro 6dfe937cae Merge pull request #11892 from dabingnn/v3FrameBufferObject 
V3 frame buffer object
 2015-06-11 14:04:30 +08:00
Vincent Yang 097bf455c2 Rename CCRenderBufferObject to CCRenderBuffer in windows projects. 2015-06-11 11:45:10 +08:00
VisualSJ 2d12d6a295 Plist file parsing (action-2.x.js) 2015-06-11 11:14:10 +08:00
jianglong0156 f97955682a add pr#2928 test case, load same remote img. can callback the function 2015-06-11 11:11:51 +08:00
jianglong0156 96ce3ec22c add textfield show textString 2015-06-10 16:15:09 +08:00
子龙山人 b666b373c7 Merge pull request #12261 from iris-wy/v3 
fix bug #12200
 2015-06-10 11:39:22 +08:00
子龙山人 7f9a01c340 Merge pull request #12272 from andyque/update-changelog-v3 
[ci skip]update changelog
 2015-06-10 10:55:50 +08:00
andyque 4e754dd999 modify changelog 2015-06-10 10:54:50 +08:00
子龙山人 6c0fb80eb1 Merge pull request #12269 from CocosRobot/update_cocosfiles_1433900952 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-10 10:32:27 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/CCCamera.h
 2015-06-10 10:16:42 +08:00
CocosRobot 369b7d9926 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-10 01:49:13 +00:00
子龙山人 1897eef05d Merge pull request #12267 from oscr/fix_download_deps 
Capitalize default option in download-deps.py
 2015-06-10 09:45:57 +08:00
子龙山人 e1cb308f1d Merge pull request #12234 from MSOpenTech/v3-winrt-ogg 
Added OGG support to winrt audio
 2015-06-10 09:44:32 +08:00
Oscar Utbult 76a3db6f29 Capitalize default option in download-deps.py 2015-06-09 23:58:56 +02:00
anniruddh.koppal 3f4d1c4ed3 Fixed merge conflict issue 2015-06-09 14:06:24 -07:00
yangxiao 7f26ccb9ba code style 2015-06-09 14:06:09 -07:00
tangziwen fc34881ab9 fix Terrain::getIntersectionPoint 2015-06-09 13:23:33 -07:00
Dale Stammen 0cb2f87d3e Merge branch 'v3' into v3-winrt-ogg 2015-06-09 08:21:09 -07:00
子龙山人 a202387800 Merge pull request #12247 from stari4ek/v3-outline-inner-holes 
improve rendering of letter's inner shapes when outline is used
 2015-06-09 23:11:39 +08:00
iris-wy 79b3d70b60 fix bug #12200 
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
 2015-06-09 18:43:46 +08:00
子龙山人 b40113d6c5 Merge pull request #12255 from xiaofeng11/v3_xiaofeng 
Fix issue 10258 & 10408
 2015-06-09 17:57:28 +08:00
Huabing.Xu 67a94c4485 compiles on android and linux 2015-06-09 17:57:07 +08:00
XiaoFeng 20a6151f4c Fix indent 2015-06-09 17:40:42 +08:00
Huabing.Xu b79eec0b20 fix grid bug for viewport 2015-06-09 17:24:30 +08:00
Huabing.Xu ef4978f0cd move viewport to experimental namespace 2015-06-09 16:21:50 +08:00
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
WenhaiLin 6fec9c40b0 SimpleAudioEngine:Fixed thread safety problem on android. 2015-06-09 15:07:35 +08:00
子龙山人 62e563fded Merge pull request #12237 from CocosRobot/update_lua_bindings_1433734219 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-09 15:04:48 +08:00
pandamicro 062fd56f11 Merge pull request #12253 from ZLester/patch-1 
Fix typo in AUTHORS.txt
 2015-06-09 14:44:20 +08:00
XiaoFeng f6083f3490 Fix issue 10258 & 10408 2015-06-09 14:38:48 +08:00
Zachary Lester f3afd51ff5 Fix typo in AUTHORS.txt 
Altered sentence explaining how authors were ordered so as to fix its grammar and more clearly convey its meaning.
 2015-06-08 23:28:30 -07:00
Huabing.Xu 97b387560b revert some accidental changes 2015-06-09 14:06:11 +08:00
Huabing.Xu 9acab65e4f rename FrameBufferObject->FrameBuffer 
Move FrameBufferObject related class to experimental namespace
 2015-06-09 10:59:43 +08:00
Dale Stammen a2b677d300 Merge branch 'v3' into v3-winrt-ogg 2015-06-08 08:22:46 -07:00
Michael Sotnikov dae8f788c1 improve rendering of inner shapes when outline is used 2015-06-08 12:56:43 +03:00
子龙山人 a364d6ecfc Merge pull request #12246 from andyque/update-changelog-v3 
[ci skip]Update changelog v3
 2015-06-08 17:31:41 +08:00
andyque 9721621ecc update changelog and authors 2015-06-08 17:30:59 +08:00
andyque f4d6d05787 update changelog 2015-06-08 17:28:00 +08:00