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

33930 Commits

Author SHA1 Message Date
zilongshanren ad756cf6bb Merge pull request #14983 from CocosRobot/update_lua_bindings_1453953583 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-01-28 13:31:43 +08:00
CocosRobot 346144742f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-28 04:01:53 +00:00
zilongshanren 41edaa8b32 Merge pull request #14975 from greekman99/master 
Fixed subtle documentation issues
 2016-01-28 11:55:56 +08:00
minggo e246390c42 Merge pull request #14978 from xpol/const-ref-args-for-file-utils-write-methods 
Small refactor FileUtils.
 2016-01-28 10:36:31 +08:00
zilongshanren b0d0a7a064 Merge pull request #14964 from zilongshanren/fix14909 
fix pageview page turning event issue
 2016-01-27 20:53:48 +08:00
zilongshanren 366407ca1c fix win32 compile issue 2016-01-27 20:21:32 +08:00
Xpol Wan 56e5cf2101 Fixes indent. 2016-01-27 13:43:55 +08:00
Xpol Wan d8bf7fa767 Remove unnecessary memory copy when saving string. 2016-01-27 13:40:19 +08:00
Xpol Wan ea9dda052b Better name for data to be saved. 2016-01-27 13:39:31 +08:00
Xpol Wan f3aef10d33 Should be const reference for data/string args to be written. 2016-01-27 11:22:46 +08:00
Justin Luong bd4615795e fixed documentation for better reading clarity 2016-01-27 11:42:25 +10:00
Justin Luong c89df2f243 Merge remote-tracking branch 'upstream/v3' 2016-01-26 20:52:55 +10:00
zilongshanren 83a6fd36ce Merge pull request #14971 from mogemimi/use-string-instead-of-chars 
Replace char* with std::string in HttpRequest
 2016-01-26 09:59:23 +08:00
zilongshanren f853a43e04 Merge pull request #14970 from mxenabled/steerlink/cleanup_obsolete_win32 
Remove obsolete Win32 references.
 2016-01-26 09:58:32 +08:00
zilongshanren 74e7bd2083 fix win32 compile error 2016-01-26 09:52:53 +08:00
mogemimi 7dd7dfede7 Replace char* with std::string in HttpRequest 2016-01-26 05:13:18 +09:00
sheldon.teerlink 60d640442f Remove obsolete Win32 references. 2016-01-25 12:23:53 -07:00
zilongshanren bc44769b8b add more deprecated functions 2016-01-25 18:14:48 +08:00
zilongshanren 00ad5bd620 fix jsb deprecated constants 2016-01-25 15:40:51 +08:00
zilongshanren b43764fc92 fix lua deprecated function bindings 2016-01-25 14:48:17 +08:00
zilongshanren dbf5b2c4a5 fix pageview page turning event issue 2016-01-25 11:53:40 +08:00
zilongshanren b85ccbbb4e Merge pull request #14934 from CocosRobot/update_lua_bindings_1453361909 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-01-25 11:09:47 +08:00
zilongshanren e05b977746 Merge pull request #14952 from CocosRobot/update_lua_bindings_1453472618 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-01-24 20:47:52 +08:00
Justin Luong 6644781698 Merge remote-tracking branch 'upstream/v3' 2016-01-23 21:06:33 +10:00
CocosRobot 039286f814 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-22 14:25:59 +00:00
Ricardo Quesada fccbcdef69 Merge pull request #14947 from ricardoquesada/rich_text_word_wrap 
RichText with word wrapping working as expected
 2016-01-22 06:20:25 -08:00
Ricardo Quesada 7582518424 default is word-wrap 2016-01-22 06:20:01 -08:00
Justin Luong 57d218421e Merge remote-tracking branch 'upstream/v3' 2016-01-22 16:02:07 +10:00
Ricardo Quesada 25f78e490d RichText with word wrapping working as expected 2016-01-21 21:44:45 -08:00
zilongshanren bce913c46b Merge pull request #14941 from mogemimi/add-const-to-equals 
Mark equals() functions as const
 2016-01-22 09:32:41 +08:00
Justin Luong c4df3ccd10 please ignore just a test 2016-01-22 11:05:43 +10:00
mogemimi 37b0d7c217 Mark equals() functions as const 2016-01-22 06:09:27 +09:00
CocosRobot 4b214fd528 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-21 07:40:58 +00:00
zilongshanren be7c8c7553 Merge pull request #14888 from xiaofeng11/v3_actiontimeline 
Fix when add two ActionTimeLine object in one node, play state is wrong
 2016-01-21 15:35:30 +08:00
Ricardo Quesada ec2d29ed16 Merge pull request #14930 from ricardoquesada/rich_text_fixes 
adds JS tests for RichText
 2016-01-20 22:47:35 -08:00
xiaofeng11 015994da37 Merge pull request #14926 from geron-cn/scroll_bar 
add scrollview bar parse for cocostudio in reader
 2016-01-21 13:09:34 +08:00
geron-cn 7b405b29bc fix code indent 2016-01-21 11:33:13 +08:00
Ricardo Quesada 4c11432781 fixed bold 2016-01-20 19:08:31 -08:00
zilongshanren d9af70f913 Merge pull request #14600 from enhhh/enh_v3 
We should not intercept touch event if scrollview's _direction is NONE
 2016-01-21 10:58:20 +08:00
zilongshanren 790c7b4b79 Merge pull request #14891 from mogemimi/fix-extra-tokens-warning 
Fix warning: extra tokens at end of #ifdef directive
 2016-01-21 10:51:01 +08:00
zilongshanren 4d128a83f4 Merge pull request #14659 from elvman/resizable_window 
Resizable window
 2016-01-21 10:49:33 +08:00
zilongshanren 8fda08abcd Merge pull request #14755 from mogemimi/fix-redefinition-warning 
Fix OpenGL macro redefinition warning in JS bindings/Mac
 2016-01-21 10:46:58 +08:00
zilongshanren 2ed4965b6d Merge pull request #14751 from newnon/v3_get_version_windows 
getVersion win32 implementation
 2016-01-21 10:42:19 +08:00
Ricardo Quesada 60d273e31b underline and strikethrough working ok on system fonts 2016-01-20 18:41:59 -08:00
zilongshanren 2fbf4c1539 Merge pull request #14932 from CocosRobot/update_lua_bindings_1453343722 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-01-21 10:41:00 +08:00
CocosRobot 4dab20b715 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-21 02:37:23 +00:00
zilongshanren fd0ed05f18 Merge pull request #14902 from mogemimi/update-docs-to-v3 
Update docs to reflect latest API changes
 2016-01-21 10:35:27 +08:00
zilongshanren c824b6e74a Merge pull request #14931 from CocosRobot/update_cocosfiles_1453343619 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-01-21 10:34:49 +08:00
zilongshanren e1e87c0205 Merge pull request #14914 from steerlink/font_family 
Add ability to get the font family
 2016-01-21 10:34:13 +08:00
CocosRobot f3cd516926 [AUTO][ci skip]: updating cocos2dx_files.json 2016-01-21 02:33:41 +00:00