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

6673 Commits

Author SHA1 Message Date
James Chen 4d919465a5 issue #1640: Updated the submodule reference of cocos2d-js-tests. 2013-01-05 18:54:49 +08:00
James Chen 266e6e8acc fixed #1641: The coins in Watermelon Me fail to animate in cocos2d-x JS binding. 2013-01-05 18:54:08 +08:00
minggo 7a1f445bff issue #1639:set visible to correct value 2013-01-05 18:35:11 +08:00
James Chen 8a21f4fa3c issue #1640: Added some files to iOS Project. 2013-01-05 17:41:19 +08:00
James Chen 421cf31b34 issue #1640: Updated jsbinding for CCPhysicsSprite . 2013-01-05 15:09:19 +08:00
James Chen 4d9d6c6c4c Updated the submodule reference of cocos2d-js-tests. 2013-01-05 14:05:13 +08:00
James Chen 4bd15af2a2 issue #1640: Updated js files for jsbindings 2013-01-05 13:58:56 +08:00
walzer f291ffedad Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-05 11:18:55 +08:00
James Chen 77eac0eb5f Merge pull request #1819 from dumganhar/gles20 
fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.
Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
 2013-01-04 19:13:28 -08:00
James Chen 9ef74bef80 fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more. 
Added platform macro for CCEditBoxImpl* files.
 2013-01-05 11:10:24 +08:00
James Chen 7bcbcfa187 fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp. 2013-01-05 10:56:57 +08:00
Jozef Prídavok 2635843c11 Added EditBox implementation for Mac OSX. 2013-01-04 13:16:03 +01:00
minggo ffd0ca6c0e Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility 
[luabinding] fix CCAssert Lua compatibility
 2013-01-03 23:51:47 -08:00
minggo 4bcc352379 Update AUTHORS 2013-01-04 11:33:38 +08:00
minggo 539bb56256 Merge pull request #1799 from tks2shimizu/gles20 
Added CCFloat, CCDouble and CCBool
 2013-01-03 19:32:35 -08:00
James Chen 3263d06830 Merge pull request #1814 from fape/marmalade_simplegame 
fixed #1631: Making SimpleGame force landscape for Marmalade.
 2013-01-03 19:07:41 -08:00
James Chen ec72701414 Merge pull request #1815 from fape/marmalade_testlua 
Marmalade TestLua postbuild script
 2013-01-03 18:53:47 -08:00
James Chen 00bab65350 Merge pull request #1816 from dumganhar/iss-bb-rm-skia 
Merged PR #1810
Removing grskia dependancy and adding in freetype support to the builds.
 2013-01-03 18:18:25 -08:00
James Chen f6b57a9b92 Removing grskia dependancy and adding in freetype support to the builds. 2013-01-04 10:16:18 +08:00
James Chen f95d1677df Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry 2013-01-04 09:52:01 +08:00
James Chen 437ed36bd6 Updated the project configuration for HelloCpp and HelloLua. 2013-01-04 09:51:08 +08:00
fape 94471a06b6 rename and add commandline argument to cccopy.py 2013-01-03 20:52:22 +01:00
fape e34f190f36 add SimpleGame Marmalade config files 2013-01-03 15:20:58 +01:00
fape f3f67f62e1 .gitignores moved 2013-01-03 15:16:11 +01:00
fape 3c89bf1d83 marmalade TestLua: add postbuild script to copy resources 2013-01-03 14:47:57 +01:00
James Chen 90960cce57 Merge pull request #1813 from dumganhar/gles20 
Fixed a compilation error for android.
 2013-01-03 04:00:54 -08:00
James Chen b50bf716a2 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-03 19:58:10 +08:00
James Chen 760a8c1d39 fix a compilation error for android. 2013-01-03 19:56:34 +08:00
James Chen 94e779ae63 Merge pull request #1806 from fape/marmalade_third_party_cleanup 
fixed #1629: Marmalade third party cleanup.
 2013-01-02 21:24:44 -08:00
Dale Ducharme 611db78b39 Removing grskia dependancy and adding in freetype support to the builds. 2013-01-02 18:53:31 -05:00
James Chen 57906b368e Merge pull request #1808 from wanbin/gles20 
fixed #1603: The script of creating android project has a wrong file path.
 2012-12-31 21:36:09 -08:00
wanbin 986f332b29 create android project has a error file path 2013-01-01 13:18:10 +08:00
fape 29a2f273b1 reorganize third party libs 2012-12-29 23:56:14 +01:00
fape 4421b6bf7a remove unused libs 2012-12-29 23:53:39 +01:00
dualface e74e597dba [luabinding] fix CCAssert Lua compatibility 2012-12-30 02:27:25 +08:00
James Chen 0ee9cf027b Merge pull request #1803 from dumganhar/iss1627-vs2012 
fixed #1627: VS version check in project file.
 2012-12-28 22:54:04 -08:00
James Chen d2ad820a48 fixed #1627: Adding view name for sample applications. 2012-12-29 14:50:00 +08:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
James Chen b5c08c9e1c Merge pull request #1802 from dualface/lua_add_ccdirector_setdisplaystats 
fixed #1626: [luabinding] added CCDirector::setDisplayStats().
 2012-12-28 19:36:32 -08:00
James Chen b120874a87 fix compilation errors. 2012-12-29 11:23:31 +08:00
dualface d1e39a9c00 [luabinding] add CCDirector::setDisplayStats() 2012-12-29 11:16:07 +08:00
Tomoaki Shimizu 1293c8a6c2 added licence 2012-12-29 11:32:27 +09:00
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 2012-12-29 09:48:22 +08:00
Tomoaki Shimizu b4edd167af The variable name was changed.The check of pRet was added. 2012-12-28 12:24:28 +09:00
Tomoaki Shimizu 87146d82e1 Added CCFloat, CCDouble and CCBool 2012-12-27 23:15:13 +09:00
James Chen 771b99a6b7 Merge pull request #1798 from dumganhar/gles20 
Compilation warning fix for CCAssert macro.
 2012-12-27 00:49:34 -08:00
James Chen f159df2e13 Compilation warning fix for CCAssert macro. 2012-12-27 16:48:02 +08:00
minggo 4cdc984b0e Merge pull request #1797 from dumganhar/gles20 
fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest.
 2012-12-27 00:10:53 -08:00
James Chen b62d254f63 fixed #1597: Added return pointer check. 2012-12-27 16:07:48 +08:00
James Chen ac7755e68b fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest 2012-12-27 15:42:55 +08:00