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

35390 Commits

Author SHA1 Message Date
minggo 944307a5f8 Merge pull request #15260 from mxenabled/dennacerise/color_constructor 
Add optional alpha parameter to Color4B and Color4F constructors
 2016-04-06 11:50:02 +08:00
mogemimi 985155749b Remove unnecessary const from return types in PU and Lua 2016-04-06 12:36:20 +09:00
minggo 6b167a1aa1 Merge pull request #15335 from mogemimi/fix-typos 
Fix typos in comments and strings
 2016-04-06 11:32:46 +08:00
minggo aa8cf8dfd4 Merge pull request #15343 from xpol/fixes-porject-config-waring 
Use pre-processor condition rather than runtime check.
 2016-04-06 11:25:24 +08:00
minggo 6fef5ce420 Merge pull request #15347 from mogemimi/add-missing-destructor 
Add missing virtual destructor in ILocalizationManager
 2016-04-06 11:20:15 +08:00
minggo 018e657676 Merge pull request #15371 from cocos2d/slackmoehrle-patch-1 
updated some of the links
 2016-04-06 11:06:31 +08:00
Ricardo Quesada 6a47bee623 Merge pull request #15373 from ricardoquesada/buoyancy_js_fix 
buoyancy fix for Chipmunk-JS test
 2016-04-05 17:53:35 -07:00
Ricardo Quesada 88ff4da348 buoyancy fix. 
first commit
 2016-04-05 17:52:19 -07:00
Slack-Moehrle 13ab82f3d0 updated some of the links 
updated some of the links.
 2016-04-05 16:17:52 -04:00
mogemimi a184c88e9d Add missing virtual destructor in ILocalizationManager 2016-04-06 01:40:41 +09:00
Juan Luis Boya García 73b900a77f Make selectedSprite optional in JSB too 2016-04-05 12:58:50 +02:00
zilongshanren f488eabb8f Merge pull request #15362 from CocosRobot/update_lua_bindings_1459598673 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-02 20:07:39 +08:00
CocosRobot 81448cd1b8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-02 12:06:57 +00:00
zilongshanren 3192267af0 Merge pull request #15358 from zilongshanren/fixTextFieldPasswordStyle 
fix textField password bug
 2016-04-02 20:01:45 +08:00
Steve Tranby 24fd25e143 Iterator erase pattern 2016-04-01 18:29:21 -06:00
pandamicro 3d7d5de95d Merge pull request #15317 from pandamicro/v3 
Fix Socket IO handshake issue with latest version libwebsocket
 2016-04-01 22:27:57 +08:00
zilongshanren 8587440e31 remove unneed c_str call 2016-04-01 10:01:37 +08:00
zilongshanren 90087ae5a7 improve textfield code 2016-04-01 09:31:18 +08:00
zilongshanren dcb7c58216 fix textField password bug 2016-04-01 00:52:55 +08:00
pandamicro d93fbea0f6 Fix Socket IO connection issue on iOS 2016-03-31 21:21:20 +08:00
minggo 08383628cc Merge pull request #15356 from minggo/crash 
[ci skip]fix crash issue
 2016-03-31 15:37:27 +08:00
minggo 8694a15a72 fix crash issue 2016-03-31 15:36:00 +08:00
minggo 5f4e8a65c4 Merge pull request #15348 from minggo/action_issue 
some bugs fixed of Repeat
 2016-03-31 14:47:54 +08:00
minggo 67e2eb12eb Merge pull request #15355 from xiaofeng11/v3 
rollback chipmunk export change
 2016-03-31 11:47:06 +08:00
肖峰 5b10ab3c2d rollback chipmunk export change 2016-03-31 11:01:58 +08:00
zilongshanren 7afcecc8cc Merge pull request #15353 from zilongshanren/fixTextField 
fix TextField password issue
 2016-03-30 22:02:06 +08:00
zilongshanren 016979af3b fix TextField password issue 2016-03-30 18:19:28 +08:00
minggo b80ebebc06 Merge pull request #15351 from natural-law/v3 
Update the submodule cocos2d-console
 2016-03-30 16:02:10 +08:00
minggo a11bf8b32e Merge pull request #15352 from minggo/js_version 
[ci skip]upgrade engine version
 2016-03-30 15:19:11 +08:00
minggo 48d24f14d7 upgrade engine version 2016-03-30 15:17:49 +08:00
zhangbin bb4e9869d1 Update the submodule cocos2d-console 2016-03-30 15:14:05 +08:00
minggo aee717cdff Merge pull request #15341 from xiaofeng11/v3_readerFix 
Fix in cpp-test bugs test scene 13 crash
 2016-03-30 15:00:02 +08:00
minggo fb3032b6fe Merge pull request #15349 from minggo/menu_test 
[ci skip]Menu test
 2016-03-30 14:44:24 +08:00
minggo b4ee6e8971 don't set wrong string for atlas label 2016-03-30 14:32:11 +08:00
minggo c1a79700ae don't set wrong string for atlas label 2016-03-30 14:28:33 +08:00
minggo fcd64e081d some bugs fixed of Repeat 
1. action may be ran more than specified times
2. instant action will ran one frame later
 2016-03-30 14:05:22 +08:00
Ricardo Quesada 87a9e274c2 Merge pull request #15346 from ricardoquesada/compiles_release_mode_xcode 
fix: compile cpp-tests in release mode
 2016-03-29 20:26:46 -07:00
minggo f80540e796 Merge pull request #15340 from natural-law/v3 
Update the submodule cocos2d-console
 2016-03-30 10:26:45 +08:00
Ricardo Quesada c566dce581 fix: compile cpp-tests in release mode 
replace some deprecated functions
use `log` instead of `CCLOG` in order to avoid Warnings when not using
some variables
 2016-03-29 18:09:58 -07:00
Xpol Wan bc275b81a2 Add a coding style tool for tailing whitespace. 
in this tool:

* it remove tailing white spaces
* and ensures one and only one empty ending line.
* it fixes '.c', '.cpp', '.h', '.hpp', '.m', '.mm', '.java' sources in
    - $engineRoot/cocos
    - $engineRoot/extensions
    - $engineRoot/templates
    - $engineRoot/tests
    - $engineRoot/tools/simulator
 2016-03-29 22:46:52 +08:00
Xpol Wan 5c632adf5e Use pre-processor condition rather than runtime check. 
This avoids compiler warning.
 2016-03-29 21:54:23 +08:00
Xpol Wan cd1c26ecd1 Allow plist and other ValueMap files be (easy) decrypted. 
The origin implementation of `FileUtilsApple::getValueMapFromFile()` reads the contents of file and parse it by calling one Apple API.
This make it harder to decrypt user encrypted plist files.

This commit use the `FileUtils::getDataFromFile()` to get read file data first then use `getValueMapFromData()`
to parse it into a ValueMap. Where `FileUtils::getDataFromFile()` can be overwrite by user's decoding file utils (say `DecodingFileUtils`).

I know that user's `DecodingFileUtils` can also overwrite `getValueMapFromFile`, but this pr make the author of `DecodingFileUtils` less suffering.
 2016-03-29 21:39:16 +08:00
肖峰 44331137d8 Fix in cpp-test bugs test scene 13 crash 2016-03-29 16:45:16 +08:00
zhangbin e3de0d1f0b Update the submodule cocos2d-console 2016-03-29 15:38:00 +08:00
minggo 9762a2616e Merge pull request #15339 from minggo/lua_labeltest_bug 
[ci skip]update label string every 0.1s
 2016-03-29 15:27:05 +08:00
minggo 1de5141473 update label string every 0.1s 2016-03-29 15:25:18 +08:00
minggo cf8f28f6d2 Merge pull request #15337 from minggo/release-note-v311 
[ci skip]update changelog for v3.11
 2016-03-29 11:34:17 +08:00
minggo b21c6f37d5 update changelog for v3.11 2016-03-29 11:32:34 +08:00
zilongshanren 6e3d69dded Merge pull request #15336 from cocos2d/v3.10 
V3.10
 2016-03-29 11:23:11 +08:00
mogemimi 44080a04d8 Fix typos in comments and strings 2016-03-29 10:52:17 +09:00