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

14981 Commits

Author SHA1 Message Date
James Chen 0fe73f3a5d Merge pull request #4804 from minggo/android-config 
don't build spine module when build 2d module
 2014-01-02 06:53:15 -08:00
James Chen 831e0b08e0 Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop 
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
 2014-01-02 06:46:25 -08:00
James Chen 3063080446 Merge pull request #4808 from CocosRobot/updategeneratedsubmodule_1388672423 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-02 06:32:41 -08:00
CocosRobot c120394cae [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 14:20:27 +00:00
James Chen 1eda0b5835 Merge pull request #4806 from minggo/remove-using_namespace 
no use "using namespace" in header file
 2014-01-02 06:08:40 -08:00
minggo 22195a44d0 include spine dependence in testjavascript 2014-01-02 22:06:18 +08:00
James Chen e337fb35fc closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails. 2014-01-02 21:59:47 +08:00
minggo d345139a08 fix compiling errors 2014-01-02 21:53:18 +08:00
minggo 674b38beef no in header file 2014-01-02 21:43:27 +08:00
James Chen d8186a1d3c Merge pull request #4769 from heliclei/develop 
update exception catch clause
 2014-01-02 05:35:07 -08:00
minggo 676e25d304 2d module don't denpend on spine 2014-01-02 20:17:11 +08:00
James Chen 1beb992157 Update CHANGELOG [ci skip] 2014-01-02 20:09:43 +08:00
James Chen 602468e3f2 Merge pull request #4802 from dumganhar/develop 
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
 2014-01-02 04:08:22 -08:00
minggo 2b5be1bacf Merge pull request #4801 from minggo/namespace 
fix compiling errors because of new namespace of network module
 2014-01-02 04:03:03 -08:00
James Chen 05b1be3aeb Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners). 2014-01-02 19:59:10 +08:00
minggo 9124f189c3 fix compiling errors because of new namespace of network module 2014-01-02 19:44:46 +08:00
James Chen 5980007454 Merge pull request #4800 from CocosRobot/updategeneratedsubmodule_1388662583 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-02 03:38:15 -08:00
CocosRobot 1c5638ad4f [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 11:36:25 +00:00
James Chen bdb99c5aa1 Update AUTHORS [ci skip] 2014-01-02 19:33:07 +08:00
James Chen b071578541 Merge pull request #4798 from andyque/fixassignment 
fix missing check self assignment of Vector<T>, Map<K,V>, Value and String
 2014-01-02 03:31:39 -08:00
minggo 054972fd3b Merge pull request #4796 from minggo/deprecated-function 
use std::function for call back
 2014-01-02 03:29:17 -08:00
heliclei e43ca98a94 get the correct branch 2014-01-02 19:08:22 +08:00
andyque 961b27eacb remove move semantic into another pr 2014-01-02 18:32:47 +08:00
andyque 8a7228049a fixed self assignment error and provide move semantics to pushBack of Vector<T> 2014-01-02 18:31:43 +08:00
andyque 75d5bcfb42 remove const modifier of move semantic 2014-01-02 18:05:22 +08:00
andyque 80adda2ce8 fixed self assignment error and provide move semantics to pushBack of Vector<T> 2014-01-02 17:54:52 +08:00
heliclei 48579fe3ac remove debug code 2014-01-02 17:25:29 +08:00
minggo ded3e753f3 use std::function for call back 2014-01-02 17:23:00 +08:00
heliclei 8eeb32c98c remove debug code 2014-01-02 17:22:23 +08:00
heliclei b1714d74e5 refining exception handling 2014-01-02 17:09:49 +08:00
minggo f2b1a3cc83 Merge pull request #4793 from minggo/namespace 
network -> cocos2d::network
 2014-01-02 00:38:50 -08:00
James Chen c29e328490 Merge pull request #4779 from samuele3hu/DispatcherBak1 
Develop branch adds lua trigger for CocoStudio
 2014-01-02 00:29:30 -08:00
minggo 07600bd46b network -> cocos2d::network 2014-01-02 16:25:35 +08:00
James Chen 5bd580c175 Update CHANGELOG [ci skip] 2014-01-02 16:25:06 +08:00
James Chen be383a944a Update AUTHORS [ci skip] 2014-01-02 16:24:20 +08:00
James Chen c7e26fdb7b Merge pull request #4792 from dumganhar/lua-setblendfuc 
closed #3565: The setBlendFunc method of some classes wasn't exposed to LUA
 2014-01-02 00:23:13 -08:00
James Chen 67c5ba8dfb closed #3565: Adds missing `lua_pop`to prevent lua stack issues. 2014-01-02 16:21:35 +08:00
Kenneth Chan 80df88d2cf Add missing bindings to setBlendFunc for various classes 
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
 2014-01-02 16:21:35 +08:00
James Chen 4757e96033 Merge pull request #4787 from dumganhar/develop 
HttpClient doesn't have to be inherited from Object, its a singeton, ok?
 2014-01-02 00:21:05 -08:00
Huabing.Xu 57b0426994 fix bug clippingNodetest on mobile 2014-01-02 16:19:23 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
James Chen 7abeacd86e HttpClient don't have to be inherited from Object, its a singeton, ok? 2014-01-02 15:47:38 +08:00
Zhe Wang 210aae9243 Delete LICENSE_FontLabel.txt 2014-01-02 15:29:09 +08:00
Zhe Wang 911aafe3db Delete LICENSE_sigslot.txt 2014-01-02 15:28:24 +08:00
Zhe Wang 4252a5501d Delete LICENSE_iconv.txt 2014-01-02 15:28:01 +08:00
Zhe Wang 75d68ee966 Delete LICENSE_bada_pthread.txt 2014-01-02 15:25:42 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
James Chen 1df3ad7317 Merge pull request #4784 from CocosRobot/updategeneratedsubmodule_1388645893 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-01 22:59:33 -08:00
CocosRobot c6425172b7 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:58:15 +00:00
James Chen 91e25bc0b4 Merge pull request #4782 from CocosRobot/updategeneratedsubmodule_1388645344 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-01 22:51:49 -08:00