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

14964 Commits

Author SHA1 Message Date
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
CocosRobot ada5eb82ec [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:49:06 +00:00
James Chen 1480dd99d6 Merge pull request #4777 from 2youyouo2/develop 
update armature, change interface from "by" to "with"
 2014-01-01 22:47:18 -08:00
James Chen 69d681e343 Merge pull request #4781 from dumganhar/js-ui-test 
Updates JSB gui test
 2014-01-01 22:44:25 -08:00
samuele3hu cc2e6aef63 Add missis “ccs.” prefix 2014-01-02 14:25:15 +08:00
James Chen e2887a2b64 Updates JS-Test submodule reference. 2014-01-02 14:22:22 +08:00
James Chen 3e044cf90e Updates tools/tojs/cocos2dx_gui.ini. target_namespace from ccs to ccii. 2014-01-02 14:22:00 +08:00
James Chen dd54e906f0 ccs.XXX —> ccui.XXX for gui js bindings. 2014-01-02 14:21:24 +08:00
James Chen efc7effac5 Adds override keyword for some override methods in gui::Widget class. 2014-01-02 14:20:52 +08:00
samuele3hu f1d94b9b7b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 2014-01-02 12:02:28 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
James Chen fa32569e80 Merge pull request #4776 from pyrasis/develop 
[Win32] Update project files.
 2014-01-01 19:56:29 -08:00
Lee, Jae-Hong c44dea5eb8 [Win32] Update project files. 
- lIbGUI
 2014-01-02 12:49:56 +09:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
minggo 3a1c5e4f6e Merge pull request #4759 from Dhilan007/develop_crash 
fix crash related to not support the z length modifier for size_t on vs
 2014-01-01 18:47:21 -08:00
yinkaile 3f544b8fc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-02 10:40:48 +08:00
子龙山人 8de6cb1981 Merge pull request #6 from cocos2d/develop 
sync original repo
 2014-01-01 18:32:55 -08:00
heliclei e944dae338 update exception catch clause 2014-01-02 10:19:48 +08:00