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

186 Commits

Author SHA1 Message Date
minggo cdc842051f issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
minggo c034f84b2d fixed #760: implement functions in .cpp 2011-11-25 10:17:32 +08:00
minggo 101f076a44 fixed #760: implement functions in .cpp 2011-11-25 10:13:59 +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 ed42bc388c fixed lua memory leak 2011-08-18 12:26:33 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now. 
Removed unnecessary cocos2d:: prefix inside namespace.
 2011-08-17 17:26:26 +04:00
minggo 09dc164fff issue #645: update to v1.0.1 2011-08-02 15:45:27 +08:00
RongHong 935051a363 set gl perspctive project 2011-07-12 16:04:13 +08:00
minggo 7adb140439 fixed #568 2011-07-05 14:51:17 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
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 a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo fe8fcb0b00 invode lua registerred tick 2011-05-31 14:49:47 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
yangws ec23d7ed55 fixed #508 Dynamic switch retina display support. 2011-05-23 16:21:31 +08:00
Walzer c7fb183dcb [airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now. 2011-05-12 21:58:11 +08:00
yangws 21c8628e68 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 
Conflicts:
	cocos2dx/platform/wophone/CCApplication_wophone.h
	tests/tests/tests.h
 2011-05-10 16:09:26 +08:00
yangws fc01bada97 input from sencond twindow named input view. 
ps: TWindow doesn't support switch.
ps2: TWindow as memory window doesn't support rotate.
 2011-05-09 16:59:26 +08:00
minggo e14040730b fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly 2011-05-06 17:46:19 +08:00
minggo 37bb33d9e5 fixed #452: refactor CCDirector CCNode CCGrid 2011-04-11 15:10:09 +08:00
natural-law e0570d43ad Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful. 2011-01-06 14:04:03 +08:00
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
natural-law 0f0a8ed956 rename the files related to label_nodes. 2010-12-24 14:00:49 +08:00
minggo 87b926c74f match the declaration of cocos2dVersion 2010-12-18 16:08:57 +08:00
natural-law 8cb331994d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +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 fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
Ming 992ad7e75d fix the method of computing frame rate 2010-10-16 07:29:53 +00:00
yangws 2ba7ba409b fixed #184 support deviceOrientation on win32 now. 2010-10-15 08:06:05 +00:00
Ming 0298500abe add setContentScaleFactor() 2010-10-15 07:47:48 +00:00
yangws c1225b9396 fixed #183 run test ok. 2010-10-13 06:46:06 +00:00
yangws 040f68160a issue #176 add test code in test_win32, which same with test_uphone . 2010-10-12 09:15:44 +00:00
Walzer 2a43160d39 fix a warning 2010-10-12 04:07:49 +00:00
Ming 0247182dc3 fixed #173 2010-09-30 07:54:15 +00:00
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +00:00
Ming 300e1abbbb issue #142 2010-09-16 07:53:58 +00:00
natural-law 2c682380ed issue #143 
Clear memory leaks
 2010-09-11 07:48:37 +00:00
Ming 1c0d6b1d31 issue #138 2010-09-10 07:47:10 +00:00
natural-law 8eb885382e issue #130 
Add function to set the resource path
 2010-09-07 08:05:18 +00:00
yangws 4a52e5aaf9 impliment CCXEGLView for uPhone device. 2010-09-06 10:35:24 +00:00
Walzer 5fd1bf85b6 issue #121, return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming d52678bca9 issue #61 2010-09-04 03:36:40 +00:00
Ming 863fc8584a issue #116 2010-09-02 08:58:04 +00:00
Ming 6a4af3bcfd issue #116 2010-09-02 02:33:39 +00:00
Ming ed023fc129 fixed #112 2010-09-01 07:36:25 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
natural-law 6e7fede2bb fixed #103 
add ActionManager Test code
 2010-08-30 07:04:46 +00:00
natural-law 4a42f2d334 issue #78 
add code to show FPS and particle count
 2010-08-25 05:45:28 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Ming 4b34b3a015 fixed #79 2010-08-23 09:29:52 +00:00
Ming 2f638dbe14 issue #55 2010-08-18 06:57:36 +00:00
Ming 950c8cff82 fixed #54 2010-08-17 06:43:00 +00:00
Ming c8ea0e7eb6 fixed #54 2010-08-17 06:25:41 +00:00
natural-law 298768aeec issue #33 
fix little bugs of CCDirector and Actions
 2010-08-11 07:24:15 +00:00
Walzer ffce4ec6b3 issue #18, debug 2010-08-06 05:48:02 +00:00
yangws cde36d0de9 fixed #34 impliment setDeviceOrientation function. 2010-08-05 03:02:30 +00:00
Ming 52982764c8 issue #6: implement setDeviceOrientation() 2010-08-05 02:38:21 +00:00
Ming 5404fd879b issue #6: initialize m_pLastUpdate 2010-08-04 08:50:51 +00:00
Ming 76f62adf62 fixed #30: change some header files to include 2010-08-04 08:45:00 +00:00
Ming 8ab5072885 issue #6: use struct timeval * instead of struct timeval 2010-08-04 08:18:09 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
Ming 2262a122d3 issue #6: use dynamic_cast<> 2010-08-04 03:13:03 +00:00
natural-law b11c03cff3 fixed #27 
fix some bugs of node and director
 2010-08-04 02:36:37 +00:00
Ming 3b2425d8bf issue #6: autorelease pool management 2010-08-02 09:48:01 +00:00
Ming ca3918933b issue #6: initialize default value to m_pobOpenGLView 2010-08-02 09:10:04 +00:00
Ming a2083303e9 issue #6: implement some function 2010-08-02 04:00:06 +00:00
Ming a324e38cb2 issue #21: change INT32 to int, change UINT to unsigned int 2010-08-02 02:58:00 +00:00
yangws de4cb4fcf7 issue #14 add CCXEGLView attach with EGLTouchDelegate 2010-07-28 10:18:27 +00:00
Ming 6115e7b6a1 issue #6: set dispatcher to view 2010-07-28 10:02:36 +00:00
Ming 9c984b8a34 issue #17: fixed link error 2010-07-28 07:16:00 +00:00
yangws fc139bf12a issue #14 change CCXApplication to CCXEGLView, CCDirector compile ok. 2010-07-28 02:15:02 +00:00
Ming b6dd87fb64 issue #6: fix some compile error 2010-07-27 07:49:39 +00:00
Ming 47774f0c77 issue #6: fixed some compile error 2010-07-26 05:53:08 +00:00
Ming da11b924ab issue #6: update CCDirector.cpp, CCDirector.h 2010-07-26 02:00:08 +00:00
Ming a3687c7e37 issue #6: update CCDirector.cpp 2010-07-22 07:56:02 +00:00
Ming 4963bc4223 issue #6: update CCDirector.h, CCDirector.cpp 2010-07-20 06:07:27 +00:00
Ming 56ba688df0 issue #6: update CCDirector.cpp 2010-07-16 06:22:43 +00:00
Ming a82195717d issue #6: update CCDirector.h, add CCDirector.cpp 2010-07-16 06:09:31 +00:00