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

35967 Commits

Author SHA1 Message Date
yanli.huang 3e33b7a1ca update cocos2d-console commit (#16222) 
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
 2016-07-27 15:37:12 +08:00
minggo 1a1241c3fc Merge pull request #16221 from Microsoft/winrt-v3.13 
WinRT: update libcocos2d version to v3.13
 2016-07-27 15:36:43 +08:00
minggo a0d099f87a Merge pull request #16219 from halx99/patch-1 
Update AUTHORS
 2016-07-27 15:36:21 +08:00
James Chen 6efcf87b93 fixed #14148: Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will not be mute. 
The error is: ERROR: [0x19e5fa000] >aurioc> 807: failed: '!pla' (enable 2, outf< 2 ch, 44100 Hz, Float32, non-inter> inf< 2 ch, 0 Hz, Float32, non-inter>)
 2016-07-27 15:33:02 +08:00
Ricardo Quesada 4e278183ad Merge pull request #16122 from ricardoquesada/issue_16100 
testcase: add test case for issue #16100
 2016-07-26 23:21:25 -07:00
James Chen 8eb30769a1 Adds test case. 2016-07-27 14:00:34 +08:00
James Chen bd1d630f93 fixed #16192: Crash while decoding small MP3 file on Android. 2016-07-27 13:54:39 +08:00
minggo ad25873821 Merge pull request #16223 from minggo/template-compiling-issue 
[ci skip]explicitly set app-abi to armeabi
 2016-07-27 10:11:17 +08:00
minggo 67ec4521e5 explicitly set app-abi to armeabi 2016-07-27 10:10:09 +08:00
Ricardo Quesada b336aa3219 testcase: add test case for issue #16100 
delays camera creation

fix issue #16100
 2016-07-26 19:03:54 -07:00
Dale Stammen d5809129c4 update libcocos2d version to v3.13 2016-07-26 12:34:36 -07:00
halx99 00f0f72bef Update AUTHORS 2016-07-26 21:55:06 +08:00
Ce Zheng 9903d31031 fix CCImage premultipliedAlpha for ETC format 
translucent part of ETC format textures are rendered too bright due to
the fact that v3.12 sets PremultipliedAlpha to true by default. This
commit sets default value of _hasPremultipliedAlpha = false, deletes
unnecessary `_hasPremultipliedAlpha = false` code in multiple places,
making ETC format's _hasPremultipliedAlpha false while keeping other
formats unchanged.
 2016-07-26 19:17:10 +09:00
minggo 6109ca6e4b Merge pull request #16216 from mogemimi/remove-unnecessary-extern 
Remove unnecessary 'extern' to prevent compiler warnings
 2016-07-26 15:19:11 +08:00
minggo 6fb4410232 Merge pull request #16213 from CocosRobot/update_lua_bindings_1469498667 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-26 15:12:48 +08:00
mogemimi 0894662eff Remove unnecessary 'extern' to prevent compiler warnings 2016-07-26 12:42:43 +09:00
CocosRobot 9566a0cb24 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-26 02:06:58 +00:00
minggo e1204c6138 Merge pull request #16210 from dumganhar/fix/std-bind 
Remove unneeded std::bind, and use const & for input parameters.
 2016-07-26 09:58:01 +08:00
minggo afc054ea2d Merge pull request #16211 from mogemimi/fix-variable-name 
Fix typos in variable names
 2016-07-26 09:57:12 +08:00
mogemimi 093ef3a14f Fix typos in variable names 2016-07-26 04:06:01 +09:00
James Chen bf80f10dfd Remove unneeded std::bind, and use const & for input parameters. 2016-07-26 00:55:32 +08:00
minggo 662a1636c3 replace __system_property_get (#16205) 
* replace __system_property_get

* fix comment
 2016-07-25 18:30:47 +08:00
minggo 8693db38ac Merge pull request #16209 from CocosRobot/update_lua_bindings_1469439400 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-25 18:30:22 +08:00
minggo 23d9b9b9d4 Merge pull request #16206 from CocosRobot/update_cocosfiles_1469439224 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-07-25 18:29:56 +08:00
CocosRobot e0abb981d5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-25 09:39:34 +00:00
CocosRobot 588ac1c70d [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-25 09:33:45 +00:00
minggo acddbf1284 Merge pull request #16202 from natural-law/v3 
Update the submodule cocos2d-console.
 2016-07-25 17:32:58 +08:00
minggo aa4e82c475 Merge pull request #16204 from CocosRobot/update_cocosfiles_1469433601 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-07-25 17:32:36 +08:00
halx99 bf996c5bac Add ETC1 builtin alpha support. (#16118) 
* Add ETC1 builtin alpha support.

* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix

* Check whether etc1 alpha suffix is empty

* fix Code ident & Add etc1 alpha test case to SpriteTest.

* Remove unused ETC1AA shader programs

* Fix all review issues and endl issues

* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID

* #fix issues
 2016-07-25 17:31:54 +08:00
CocosRobot dfda0e9e67 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-25 08:00:03 +00:00
minggo 8c537ed209 add issue tempalte 2016-07-25 15:58:04 +08:00
minggo cc14a06800 Issue 14206 (#16201) 
* don't trigger applicationWillEnterForeground at first time to be the same as iOS

* rename first to firstTime
 2016-07-25 14:25:48 +08:00
zhangbin 361a94e920 Update the submodule cocos2d-console. 
Solve the crash problem of cocos console on some Mac machines. Related issue: #16138
 2016-07-25 11:38:03 +08:00
yanli.huang 5b3eae7be8 update cocos2d-console commit (#16196) 2016-07-25 11:19:11 +08:00
minggo 7fed88038b Merge pull request #16200 from mogemimi/fix-logging-typos 
Fix typos in log messages
 2016-07-25 10:32:06 +08:00
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
minggo 1192176877 Merge pull request #16195 from minggo/issue-12704 
remove unneeded flag
 2016-07-22 18:10:11 +08:00
minggo e3f6a16da7 Merge pull request #16194 from minggo/socketio-issue 
get correct control code
 2016-07-22 14:56:44 +08:00
minggo 4c2234fe20 get correct control code 2016-07-22 14:30:06 +08:00
minggo a97906a280 Merge pull request #16184 from minggo/issue-16161 
Issue 16161
 2016-07-22 13:51:54 +08:00
minggo 2491a0c33a Merge pull request #16191 from minggo/issue-12430 
improve log info
 2016-07-22 13:51:31 +08:00
minggo 391d97d1dd improve log info 2016-07-22 11:56:41 +08:00
minggo 8419cc2662 Merge pull request #16183 from SaxonDruce/android-willplaymusic 
Implement willPlayBackgroundMusic() on Android
 2016-07-22 10:57:26 +08:00
minggo fcd02f109e Merge pull request #16189 from mogemimi/fix-docs-typo 
Fix typos in documentation and comments
 2016-07-22 10:55:05 +08:00
minggo 5f2c1df448 use android 21 to fix compiling error 2016-07-22 10:53:56 +08:00
Ricardo Quesada 554b3b7ca7 Merge pull request #16190 from ricardoquesada/issue_16139_bis 
fix: FPS appears again
 2016-07-21 19:44:03 -07:00
minggo 358f247700 remove unneeded flag 2016-07-22 09:42:08 +08:00
Ricardo Quesada 1a834ebdbf fix: FPS appears again 
Sets default glviewport() when the GLView::updateDesignResolutionSize()
is called

github issue #16139
 2016-07-21 15:12:57 -07:00
Ricardo Quesada 2abd178e96 Merge pull request #16180 from ricardoquesada/issue_16113 
test case for issue #16113
 2016-07-21 10:53:38 -07:00
mogemimi 94d4971ddc Fix typos in documentation and comments 2016-07-22 02:05:19 +09:00