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

20100 Commits

Author SHA1 Message Date
cocoscodeide d15ff34cbf Merge pull request #21 from cocos2d/v3 
Merge pull request #6791 from cocoscodeide/v3
 2014-05-17 20:58:56 +08:00
bofeng-song 14298dce6a Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-17 20:57:50 +08:00
cocoscodeide 231cf5f99a Merge pull request #20 from chuanweizhang2013/v3luaruntime 
fixed mac relaunch bug
 2014-05-17 19:40:45 +08:00
cw c7591511f7 fixed version num 2014-05-17 19:38:15 +08:00
cw 150125f411 fixed mac relaunch bug 2014-05-17 19:11:12 +08:00
zifter d875f27c67 Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst 
Conflicts:
	cocos/ui/UIListView.h
	cocos/ui/UIPageView.h
 2014-05-17 10:40:36 +03:00
James Chen eb457a1c91 Merge pull request #6791 from cocoscodeide/v3 
fixed head search path for  template
 2014-05-17 14:46:04 +08:00
cocoscodeide d38ee1bd0f Merge pull request #19 from chuanweizhang2013/v3luaruntime 
fixed head search path
 2014-05-17 14:42:36 +08:00
cw 8db2882431 fixed head search path 2014-05-17 14:41:03 +08:00
cocoscodeide 04923098cb Merge pull request #18 from cocos2d/v3 
update lua
 2014-05-17 14:09:48 +08:00
James Chen f7f09306ca [ci skip] Travis ci status url fix 2014-05-17 13:14:48 +08:00
James Chen 9eba2e6cfa Update CHANGELOG [ci skip] 2014-05-17 12:18:44 +08:00
James Chen 7da07342fe Merge pull request #6734 from 2youyouo2/v3 
fixed no effect with stopping tween between two frames
 2014-05-17 12:17:34 +08:00
James Chen ca6234e11a Merge pull request #6790 from dumganhar/download-fix 
Updates download-deps.py for execute this python where not in the root of cocos2d-x.
 2014-05-17 12:04:35 +08:00
James Chen eca1243e2e Updates download-deps.py for execute this python where not in the root of cocos2d-x. 2014-05-17 12:03:04 +08:00
James Chen 95149a45e0 Merge pull request #6789 from cocoscodeide/v3 
update template project vect
 2014-05-17 11:44:02 +08:00
cocoscodeide 5132bce493 Merge pull request #17 from chuanweizhang2013/v3luaruntime 
modify vec2
 2014-05-17 11:42:32 +08:00
cw 84e9cd3a77 modify vec2 2014-05-17 11:35:57 +08:00
bofeng-song 6a8712482c fix build error 2014-05-17 11:30:07 +08:00
James Chen ee4ec94a82 Merge pull request #6788 from CocosRobot/update_lua_bindings_1400296789 
[AUTO]: updating luabinding automatically
 2014-05-17 11:21:45 +08:00
CocosRobot 844cc9bcef [AUTO]: updating luabinding automatically 2014-05-17 03:20:49 +00:00
James Chen d5a03b5aca Merge pull request #6787 from dumganhar/v3 
Updates the config files for luabindings.
 2014-05-17 11:16:46 +08:00
James Chen 2344053936 Updates the config files for luabindings. 2014-05-17 11:15:43 +08:00
Ricardo Quesada 2ad1e997f3 Merge pull request #6786 from CocosRobot/update_cocosfiles_1400289505 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-16 19:26:06 -07:00
cocoscodeide 5d11c586e2 Merge pull request #16 from cocos2d/v3 
update cocos2d-x
 2014-05-17 09:51:17 +08:00
CocosRobot 45d923e259 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-17 01:18:27 +00:00
Ricardo Quesada 97cae73a5b Merge pull request #6785 from ricardoquesada/ooops_android_fixes 
Fixes android build issues
 2014-05-16 18:17:03 -07:00
Ricardo Quesada ef700f2e3a Fixes android build issues 
also restores file for VS
 2014-05-16 18:16:20 -07:00
Ricardo Quesada 4ad0980a19 Merge pull request #6784 from ricardoquesada/wp8_fixes_squash 
Fixes for WP8
 2014-05-16 17:40:16 -07:00
Ricardo Quesada a1243ca9ed Squashed commit of the following: 
commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:37:58 2014 -0700

    little fixes in project

commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:33:11 2014 -0700

    CopyTemplates working

commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 17:22:05 2014 -0700

    Re-adds CopyTemplate to VS solution

commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 16:40:22 2014 -0700

    Updated shaders

    and project fixes
 2014-05-16 17:38:52 -07:00
Ricardo Quesada d19de29bec Merge pull request #6783 from CocosRobot/update_cocosfiles_1400276389 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-16 14:45:50 -07:00
CocosRobot b36d503812 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-16 21:39:50 +00:00
Ricardo Quesada 688025017c Merge pull request #6782 from ricardoquesada/files_squash 
Directory structure: fixes
 2014-05-16 14:38:01 -07:00
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
Ricardo Quesada 6837cea2e6 Merge pull request #6781 from dabingnn/v3_work 
V3 work
 2014-05-16 11:04:49 -07:00
Huabing.Xu 38b4e7ad2c fix memory leak for GLProgramState create logic 2014-05-16 11:02:23 -07:00
James Chen 511295e88a Merge pull request #6779 from jonseg/cpp-template-error 
Vector2 replaced by Vec2 in cpp-template
 2014-05-16 22:23:33 +08:00
Jon Segador 64fa90ff0f Vector2 replaced by Vec2 2014-05-16 16:21:36 +02:00
minggo ef3263e80d [ci skip] 2014-05-16 22:09:30 +08:00
minggo 67a1027a34 [ci skip] 2014-05-16 22:05:26 +08:00
minggo d67a27808f Merge pull request #6774 from Mazyod/v3-mac-secure-input 
V3 mac secure input
 2014-05-16 22:03:34 +08:00
minggo e3f2c3985d Merge pull request #6777 from boyu0/physics_rollback_for_lua 
Roll back lua PhysicsTest.
 2014-05-16 21:55:52 +08:00
minggo 540418840b Merge pull request #6737 from seobyeongky/dispatcher_bug_fix 
EventDispatcher bug fix
 2014-05-16 18:35:51 +08:00
minggo bf2250a67a Merge pull request #6738 from cocoscodeide/v3 
update template project lua
 2014-05-16 18:10:10 +08:00
bofeng-song 6dd7f2d630 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-16 17:19:36 +08:00
boyu0 74335a92f7 Roll back lua PhysicsTest. 2014-05-16 17:19:02 +08:00
minggo 64002e5a2a [ci skip] 2014-05-16 17:14:33 +08:00
minggo 39c76d8a9e [ci skip] 2014-05-16 17:13:17 +08:00
James Chen cd402ea6c7 Merge pull request #6776 from CocosRobot/update_cocosfiles_1400229820 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-16 17:11:40 +08:00
minggo eb38809630 Merge pull request #6756 from zifter/FixTwiceCallingOnExit 
Fix twice calling on exit
 2014-05-16 17:10:42 +08:00