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

2511 Commits

Author SHA1 Message Date
minggo c61cd9afe7 fix spine binding codes and test case (#17335) 2017-02-10 11:58:23 +08:00
CocosRobot 85dbcc1638 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17332) 2017-02-09 17:07:42 +08:00
minggo 8825a091bb update spine to 3.5.35 (#17331) 
* update spine to 3.5.35

* fix jsb compiling error

* fix lua compiling error
 2017-02-09 16:57:42 +08:00
CocosRobot 3d51645d3d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17319) 2017-02-08 10:42:18 +08:00
Dale Stammen 9381152ef1 removed support for Windows 8.1 store and phone (#17311) 2017-02-08 09:46:47 +08:00
mogemimi 75d2e76095 Fix minor typos in comments and docs (#17294) 2017-02-07 09:41:52 +08:00
CocosRobot c1b4358d13 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17290) 2017-02-06 16:31:09 +08:00
mogemimi 1d47ae7e90 Fix typo in function name (#17253) 2017-02-04 10:35:56 +08:00
CocosRobot 4e6be0e9da [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17276) 2017-02-04 10:35:08 +08:00
mogemimi 777a97e141 Fix typo in AudioState (#17258) 2017-02-04 10:34:34 +08:00
CocosRobot#Set bdcf461dc3 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-23 01:32:57 +00:00
minggo 690db56f44 Merge v3.14.1 (#17231) 
* update cocos console to fix compiling error with Android Studio projects (#17129) (#17145)

* fix crash if physics3d camera is not set (#17139) (#17144)

* fix linking error with vs2015 (#17146)

* fix issue #17116 & #17119 for v3.14.1

* tests cases

* better documentation

* doc: updates sprite doc

* Fix scale9sprite polygon info (#17161)

* add guard code to Scale9Sprite

* add new test code

* Glfw linux issue (#17166)

* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2

* Update web engine ref (#17169)

* update version and release note (#17170)

* issue ##17119 improved v3.14.1 (#17189)

* update version (#17230)
 2017-01-20 09:59:30 +08:00
CocosRobot 1bc016b354 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17232) 2017-01-19 14:15:08 +08:00
minggo 00b9dcd62e Lua custom handler (#17211) 
* avoid crash if custom handler vector is empty

* simplify codes
 2017-01-18 17:05:08 +08:00
mogemimi 888b985e0e Fix variable name typo (#17195) 2017-01-16 11:21:34 +08:00
CocosRobot 21d57bfd39 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17185) 2017-01-16 11:20:39 +08:00
CocosRobot f2114f36f8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17183) 2017-01-13 14:04:11 +08:00
minggo 1b6c8cc5c1 bind FileUtils:getDataFromFile() to lua (#17182) 2017-01-13 13:39:58 +08:00
minggo afb55253f1 fix dutch language value and add missing languages (#17160) 2017-01-11 14:04:45 +08:00
CocosRobot 90e0ab0c2e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17152) 2017-01-11 10:49:48 +08:00
CocosRobot 91ae4b1c03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17143) 2017-01-10 16:59:15 +08:00
kosmosR2 44fb4ba3bc To use some HTTP client library those use `send(null)` like `superagent`,`XMLHTTPRequest` should send a empty request instead of abort. (#16989) 2017-01-05 16:12:03 +08:00
CocosRobot#Set 69217f0e8b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-05 01:40:38 +00:00
minggo a0acaf5972 Merge pull request #17101 from minggo/merge-v314 
Merge v314
 2017-01-04 11:48:31 +08:00
CocosRobot 61170c69ee [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17103) 2017-01-04 11:47:58 +08:00
minggo f63fad3e27 Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
pandamicro 88be66218b Small fix to CallbackWrapper 2016-12-26 00:08:59 +08:00
pandamicro 7c2ea03b00 Improve TrackEntry issue solution with internal unordered_map 2016-12-26 00:08:18 +08:00
pandamicro 100c027054 Fix chipmunk crash issues when using setDefaultCollisionHandler 2016-12-21 11:07:18 +08:00
pandamicro a3d6705b02 Improve cc.formatStr 2016-12-21 11:05:49 +08:00
pandamicro 24be2acde0 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14 
# Conflicts:
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
#	tests/js-tests/src/SpineTest/SpineTest.js
 2016-12-19 12:39:55 +08:00
pandamicro 149bdf125e Update engine version 2016-12-19 12:15:41 +08:00
pandamicro 51a09048bd Increase default JS heap to 32 mb 2016-12-19 11:51:43 +08:00
pandamicro a508b7d751 Fix crash during Wrappers deallocation (possible to have leak) 2016-12-19 11:51:23 +08:00
pandamicro 46dbb32fd9 Fix spine TrackEntry recursive conversion issue by using getter 2016-12-19 11:50:52 +08:00
pandamicro 2b6e84e9a2 Separate FinalizeHook for ref objects and non ref objects 2016-12-19 11:50:32 +08:00
CocosRobot 77d0e8292a [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17016) 2016-12-15 10:03:04 +08:00
James Chen c0291afad7 Merge branch 'v3.14' into merge-v3.14 2016-12-14 17:03:58 +08:00
CocosRobot edca6862b9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17009) 2016-12-14 09:37:46 +08:00
pandamicro 5823f5792b Synchronize creator engine bug fixes and upgrade web engine (#17003) 
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd
 2016-12-14 09:27:47 +08:00
pandamicro a73485a1bc Use %ld instead of %zd 2016-12-13 18:12:50 +08:00
pandamicro d89bde4e8e Fix compilation issues and update web & bindings-generator 2016-12-13 15:37:46 +08:00
pandamicro bedde74df5 Fix compilation issue when COCOS_DEBUG = 2 2016-12-13 14:29:25 +08:00
pandamicro 00b57c9565 Manual bind EventListeners’ create to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro 3d6b1367cd Manually bind EventDispatcher::addCustomEventListener to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro 6b25a73a93 Synchronize Scheduler.PRIORITY_NON_SYSTEM const 2016-12-13 14:29:24 +08:00
pandamicro d4618e60ef Synchronize Editbox APIs 2016-12-13 14:29:24 +08:00
pandamicro ae5ccd16f2 Direct log/error for better understanding problems & add sys.now 2016-12-13 14:29:23 +08:00
pandamicro b50ea4afce Support more system languages 2016-12-13 14:29:23 +08:00
pandamicro 197dac204b Fix function wrapper using js object during its gc 2016-12-13 14:29:23 +08:00