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

33176 Commits

Author SHA1 Message Date
CocosRobot 3ee2e7a490 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 02:56:26 +00:00
zilongshanren a5b7674b4d Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4 
improve scale9sprite
 2015-11-17 10:48:09 +08:00
pandamicro c77ea57fb1 Merge pull request #14399 from xiaofeng11/v3_combine_mac32compatible 
Combine Studio change for compatible with 32 bit Mac System
 2015-11-17 10:44:40 +08:00
pandamicro 367a502fd4 Merge pull request #14395 from xiaofeng11/v3_combine_actionTimeLine 
Combine Studio change for ActionTimeline
 2015-11-17 10:43:12 +08:00
pandamicro 5bc73c6ede Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-17 10:42:05 +08:00
pandamicro c990703b8b Merge branch 'v3.8.1' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	cocos/cocos2d.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_cocos2d.js
	docs/RELEASE_NOTES.md
	external/config.json
	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
	tools/simulator/frameworks/runtime-src/proj.win32/game.rc
 2015-11-17 10:41:41 +08:00
XiaoFeng e3c120eef4 Combine Studio change for compatible with 32 bit Mac System 2015-11-16 18:25:26 +08:00
XiaoFeng e313f7be8b Combine Studio change for ActionTimeline 2015-11-16 15:56:23 +08:00
pandamicro 974bdba154 Fix issue in ComponentJS::~ComponentJS 2015-11-16 11:50:48 +08:00
Neo Kim b99b3d1112 Remove `CC_DLL` in front of `createSpriteFromBase64()` in ccUtils.h to avoid compilation error on windows platform 2015-11-15 23:02:43 +09:00
Neo Kim 603d788fbf PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
Neo Kim b0ae23d567 PageView - Add more comments 2015-11-15 22:49:42 +09:00
Neo Kim ad134a6363 PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`. 2015-11-15 22:49:42 +09:00
mogemimi 9ec1e2069a Fix deprecated warnings 2015-11-13 14:38:48 +09:00
yangxiao 39a6f1e8f1 char* to string 2015-11-12 18:08:29 +08:00
pandamicro a0c7e10a82 Merge pull request #14362 from CocosRobot/update_lua_bindings_1447222613 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-11 18:03:49 +08:00
pandamicro 3e5e499cbe Merge pull request #14366 from CocosRobot/update_lua_bindings_1447224545 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-11 14:54:32 +08:00
CocosRobot 4ccc6ce5de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-11 06:53:45 +00:00
pandamicro 25404a260b Merge pull request #14358 from super626/v3 
Fix PUParticle Bug
 2015-11-11 14:46:08 +08:00
CocosRobot de9955b4cd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-11 06:22:22 +00:00
pandamicro 8695fbe711 Merge pull request #14172 from njh0602/somefix2 
Add virtual keyword.
 2015-11-11 14:17:27 +08:00
pandamicro d4a641a638 Merge pull request #14359 from CocosRobot/update_cocosfiles_1447222317 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-11 14:16:59 +08:00
pandamicro 6fc7aca423 Merge pull request #14153 from Fraggle/patch-1 
PMA Handling issue
 2015-11-11 14:14:22 +08:00
pandamicro ac06c9f8bb Merge pull request #14260 from pyrosphere/add-app-version 
Added Application::getVersion() to get the app version.
 2015-11-11 14:13:42 +08:00
CocosRobot be36cd73b7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-11 06:11:58 +00:00
pandamicro 3963e8a774 Merge pull request #14333 from nhuanvd/cocos2dxactivity_bugfix 
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
 2015-11-11 14:10:24 +08:00
pandamicro 5ff7cac4ae Merge pull request #14298 from TheCodez/patch-1 
Fix #14298
 2015-11-11 14:04:40 +08:00
XiaoYang 3061f1597a Merge pull request #373 from songchengjiang/v3 
fix the bug of keeplocal of PUParticleSystem3D
 2015-11-11 13:51:37 +08:00
songchengjiang 18940d06ba fix the bug of keeplocal of PUParticleSystem3D 2015-11-11 11:40:50 +08:00
pandamicro 1ad877ee63 Merge pull request #14348 from xiaofeng11/v3 
Fixed actionNode position error bug
 2015-11-11 00:11:21 +08:00
pandamicro 0a4585f2f9 Merge pull request #14354 from 1scaR1/v3 
[js-tests] Scale9Sprite fade actions with cascade opacity enabled
 2015-11-11 00:09:20 +08:00
Neo Kim 94637bef2f PageView - Change to keep some of the original API names because it makes more sense. 2015-11-10 21:35:01 +09:00
Neo Kim 9cbbd283c7 PageView - Deprecate the APIs related to custom scroll threshold. 2015-11-10 21:35:01 +09:00
Бесшапошников Никита 89798d949b [js-tests] Test case for Scale9Sprite fade actions with cascade opacity enabled 
Test case for https://github.com/cocos2d/cocos2d-html5/pull/3181
 2015-11-10 15:13:05 +03:00
Neo Kim 049607b5d8 Replace tab indents to 4 spaces. 2015-11-10 21:03:51 +09:00
xiaofeng11 0682832ed7 Merge pull request #14350 from xiaofeng11/v3_simfix 
Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX
 2015-11-09 23:32:35 +08:00
肖峰 3aeb5e0389 Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX 2015-11-09 23:30:03 +08:00
XiaoFeng 1f0c498bcb Fixed actionNode position error bug 2015-11-09 19:45:17 +08:00
pandamicro c08b4a0f9d Merge pull request #14343 from super626/v3 
fix cull face for render queue
 2015-11-09 12:51:39 +08:00
pandamicro a37eeb6f67 Merge pull request #14344 from pandamicro/v3 
[ci skip]Web engine important issue fix
 2015-11-09 12:33:42 +08:00
pandamicro eac57ec33e Web engine important issue fix 2015-11-09 12:31:41 +08:00
yangxiao 9d2fca6d34 fix cull face for render queue 2015-11-09 10:42:12 +08:00
pandamicro e6022b2a92 Merge pull request #14337 from xiaofeng11/v3 
Update version number & RELEASE_NOTES.md, prepare 3.9 release
 2015-11-06 21:43:55 +08:00
XiaoFeng 4cf252475b update RELEASE_NOTES.md 2015-11-06 21:41:34 +08:00
XiaoFeng 7a0d014194 update file 2015-11-06 21:08:47 +08:00
XiaoFeng c0c35c603e Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
Nhuan Vu Duc fec8a5db02 Fix cannot add view to mFrameLayout when extends Cocos2dxActivity 2015-11-06 13:05:40 +07:00
pandamicro 101962559e Merge pull request #14331 from chengstory/UpdateWebSubmodule 
[ci skip] Update web submodule to latest.
 2015-11-06 12:56:55 +08:00
zhangcheng 8183d34b68 revert old timelineParser-2.x.js and add "||false" to it. 2015-11-06 12:50:36 +08:00
zhangcheng 76ed15591f Update web submodule to latest. 2015-11-06 11:56:45 +08:00