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

5429 Commits

Author SHA1 Message Date
YuLei 214d4e7623 [Lua] remove CCLuaEngine::purgeDefaultEngine() 2012-09-11 16:11:42 +08:00
YuLei 400af95093 restore CCDirector 2012-09-11 16:07:56 +08:00
YuLei e1600b0977 delete CCDirector after call CCDirector::purgeDirector() 2012-09-11 15:49:10 +08:00
YuLei fc3a55a065 [Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h 2012-09-11 15:44:33 +08:00
YuLei a2259ab0dd [Lua] update CCLuaEngine for new script binding protocol 2012-09-11 15:24:25 +08:00
James Chen df4df05b04 Merge pull request #1302 from dumganhar/dualface-lua 
fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
 2012-09-10 23:06:40 -07:00
James Chen b6e4c98334 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua 2012-09-11 14:03:33 +08:00
James Chen 7d8b261ced fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions. 2012-09-11 14:02:33 +08:00
James Chen 2572823b1a Merge pull request #1301 from folecr/fix_android_module_location 
fixed #1476: Update location of spidermonkey-android makefile.
 2012-09-10 18:53:02 -07:00
minggo 951d5b4e59 Merge pull request #1299 from moadib/handle_window_close_on_linux 
Handle window close on linux
 2012-09-10 18:34:21 -07:00
folecr 991d63eaad Update location of spidermonkey-android makefile 2012-09-10 16:12:48 -07:00
Walzer 5146ea8bfa Merge pull request #1300 from walzer/gles20 
fixed #1475, use vector::insert instead of vector::clear + assign in CCHttpClient::writeData, to prevent losing data
 2012-09-10 08:20:18 -07:00
Walzer 0cd3552ef7 fixed #1475, use vector::insert instead of vector::clear + assign in CCHttpClient::writeData, to prevent losing data 2012-09-10 23:17:16 +08:00
Ed Bartley c67412618d Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 
Conflicts:
	extensions/GUI/CCScrollView/CCScrollView.cpp
 2012-09-10 10:50:30 -04:00
Ed Bartley 01103c4cb1 Remove optimization of the mac debug build 2012-09-10 10:48:34 -04:00
moadib 97a11c0e06 Handle window close event on Linux platform 2012-09-10 17:53:33 +04:00
moadib fc2f8c5b0a Merge remote-tracking branch 'upstream/gles20' into gles20 2012-09-10 17:51:15 +04:00
Walzer 07f82af35e Merge pull request #1298 from walzer/gles20 
remove the duplicated SimpleGame
 2012-09-10 04:01:22 -07:00
Walzer 4212b73c5f remove the duplicated SimpleGame 
sorry I made a mistake in the last evening.
 2012-09-10 19:00:25 +08:00
James Chen ae320b5f9c stage sth. 2012-09-10 18:38:18 +08:00
James Chen 2f51246bbd Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua 2012-09-10 17:01:00 +08:00
James Chen 6a1aae95aa Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua 
Conflicts:
	cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj
 2012-09-10 17:00:22 +08:00
YuLei 8fa431fe0a [Mac] remove CCEGLView::purgeSharedOpenGLView() 2012-09-10 16:50:45 +08:00
James Chen 130f055e5c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-10 16:16:37 +08:00
Walzer b1572beb0b fixed #1453, fix a typo in platform/ios/CCGL.h 
#include <OPenGLES/ES2/glext.h> is fixed to #include <OpenGLES/ES2/glext.h>
 2012-09-10 15:05:56 +08:00
James Chen c9ca584726 Merge pull request #1297 from dumganhar/tableview-win32 
fixed #1458: Adding CCTableView support.
 2012-09-09 23:52:18 -07:00
James Chen c9e1aa7adc fixed #1458: Updated TestCpp Makefile for linux port. 2012-09-10 14:50:19 +08:00
James Chen a6acd90c29 fixed #1458: Updated copyright information for some files which are relative to CCTableView. 2012-09-10 14:13:55 +08:00
James Chen 6f3ee0299a issue #1458: Updated vs2010 project configuration. 2012-09-10 14:05:44 +08:00
James Chen 1460f4e42f issue #1458: Updated project configuration for all platforms. 
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
 2012-09-10 13:39:12 +08:00
YuLei 1254d08d5c [Lua] fix: HelloLua 2012-09-10 12:23:45 +08:00
YuLei d4128975f6 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-10 11:42:56 +08:00
Walzer f924e36216 Merge pull request #1296 from walzer/Cocos2dSimpleGame 
Cocos2dSimpleGame is back
 2012-09-09 19:24:33 -07:00
James Chen 554b1709c3 issue #1458: Adding CCScrollView::updateInset. 2012-09-09 22:46:31 +08:00
James Chen bf45edeed5 Reverted one line code. 2012-09-09 22:37:32 +08:00
James Chen 6719841b13 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into tableview-gles20 2012-09-09 22:34:53 +08:00
James Chen d9cc8fa346 issue #1458: Adding CCTableView support. Updated win32 project configuration. 2012-09-09 22:34:32 +08:00
Walzer 11b5ae5cef add proj.android to samples/SimpleGame, use getVisibleSize & getVisibleOrigin instead of getWinSize 2012-09-09 21:41:48 +08:00
Walzer 7e4615cd7b upgrade Cocos2dSimpleGame to v2.0.2 framework, add it into samples folder 2012-09-09 20:20:29 +08:00
Walzer 5a687f5273 Merge pull request #1295 from walzer/gles20 
Gles20
 2012-09-09 03:26:35 -07:00
Walzer 816c1b4362 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-09 18:25:36 +08:00
Walzer 7c4ad685e5 add comment for a potential bug in HttpClient.cpp 2012-09-09 18:25:02 +08:00
minggo cc1d030794 Merge pull request #1294 from trentmillar/gles20 
Change 2012 solution version number.
 2012-09-09 00:56:29 -07:00
Nicolas Gramlich 4c7705171a Android JAVA refactoring. Android JNI Cleanup. 2012-09-07 17:23:04 -07:00
ebartley f027c4a9f7 Merge branch 'gles20' of https://github.com/FlowerpotGames/cocos2d-x into gles20 2012-09-07 15:01:52 -04:00
ebartley 5deeb3f8fa Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors. 2012-09-07 15:00:21 -04:00
Ed Bartley a392b17182 MAC project is missing the header search path to /include 2012-09-07 13:14:22 -04:00
YuLei 58ea948cc8 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-07 19:21:15 +08:00
YuLei a22122d0ed [Lua] fix: CCCallFunc : public CCActionInstant declare typo error 2012-09-07 19:19:50 +08:00
minggo 23e5c69616 Merge pull request #1280 from Yodesoft/gles20 
Supported display Unicode chars.
 2012-09-07 01:12:05 -07:00