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

36261 Commits

Author SHA1 Message Date
yalab 598be0840c Fixed to fail FileUtils::writeValueMapToFile on iOS. 2016-06-10 14:53:11 +09:00
mogemimi 07e0c1cbf9 Fix typo in method name: 'destory' -> 'destroy' 2016-06-09 09:25:06 +09:00
mogemimi de5dd21ded Add missing default cases within switch block for JS and Lua JavaBridge 2016-06-08 15:41:44 +09:00
minggo 98bee7e12a remove unneeded test case and fix resource missing (#15804) 
* remove unneeded test case and fix resource missing

* remove unneeded test case
 2016-06-08 13:36:36 +08:00
minggo 363beb436d Merge pull request #15790 from dumganhar/profiling-fix 
Compilation fix while CC_ENABLE_PROFILERS = 1
 2016-06-08 10:55:54 +08:00
AlwynC 70000bcc84 Refine cpp template for iOS (#15792) 
* Modified the layer follow action class to include a horizontal (x) and vertical (y) offset on the screen from which the node is to be followed.

* Added offsetX and offsetY parameters in Follow::clone() method.

* Added test case for follow action with offset.

* Made changes to the test case on follow action with offset.

* Added new createWithOffset function to create a follow action with offset.

* Modified the test case for followWithoffset to use the newly added createWithOffsets function for follow action.

* Refined the code for creating follow action with offsets.

* Modified test case for follow with offset as per updated create method.

* Code refined in createWithOffset method of follow action.

* Refined AppController.mm,RootViewController.mm and HelloWorldScene.cpp to load the cocos2d-x scene more effectively.Also included the procedure to dismiss the game scene and navigate back to iOS screen.
 2016-06-08 10:55:02 +08:00
mogemimi 376d21d253 Avoid shadow warning when building with Xcode 7.3 (#15795) 2016-06-08 10:25:34 +08:00
minggo 3b8aec6656 Merge pull request #15797 from minggo/issue-15709 
edit box support LOWERCASE_ALL_CHARACTERS
 2016-06-08 10:03:39 +08:00
minggo 93d87ad19e android supports LOWERCASE_ALL_CHARACTERS 2016-06-07 12:41:22 +08:00
minggo 7e1da2188c ios supports LOWERCASE_ALL_CHARACTERS 2016-06-07 10:31:16 +08:00
TheCodez 7885f55ce5 Cache bas64 images 2016-06-06 16:32:50 +02:00
James Chen 4f2b4559b6 Compilation fix while CC_ENABLE_PROFILERS = 1 2016-06-06 16:25:00 +08:00
minggo 3b4f2c38dd Merge pull request #15788 from minggo/editbox-capital-issue 
[ci skip]not use capital letters by default
 2016-06-06 14:00:32 +08:00
minggo 7e2f79ce8f not use capital letters by default 2016-06-06 13:55:20 +08:00
Shulepov 21ab86b5fe iOS: ARC support #12518 (#13937) 
* iOS: ARC support #12518

* Use @autoreleasepool with and without ARC

* Missed release for _viewController
 2016-06-06 13:48:02 +08:00
minggo 264bf87c87 Merge pull request #15784 from mogemimi/fix-unused-param 
Fix unused parameter warning when compiling CCArray
 2016-06-06 10:13:28 +08:00
patriciog 097eebdb50 Testcase for CCS 1.6 animations with only one frame (#15714) 
* Testcase for CCS 1.6 animations with only one frame

* Removed extra comma

* Removed conflict garbage

* Removed old code

* Create new Test section Cocos Studio > Issues

* update ccs-res submodule

* Fixed Back button visibility
 2016-06-06 09:32:33 +08:00
mogemimi a22302e2ee Fix unused parameter warning when compiling CCArray 2016-06-04 21:17:53 +09:00
minggo cf80eb18b1 Merge pull request #15777 from pandamicro/v3 
Fix scheduler callback target lost issue
 2016-06-03 14:05:32 +08:00
minggo 5cd4c8aaca Merge pull request #15778 from minggo/scriptingcore-issue 
avoid to access invalid memory
 2016-06-03 14:04:17 +08:00
mogemimi 388eeed014 Suppress '-Wundefined-bool-conversion' warnings on Android NDK with Clang (#15775) 2016-06-03 13:42:44 +08:00
minggo b7b74f2328 avoid to access invalid memory when received data length is the same as buffer size 2016-06-03 11:39:01 +08:00
pandamicro 3597ce7c43 Fix scheduler callback target lost issue 2016-06-03 11:01:06 +08:00
Nikita 612cd7b82f Fixed behavior of "cc.isObject" function for undefined and null values. (#15085) 
* Fixed wrong behavior of "cc.isObject" function for undefined and null values.

* Simplify 'cc.isObject' function

* Remove double return in 'cc.isObject'
 2016-06-03 09:45:32 +08:00
MagicXrEv 29cca63822 Texture2D::addImageAsync : Set pixel format correctly. (#15774) 2016-06-03 09:38:01 +08:00
minggo 4ade6fbb80 Merge pull request #15772 from minggo/issue-15739 
update deps
 2016-06-03 09:35:40 +08:00
minggo c7c67144b7 Merge pull request #15769 from pandamicro/v3 
Fix scheduler callback target lost issue
 2016-06-03 09:29:01 +08:00
minggo 9322ecc937 Merge pull request #15768 from minggo/issue-15738 
add a new create method to create resizable window
 2016-06-03 09:28:40 +08:00
minggo 245d4da0b2 Merge pull request #15773 from CocosRobot/update_lua_bindings_1464858820 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-06-02 17:18:34 +08:00
CocosRobot da114e13d1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-02 09:16:13 +00:00
minggo dd1c87a1e0 Merge pull request #15764 from AlexanderShniperson/listview_select_item 
ListView select item programmatically
 2016-06-02 17:09:49 +08:00
minggo 35730063f1 Merge pull request #15766 from mogemimi/fix-unused-param 
Fix unused parameter warning
 2016-06-02 17:06:02 +08:00
minggo 18c329b863 Merge pull request #15771 from minggo/iss-15763 
[desktop]fix the bug the depth test is disabled when application size…
 2016-06-02 17:05:20 +08:00
minggo 773fd16fc1 fix deps version 2016-06-02 16:50:32 +08:00
minggo 75227a5c0e [desktop]fix the bug the depth test is disabled when application size changed 2016-06-02 16:18:31 +08:00
pandamicro d1e9a149c4 Fix scheduler callback target lost issue 2016-06-02 16:02:29 +08:00
minggo 7243b00cad add a new create method to create resizable window 2016-06-02 15:48:16 +08:00
minggo 02f5f99aee Merge pull request #15765 from minggo/change-to-clang 
cocos command use clang
 2016-06-02 15:23:39 +08:00
minggo 88bb8a4974 cocos command use clang 2016-06-02 14:34:10 +08:00
mogemimi bd00b2f261 Fix unused parameter warning 2016-06-02 15:30:24 +09:00
Alexander Shniperson 07c5e528e7 ListView select item programmatically 2016-06-02 10:11:28 +04:00
minggo 66217b7bd1 Merge pull request #15761 from dumganhar/set-blending-fix 
SetBlending fix
 2016-06-02 11:01:50 +08:00
minggo 827aa803a4 Merge pull request #15755 from mogemimi/remove-c99-macros 
Remove unnecessary sinf, cosf, tanf and sqrtf macros
 2016-06-02 11:00:51 +08:00
minggo 1d42bae8c5 Merge pull request #15735 from MrCapone/v3 
AudioEngine-linux fix: add map contains IDs of preloaded files
 2016-06-01 21:34:15 +08:00
James Chen 3d116c3333 SetBlending fix 2016-06-01 17:46:27 +08:00
minggo 3096b009f3 Merge pull request #15699 from cezheng/fix/assetsmanagerex_manifest_url 
use manifestUrl from remote version
 2016-05-31 09:26:11 +08:00
minggo 6f79082c6a Merge pull request #15754 from minggo/linux-compiling-error 
use std::isnan instead of isnan to fix compiling errors
 2016-05-31 09:22:05 +08:00
mogemimi a4a357db69 Remove unnecessary sinf, cosf, tanf and sqrtf macros 2016-05-31 02:39:40 +09:00
minggo 3810854c45 use std::isnan instead of isnan to fix compiling errors 2016-05-30 18:19:10 +08:00
minggo 495dfd166f Merge pull request #15753 from CocosRobot/update_lua_bindings_1464600269 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-05-30 17:37:20 +08:00