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

24 Commits

Author SHA1 Message Date
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo 83e1e0ebd1 tests run ok when it don't enable lua 2011-06-01 20:29:05 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
Walzer 2cceeb5c39 Merge remote branch 'origin/master' 2011-04-27 22:46:38 +08:00
Walzer fa43292250 ccTouchDeletateAllBit -> ccTouchDelegateAllBit. I met this typo 3 days ago, then miss it. Thanks to Isaac Ashdown. 2011-04-27 22:45:54 +08:00
yangws e895d9d073 TextInputTest compile ok on android and merge last master code. 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input

Conflicts:
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/platform/android/Cocos2dJni.cpp
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	tests/test.ios/test.xcodeproj/project.pbxproj
	tests/test.win32/test.win32.vcproj
 2011-04-26 18:04:07 +08:00
Walzer f7b294fe24 fixed #467 CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time, which makes an error logic if adding standard touch delegate when CCTouchDispatcher::m_tLock = ture 2011-04-24 15:38:03 +08:00
yangws d11bd85d00 CCTextFieldTTF works on win32. 2011-04-19 09:32:33 +08:00
minggo 22b55eaf78 issue #418: add copyright of original author to each file 2011-03-19 10:59:01 +08:00
minggo 7c52a521fa fixed #403: change UIEvent to CCEvent 2011-03-18 09:39:34 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
yangws 804dc4ef7c Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/win32/CCXBitmapDC.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
 2011-01-19 15:29:08 +08:00
yangws 67c0ad6332 add platform support project on win32. 
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
 2011-01-15 18:05:35 +08:00
natural-law 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer 8633fa5d9e issue #171 2010-09-29 08:33:52 +00:00
Walzer d93aae9133 issue #171, add annotate for protected member variable 2010-09-29 04:03:21 +00:00
Walzer dad659641b issue #171, add @brief in class annotate 2010-09-29 01:44:57 +00:00
Ming 9a12e848f5 fixed #118 2010-09-03 01:32:13 +00:00
Ming 60adec78e8 issue #85: avoid virtual inheriting from NSObject, and remove the using of dynamic_cast() 2010-08-27 06:13:32 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00