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

34169 Commits

Author SHA1 Message Date
zilongshanren ee31d2ad22 Merge pull request #14940 from mxenabled/stop_auto_scroll 
Add ability to stop auto scrolling in ui::ScrollView and extension::ScrollView
 2016-02-01 14:27:55 +08:00
lunhao.guo b2e5e480fe update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
mogemimi 4ac4f1a5c7 Fix warnings when building projects for iOS and tvOS 2016-01-29 08:07:17 +09:00
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
pandamicro 01f41921d1 Fix enableDebugger issue 2016-01-28 01:55:10 +08:00
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
 2016-01-28 01:12:49 +08:00
pandamicro de9b51c0cf Fix other GC issues 2016-01-28 01:03:50 +08:00
pandamicro 554523a201 Use JS::Heap instead of Mozilla::maybe to improve stability 2016-01-28 01:03:13 +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
pandamicro 55756cb043 Improve test cases 2016-01-26 19:34:01 +08:00
pandamicro 93987c7848 Remove PersistentRooted as much as possible and use pure JS references 2016-01-26 19:33:35 +08: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
pandamicro d6cedb88ec Remove JS::Persistent and move js object reference into JS scope 2016-01-24 19:47:26 +08:00
pandamicro 0daa846020 Improve gc test case and add cycle reference tests 
t

Improve gc test case and add action cycle reference test
 2016-01-24 19:47:24 +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
James Chen 28a3f78c65 Adds missing <mutex>, <memory> include files in WebSocket.h 2016-01-22 18:10:24 +08:00
James Chen b73b16d425 Adds isDestroy std::share_ptr variable to dectect whether websocket instance was destroyed. 2016-01-22 17:43:30 +08:00
James Chen c3e0edde06 'closed' state has to be set before quit websocket thread. 2016-01-22 16:10:49 +08:00
James Chen a64a789308 _readyState must be set to State::CLOSED and _delegate->onClose(this) must be invoked at the end of WebSocket::close. 2016-01-22 15:20:43 +08:00
James Chen ed9ed6c92f Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing. 2016-01-22 14:22:33 +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
Shane Smit ace1e9d563 Fixed variable rename to _autoScrollTotalTime 2016-01-21 11:18:52 -07:00
Shane Smit 8be86577ff Add stopAnimatedContentOffset() to extension::ScrollView 
Immediately stops the animated scroll initiated by setContentOffsetInDuration()
 2016-01-21 10:33:47 -07:00