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

3549 Commits

Author SHA1 Message Date
minggo 39738e4270 issue #1056: implement ActionsProgressTest and run ok on win32 2012-03-19 18:20:32 +08:00
minggo 68809fd5ed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-19 13:54:34 +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 303818ef6d issue #1056: Update CCGLProgram. 2012-03-15 10:54:07 +08:00
James Chen 9e89171557 issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class. 2012-03-15 10:42:22 +08:00
minggo 41fad74017 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-03-15 10:05:42 +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 8aa3f7f9ae issue #1056: TestCases works ok except Box2dTest and ChipmunkTest. 2012-03-14 18:11:25 +08:00
James Chen b8d760064d issue #1056: Add CCVertex.h CCVertex.cpp, implement CCMotionStreak. 2012-03-14 16:10:01 +08:00
minggo b7862393ba Merge pull request #770 from folecr/fixtexturetest 
Fix test to match newer API
 2012-03-14 00:20:46 -07: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
folecr 6336df4024 Fix test to match newer API 2012-03-13 23:07:42 -07:00
minggo 287e4c2845 Merge pull request #761 from peoronoob/linux 
fixed #1051:Fixed and improved building on Linux
 2012-03-12 19:44:51 -07: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 cc7542a86b Merge pull request #766 from assoulter/master 
Fix m_nEntryID typo
 2012-03-11 20:06:24 -07:00
minggo 9f6cc73b31 Merge pull request #767 from minggo/iss737_remove_viewid 
fixed #737: remove view id
 2012-03-11 20:02:10 -07:00
minggo 7fc0ffbf26 fixed #737: remove view id 2012-03-12 11:00:12 +08:00
Anton Rusanov 8e53d9db9f fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG 2012-03-12 00:59:03 +04:00
minggo a0d30b5d1b Merge pull request #760 from Wartortle/iOSSim_Accelerometer 
fixed #1033: Added support files for Accelerometer Simulation for iPhone Simulator an...
 2012-03-08 17:46:40 -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 7dfe4224e1 Merge pull request #756 from dualface/fix-lua-engine-bugs 
fixed #1030: Improve Lua engine
 2012-03-07 21:42:35 -08:00
minggo e9c1e43e27 Merge pull request #755 from dumganhar/iss1022_string_with_file 
fixed #1022: Added a static method named CCString::stringWithContentsOfFile.
 2012-03-07 21:39:59 -08:00
minggo 88cbdcb1ea Merge pull request #759 from minggo/iss737_remove_viewid 
fixed #737: remove view id
 2012-03-07 21:38:08 -08:00
minggo 645d561276 fixed #737: remove view id 2012-03-08 12:40:27 +08:00
Liao YuLei 5b98cf8539 remove exception catch from CCLuaEngine::executeFunctionByHandler() 2012-03-08 10:57:03 +08:00
minggo ebce8a9ac9 Merge pull request #758 from minggo/iss1028_makefile 
fixed #1028: correct directory name
 2012-03-07 18:10:30 -08:00
minggo bfa8b65cc5 fixed #1028: correct directory name 2012-03-08 10:09:17 +08:00
Liao YuLei c6c7fb1be6 Improve Lua engine 
rename executeFunctionByRefId() to executeFunctionByHandler()

add executeFunctionWithCCObject()
add pushIntegerToLuaStack()
add pushFloatToLuaStack()
add pushBooleanToLuaStack()
add pushCCObjectToLuaStack()
 2012-03-07 20:27:26 +08:00
James Chen c91fd243dc Update cocos2dx/include/CCString.h 2012-03-07 16:15:26 +08:00
James Chen 2564f39eb8 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1022_string_with_file 2012-03-07 16:13:16 +08:00
James Chen 00745ae172 fixed #1022: add the comment for CCString::stringWithContentsOfFile. 2012-03-07 16:12:46 +08:00
minggo 344f2f8649 Merge pull request #753 from minggo/iss1020_vs_template 
fixed #1020: make vs template support lua
 2012-03-06 23:06:15 -08:00
minggo 5623f5fb58 fixed #1020: make vs template support lua 2012-03-07 15:03:35 +08:00
minggo 837da31d59 Merge pull request #752 from minggo/iss721_cocosdenshion 
fixed #721: cocosdenshion can play local  file on android
 2012-03-06 00:58:51 -08:00
minggo 7890333505 fixed #721: cocosdenshion can play local file on android 2012-03-06 16:56:30 +08:00
minggo 36dfec2633 Merge pull request #751 from minggo/iss1017_win32_timing 
fixed #1017: improve win32 timing accuracy
 2012-03-05 22:14:58 -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
minggo 65d6af2724 Merge pull request #750 from minggo/iss1014_resource_path 
fixed #1014: correct resources path in build_win32.bat
 2012-03-05 17:46:43 -08:00
minggo ad0fbad405 fixed #1014: correct resources path in build_win32.bat 2012-03-06 09:45:42 +08:00
minggo d4d65bd532 Merge pull request #749 from minggo/iss1009_typo_error 
fixed #1009: fix a typo error
 2012-03-05 17:42:25 -08:00
minggo ed68855e19 fixed #1009: fix a typo error 2012-03-06 09:35:36 +08:00
James Chen 3f08fa368d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into string_with_file 2012-03-05 11:20:16 +08:00
James Chen fd9dd6c7fe add stringWithContentsOfFile static method in CCString class. 2012-03-05 11:13:45 +08:00