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

19069 Commits

Author SHA1 Message Date
samuele3hu 689ce612f4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error 2014-04-29 14:39:50 +08:00
samuele3hu ae488e5afa Replace `vec2s` with `points` 2014-04-29 14:39:19 +08:00
minggo c0f1c604b2 Merge pull request #6508 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-04-29 12:00:57 +08:00
zhangbin 9ad5acec7c Update the reference of submodule cocos2d-console. 2014-04-29 11:56:50 +08:00
James Chen e3d195184c Merge pull request #6503 from shujunqiao/cocos-console-apk 
[ci skip], modify android apk name in cocos-console-test.py.
 2014-04-28 17:17:23 +08:00
shujunqiao 8ac1545686 [ci skip], modify android apk name in cocos-console-test.py. 2014-04-28 16:55:21 +08:00
samuele3hu 84c1f9281e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error 2014-04-28 16:28:44 +08:00
samuele3hu d729a161a4 Add some deprecated functions and replace the Point related to Vector2 2014-04-28 16:28:15 +08:00
James Chen 698b52093e Merge pull request #6396 from natural-law/FuzzyMatch 
Support fuzzy matching in the create project configuration.
 2014-04-28 15:47:56 +08:00
James Chen 493383967a Merge pull request #6401 from CocosRobot/update_lua_bindings_1398668464 
[AUTO]: updating luabinding automatically
 2014-04-28 15:27:01 +08:00
CocosRobot 78a7c98b26 [AUTO]: updating luabinding automatically 2014-04-28 07:01:59 +00:00
James Chen 55b355009a Merge pull request #6400 from lmskater/check-pr-title 
[Jenkins][ci skip] Check pull request title to skip build
 2014-04-28 15:00:37 +08:00
James Chen e96883ec43 Merge pull request #6394 from samuele3hu/dev_compile_error 
Fix compile error for Lua
 2014-04-28 14:57:48 +08:00
James Chen 35207fd8ba Merge pull request #6399 from dumganhar/v3 
fullPathForFilename optimization: Checking whether the path is an empty string.
 2014-04-28 14:56:01 +08:00
lm b2a414a660 [Jenkins][ci skip] Check pull request title to skip build 2014-04-28 14:54:29 +08:00
James Chen 4f41b9d3ac fullPathForFilename optimization: Checking whether the path is an empty string. 2014-04-28 14:53:30 +08:00
James Chen 0f62be5562 Merge pull request #6398 from lmskater/fix-check-queue-build-error 
[Jenkins][ci skip] Catch exception in check_queue_build
 2014-04-28 14:40:09 +08:00
lm d2c091edda [Jenkins][ci skip] Catch exception in check_queue_build 2014-04-28 14:34:34 +08:00
James Chen 818586342b Merge pull request #6395 from natural-law/develop 
Update the reference of submodule plugin-x.
 2014-04-28 14:20:51 +08:00
zhangbin 0eaf8cc38d Support fuzzy matching in the create project configuration. 2014-04-28 14:16:19 +08:00
James Chen 9b3f456f80 Merge pull request #6393 from Dhilan007/v3 
template work on wp8 now
 2014-04-28 14:08:06 +08:00
samuele3hu c3f40bdc24 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error 2014-04-28 14:05:08 +08:00
Dhilan007 698657a6ab template work on wp8 now 2014-04-28 14:04:52 +08:00
samuele3hu d3670644bf Fix compile error for Lua 2014-04-28 14:04:37 +08:00
James Chen c76b87f9be Merge pull request #6369 from natural-law/develop 
Update the reference of submodule plugin-x.
 2014-04-28 13:54:44 +08:00
James Chen 8538b27385 Merge pull request #6391 from dabingnn/v3_optimize 
V3 optimize
 2014-04-28 13:39:15 +08:00
Huabing.Xu e6f7854225 clean for kazmath in project file 2014-04-28 13:14:22 +08:00
James Chen 6e0ee08d84 Merge pull request #6390 from Dhilan007/v3 
fixed compile fail on wp8
 2014-04-28 11:59:06 +08:00
Dhilan007 b4a9381238 fixed return type is not right 2014-04-28 11:55:45 +08:00
Dhilan007 35f83fc40a fixed compile fail 2014-04-28 11:42:54 +08:00
James Chen 7c38f5a74d Merge pull request #6388 from dumganhar/travis-ci-build-fix 
'develop' -> 'v3' branch for travis ci.
 2014-04-28 11:29:19 +08:00
James Chen 1634ae30c5 'develop' -> 'v3' branch for travis ci. 2014-04-28 11:28:03 +08:00
Huabing.Xu 62fbf3ff7c template for linux cpp 2014-04-28 11:24:58 +08:00
Huabing.Xu aa3859eddb template work on IOS/Mac now 2014-04-28 11:10:55 +08:00
James Chen aa04176d83 Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip 
fixed the clipping of ui layout read from CocoStudio could not work
 2014-04-28 11:08:40 +08:00
James Chen ede1a8bed1 Merge pull request #6385 from lmskater/change-develop-to-v3 
[Jenkins][ci skip] Fix branch to v3 v2
 2014-04-28 10:49:31 +08:00
lm 575a7c988b [Jenkins][ci skip] Fix branch to v3 v2 2014-04-28 10:45:55 +08:00
James Chen 8e9b84517b Update .travis.yml, Travis ci only builds 'v3' branch 2014-04-28 10:20:42 +08:00
pipu c492f4d3c3 fixed ui layout clip 2014-04-28 10:06:11 +08:00
James Chen cbcf2e2bc8 Merge pull request #6384 from dabingnn/v3_optimize 
change tab to space for CCDirector.cpp
 2014-04-28 09:54:43 +08:00
Huabing.Xu 64d7a6bd37 change tab to space 2014-04-28 09:51:10 +08:00
Ricardo Quesada 0133551f43 Merge pull request #6380 from ricardoquesada/compiles_on_linux 
compiles on linux
 2014-04-26 10:42:32 -07:00
Ricardo Quesada d0ebc14076 compiles on linux 2014-04-26 10:41:57 -07:00
Ricardo Quesada e14c76f584 Merge pull request #6379 from ricardoquesada/more_love_in_includes 
yeah... love in includes
 2014-04-26 10:36:44 -07:00
Ricardo Quesada 81c2d92355 yeah... love in includes 
<3
 2014-04-26 10:35:57 -07:00
Ricardo Quesada a1d20bfb7e Merge pull request #6378 from ricardoquesada/include_fixes_squash 
Squashed commit of the following:
 2014-04-26 10:12:06 -07:00
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
Ricardo Quesada 3253018869 Merge pull request #6371 from dabingnn/develop_migrate_math_lib 
Develop migrate math lib
 2014-04-25 23:34:43 -07:00
Ricardo Quesada b053a9145a Compiles on Windows32 2014-04-25 22:03:25 -07:00
Ricardo Quesada 0860455724 Updates CHANGELOG 2014-04-25 19:01:04 -07:00