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

875 Commits

Author SHA1 Message Date
James Chen 321771a7ea issue #1056: Added gles2.0 support for ios platform. 2012-03-21 10:05:23 +08:00
minggo 382e4e7eb8 issue #1056: modify code according new code after pull 2012-03-20 17:27:06 +08:00
minggo 7ccb38556e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20 2012-03-20 16:10:53 +08:00
minggo 74aaf4c6ca issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
James Chen ae2b3307fa Merge pull request #779 from dumganhar/iss1056_CCDict 
issue #1056: Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
 2012-03-20 00:07:58 -07:00
James Chen 6ce06bd906 issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
James Chen f67ac20639 Merge pull request #775 from dumganhar/gles20-dev 
issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files.
 2012-03-16 02:59:21 -07:00
James Chen e021ae9821 #1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files. 2012-03-16 17:56:19 +08:00
James Chen 86a1acc0d8 Merge pull request #774 from dumganhar/gles20-dev 
issue #1056: synchronise cocos2d-iphone-2.0-rc0a
 2012-03-15 22:45:20 -07:00
James Chen 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
James Chen 673a1ca238 Merge pull request #771 from dumganhar/gles20-dev 
issue #1056: TestCases works ok except Box2dTest and ChipmunkTest.
 2012-03-14 03:15:38 -07:00
James Chen b8d760064d issue #1056: Add CCVertex.h CCVertex.cpp, implement CCMotionStreak. 2012-03-14 16:10:01 +08:00
James Chen d0f93d38f4 Merge pull request #769 from dumganhar/gles20-dev 
issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
 2012-03-14 00:00:57 -07:00
James Chen aefdb852a2 issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
Paolo Giangrandi 4f2f403827 Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp 2012-03-12 14:22:48 +01:00
Paolo Giangrandi 7820be7841 Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h} 2012-03-12 14:22:39 +01:00
James Chen bd59979495 add gles2.0 libraries for win32. 
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
 2012-03-12 15:22:03 +08:00
minggo 7fc0ffbf26 fixed #737: remove view id 2012-03-12 11:00:12 +08:00
Wartortle 7321d33aaf Added support files for Accelerometer Simulation for iPhone Simulator and 
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
 2012-03-08 11:23:47 +00:00
minggo 645d561276 fixed #737: remove view id 2012-03-08 12:40:27 +08:00
minggo a0f0971782 fixed #1017: improve win32 timing accuracy 2012-03-06 14:12:57 +08:00
James Chen 74b4b14ee3 Merge pull request #730 from moadib/qnx_eventhandler 
Added CCEGLView::EventHandler class for qnx-platform
Added window group id for qnx-version of CCEGLView
 2012-03-05 18:07:20 -08:00
James Chen cb1f94df47 revert CCFileUtils::getFileData method. 2012-03-05 09:55:50 +08:00
James Chen 347a8294ac fixed #1007: Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData. 2012-03-03 12:24:02 +08:00
minggo 796ba89e9d Merge pull request #742 from minggo/iss762_label_position 
compute correct text rect and display it on center
 2012-03-01 22:24:04 -08:00
minggo 2360a9a04e fixed #762: let zfont display on center 2012-03-02 14:22:01 +08:00
minggo 5485eb19d9 fixed #762: compute correct text rect and display it on center 2012-03-02 14:17:22 +08:00
minggo 79495fd743 Merge pull request #741 from minggo/master 
remove libiconv.a
 2012-03-01 19:28:35 -08:00
minggo c196f2dff2 issue #983: remove libiconv.a 2012-03-02 11:25:35 +08:00
minggo 528a769cf6 fixed #762: make label display on center on iOS 2012-03-02 11:15:44 +08:00
James Chen dfd5adb3bd fixed #994: add support for bbndk2.0 on blackberry platform. 2012-03-01 16:52:17 +08:00
James Chen 05bf647ec3 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib 2012-02-28 15:00:18 +08:00
James Chen 2bc48219f8 remove libjpeg, libpng, libz project, use them as sources in cocos2dx project. 2012-02-27 18:18:40 +08:00
moadib de9f8dc441 Added window group id for qnx-version of CCEGLView 2012-02-24 08:40:35 +04:00
moadib 7fcdb3b114 Added CCEGLView::EventHandler class for qnx-platform 2012-02-22 12:27:13 +04:00
minggo b0b6b85a79 fixed #946: HD image for both retina and normal 2012-02-16 10:47:16 +08:00
James Chen a2a5af3348 update bada and qnx project settings 2012-02-15 13:52:41 +08:00
James Chen 2ef7b5d413 refactor folders for qnx 2012-02-15 11:26:28 +08:00
James Chen abbda72b2f modify bada 2.0 project setting 2012-02-14 23:31:37 +08:00
James Chen dac63dd2c2 rename include file name from uppercase to lowercase for linux platform 2012-02-14 22:41:33 +08:00
James Chen 3422696145 1.modify some project setting for bada 
2.rename some files
 2012-02-14 22:35:51 +08:00
minggo 5ce4968524 merge from cocos2d-x master 2012-02-10 10:46:58 +08:00
minggo 95906c34bf Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor 2012-02-09 16:14:54 +08:00
minggo 153d2b8192 issue #971: build cocos2dx as static lib and remove some unneeded codes 2012-02-09 15:49:14 +08:00
minggo 29c18c67ca Merge pull request #712 from minggo/ndk_module 
Use modules in the Android NDK build
 2012-02-06 22:36:45 -08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +08:00
minggo 8770976884 Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module 2012-02-07 10:48:07 +08:00
Wartortle aa06de2fb3 Second half of commit for adding Accelerometer simulation to Win32. 2012-02-06 11:38:53 +00:00
Wartortle ffc4457991 On Win32 platform, there's now support for simulating the Accelerometer 
using the up/down/left/right/comma/period keys.
 2012-02-06 11:29:28 +00:00
YuLei Liao 4fe0c10e10 merge upstream/master 2012-02-06 10:54:51 +08:00