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

427 Commits

Author SHA1 Message Date
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 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
samuele3hu ee4e5e4800 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-14 14:45:15 +08:00
samuele3hu 534ad2aafb fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value 2014-05-14 14:43:10 +08:00
Nite Luo fca0ec696f Undo project file changes 2014-05-12 23:32:19 -07:00
Nite Luo 7d8cfc4cca set parent transform dirty when addChild 2014-05-12 23:28:20 -07:00
Nite Luo e1f82c174b add TestCase for reparentChildren bug 2014-05-12 22:50:31 -07:00
Dale Stammen 5c5b0184ab updated winrt shader compiler app to latest version 2014-05-12 09:23:48 -07:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode 
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
 2014-05-12 17:57:25 +08:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
James Chen a61b1097db issue #4660: Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String 2014-05-10 19:24:03 +08:00
James Chen e84ccc8914 issue #4660: Updates Xcode project 2014-05-10 19:24:03 +08:00
Ricardo Quesada 77c03fcf11 ShaderCache -> GLProgramCache 2014-05-09 18:39:25 -07:00
Ricardo Quesada fec1b82c0a Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00
Trace 0b8aed3536 Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-09 11:51:00 -07:00
Trace 88f1d8ac4e Add ShaderTest sample and shader code 2014-05-09 11:48:11 -07:00
Ricardo Quesada 6727c6d19c Adds missing files to xcode 2014-05-09 11:45:12 -07:00
Ricardo Quesada 78dd92a7ef Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-09 11:40:13 -07:00
andyque d12a71f738 issue #5057, refactor UILayoutDefine 2014-05-09 17:16:11 +08:00
andyque c5a505ec4c issue #5057, Merge branch 'v3' into refactor5057 
Conflicts:
	cocos/ui/CocosGUI.h
 2014-05-09 15:39:02 +08:00
yangxiao 95e036dd1b GLProgramStateCache 2014-05-08 21:54:49 -07:00
Dhilan007 c904fff9eb update XCode project.pbxproj 2014-05-09 11:37:14 +08:00
Ricardo Quesada 62d9c24518 moves shaders files from 2d/ to renderer/ 2014-05-08 18:01:48 -07:00
Ricardo Quesada 51f498fc94 fixed deprecation warnings 2014-05-08 16:42:36 -07:00
Ricardo Quesada 453b670ad2 Removes CCVertexAttribBind 2014-05-08 14:01:26 -07:00
Ricardo Quesada 087378926f Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-08 10:16:09 -07:00
Dhilan007 52d7d804f7 Update XCode project.pbxproj for add files related to VideoWidget. 2014-05-08 18:28:28 +08:00
andyque 0c2fd977ea issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of 
Widget and also simplify the enum value
 2014-05-08 18:10:21 +08:00
minggo 9f0e25d808 Merge pull request #6628 from andyque/refactor5056 
refactor 5056. pull gui tests from ExtensionTest to UITest
 2014-05-08 17:00:38 +08:00
James Chen bea98a1416 Lua xcode project fix 2014-05-08 15:09:02 +08:00
andyque 898a66131a issue #5056. move gui test from ExtensionsTest to the outside 2014-05-08 14:35:45 +08:00
Ricardo Quesada b401f6adc1 Lots of new code 
Adds GLProgramState
 2014-05-07 20:20:19 -07:00
yangxiao bbd4533c5e Improves GLProgram 
Adds vetex attrib bind class
 2014-05-06 11:03:24 -07:00
andyque cb5b2a4f85 issue #4861, Merge branch 'v3' into focus3861 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-05-05 17:40:28 +08:00
James Chen 67b2fbf14b Updates xcode project, add ccs-res folder to Resources folder 2014-05-05 15:24:33 +08:00
James Chen d82e03b048 Xcode project fix 2014-05-05 13:31:38 +08:00
andyque a7fbd590dc issue #4861. add a horizontal focus test 2014-05-05 11:37:39 +08:00
andyque 47acbc24e0 issue #4861, add CCEventFocus and CCEventListener 2014-05-05 11:37:38 +08:00
James Chen 530efbca7e Reverts files for winrt project 2014-05-05 01:33:22 +08:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00
Ricardo Quesada 81c2d92355 yeah... love in includes 
<3
 2014-04-26 10:35:57 -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
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 2014-04-25 16:20:24 +08:00
James Chen 037c57ef96 Merge branch 'develop' into perf-callback 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-25 12:07:48 +08:00
James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-04-25 10:59:11 +08:00
James Chen 7beb8b78fe Merge pull request #6325 from MSOpenTech/wp8-3.0-update 
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
 2014-04-25 10:41:58 +08:00
Huabing.Xu 7a38050e09 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-21 17:47:34 +08:00
Huabing.Xu 68e058b12d IOS/Mac OK: remove kazMath 
Make code compatible with old tests
 2014-04-21 17:37:52 +08:00