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

3020 Commits

Author SHA1 Message Date
minggo cc79e533a3 issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
Phenix Yu 255293119d add tolua_usertype(tolua_S,"void*") to fix CCCallFuncND 2011-11-15 17:01:07 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
minggo 5273819e83 offer a thread safe function to read contents of xml file, and the engine use it internal 2011-11-15 10:41:18 +08:00
dumganhar 0fa48e2cfb Update cocos2dx/platform/CCPlatformMacros.h 2011-11-14 11:35:04 +08:00
dumganhar 7cb27a76ae modify accelerometer and Platform Functions 2011-11-13 22:45:41 +08:00
dumganhar d346fa8650 close debug draw 2011-11-13 01:22:05 +08:00
dumganhar d8de253542 add messagebox support 2011-11-13 01:13:25 +08:00
dumganhar 5704fdc146 Merge branch 'testMP_static_lib' into newest 2011-11-13 01:05:22 +08:00
dumganhar ae8737cf7e comment some log 2011-11-13 00:57:54 +08:00
dumganhar 25ab866557 when CCTextureAtlas::resizeCapacity, should 
glDeleteBuffers(2, m_pBuffersVBO);
// initial binding
glGenBuffers(2, &m_pBuffersVBO[0]);
otherwise, CCSpriteBatchNode will have a bug the can't draw more than one sprite on bada 2.0 device.
 2011-11-13 00:57:05 +08:00
dumganhar ea3b57ea2c modify multi touch support 2011-11-13 00:54:44 +08:00
dumganhar 8fd2917888 fixed a bug that Accelerometer value error if use HVGA resource in WVGA device 2011-11-13 00:54:05 +08:00
minggo 47b7419a1e Merge pull request #569 from leon-li/master 
Install correct (64 bit or 32 bit) fmod libs to /usr/local/lib on Linux
 2011-11-11 02:17:44 -08:00
dumganhar 2abe0c0d32 CCAssert will show system messagebox, this easy for debuging code. 2011-11-10 16:49:05 +08:00
dumganhar 4e924986a2 add static lib project 2011-11-10 16:47:17 +08:00
dumganhar ca3b91855a debug issue #852 2011-11-10 16:44:58 +08:00
YuLei Liao 0873f049cb * update LuaCocos2d.cpp/.h 2011-11-09 23:24:57 +08:00
YuLei Liao 0f93cbf219 * update tolua++ .pkg files 
+ add bulid_macosx.xml
+ add basic.lua
 2011-11-09 23:23:47 +08:00
YuLei Liao 4b8e39e77b - delete unused tolua++ .pkg files 2011-11-09 23:18:32 +08:00
Walzer dcb4f14a5b According to this thread, http://www.cocos2d-x.org/boards/6/topics/5075?r=5177, we must prevent yOffset to become a negative value. I use the laziest approach. 2011-11-09 22:11:36 +08:00
Leon 83fcf18fcc install correct fmod libs to /usr/local/lib 2011-11-09 18:47:14 +08:00
dumganhar 33db1c7951 use unix text format 2011-11-08 18:11:43 +08:00
dumganhar a81b078286 fixed a bug in calloc(0) return NULL. 2011-11-08 15:59:51 +08:00
dumganhar 920b41271d add TextInput support 2011-11-08 15:59:04 +08:00
dumganhar 0d6ea61b76 fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof 2011-11-07 18:18:10 +08:00
dumganhar 3b48a69d01 remove setResourcePath method 2011-11-07 14:19:46 +08:00
dumganhar 7d2a26ec10 comment some applog 2011-11-07 00:28:09 +08:00
dumganhar 16fba505b6 add multitouch support 2011-11-05 11:36:27 +08:00
minggo 95c9529b0b Merge pull request #567 from leon-li/master 
fixed #780:Fix compile error under ubuntu 11.10
 2011-11-01 23:56:09 -07:00
minggo d4da0a0bbc Merge pull request #568 from reflog/patch-1 
Update AUTHORS
 2011-11-01 18:36:09 -07:00
dumganhar 2998726364 revert language 2011-11-02 01:23:07 +08:00
dumganhar e9a2818d0d use wvga setting, add SYSTEM_SERVICE 2011-11-02 01:11:06 +08:00
dumganhar 240aa4c077 add russian language support 2011-11-01 23:32:26 +08:00
dumganhar cf3cecc108 revert to normal version 2011-11-01 23:02:26 +08:00
Eli Yukelzon 132a4cf7ef Update AUTHORS 2011-11-01 13:43:52 +02:00
dumganhar cff6437b76 revert to normal ccLanguageType 2011-11-01 17:12:39 +08:00
Leon 8ea6df0ee3 Merge remote-tracking branch 'upstream/master' 2011-10-31 23:58:24 -07:00
Leon 785b79d263 fix compile errors under ubuntu 11.10 2011-10-31 23:50:08 -07:00
minggo 209a25e549 Merge pull request #556 from leon-li/master 
Fix compile error on 64 bit Linux.  Fix some warnings.
 2011-10-31 21:49:01 -07:00
dumganhar 6bdf46cb00 fixed a bug in sort.c 2011-11-01 11:32:46 +08:00
YuLei Liao ce0b17adec Merge remote-tracking branch 'upstream/master' 2011-10-31 23:16:28 +08:00
dumganhar f43530c010 Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada 
Conflicts:
	CocosDenshion/proj.bada/sdk1.0/.cproject
	CocosDenshion/proj.bada/sdk2.0/.cproject
	cocos2dx/platform/bada/CCApplication_bada.cpp
 2011-10-31 09:34:40 +08:00
dumganhar 853126036d add ogg source for cocosDenshion project 2011-10-29 15:38:15 +08:00
dumganhar fd90641c49 merge testf branch 2011-10-29 14:47:13 +08:00
dumganhar 8562bca706 Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada 2011-10-29 14:22:41 +08:00
Walzer 3227e64240 add CC_PROPERTY_READONLY_PASS_BY_REF & CC_PROPERTY_PASS_BY_REF marco into preprocessor of doxygen configs. 2011-10-28 23:25:17 +08:00
Leon 59939218f5 add 64 bit fmodex for Linux 2011-10-28 15:43:44 +08:00
Leon b7f0385a2b bundle 64 bit linux static libs 2011-10-28 12:19:26 +08:00