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

5407 Commits

Author SHA1 Message Date
Walzer 64d6d6ed81 Merge pull request #1314 from walzer/gles20 
config scripts for jenkins-ci, compiling android on mac osx
 2012-09-14 01:44:53 -07:00
Walzer 7c744e785a fixed #1404, tweak back to lower case :) 2012-09-14 16:42:44 +08:00
Walzer bbb37a4d7c issue #1404, case insensitive, oops 2012-09-14 16:41:41 +08:00
Walzer 6fbeacf750 issue #1404, add scripts for ci 2012-09-14 16:33:54 +08:00
Nicolas Gramlich c2a62875cf Added ANDROID_SCRIPTINGCORE_LOAD_SCRIPTS_FROM_EXTERNAL_ASSET_DIRECTORY flag, that allows to load from external assets directory instead of from internal apk assets directory. 2012-09-13 11:13:02 -07:00
Nicolas Gramlich f03c0caaf9 Added proper JNIEXPORT/JNICALL markers to android platform jni bindings. 2012-09-13 09:34:30 -07:00
ebartley 3794542ca0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-13 08:47:07 -04:00
Walzer 150ef1f320 Update cocos2dx/platform/win32/CCEGLView.cpp 2012-09-13 15:53:57 +08:00
Walzer 5718dc1397 fixed #1474, check OpenGL version of win32 
When OpenGL version is too old to run 2dx (<1.5), popup a warning dialog to warn users.
 2012-09-13 15:52:46 +08:00
Walzer 47f51bf7af Update tools/jenkins_scripts/mac/ios/build-ios-all.sh 2012-09-13 14:11:09 +08:00
Walzer 4fd8650b06 Merge pull request #1311 from walzer/gles20 
update jenkins_scripts for build android-ant on windows cygwin
 2012-09-12 20:29:12 -07:00
Walzer de7969afdf update jenkins_scripts for build android-ant on windows cygwin 2012-09-13 11:28:12 +08:00
dualface 4aa74d8f5e [Mac] fix CCLuaLog crash 2012-09-13 10:26:47 +08:00
dualface 9418afacf9 delete CCDirector after call CCDirector::purgeDirector() 2012-09-13 10:26:30 +08:00
James Chen db24bd69f0 Merge pull request #1310 from flaming0/patch-1 
Updated cocos2dx/platform/win32/CCEGLView.cpp, removed '\n' of the end of CCLog in 'CCEGLView::initGL'.
 2012-09-12 18:40:48 -07:00
Nicolas Gramlich 696cdbaa8c Minor build fix due to merge fail. 2012-09-12 16:55:56 -07:00
Nicolas Gramlich 675d0adce5 Merge with gles20-official. 2012-09-12 16:51:01 -07:00
flamingo bb82930789 Update cocos2dx/platform/win32/CCEGLView.cpp 
extra endings in linux logging
 2012-09-12 22:17:56 +04:00
Walzer 63e279e484 Merge pull request #1308 from walzer/gles20 
updage tools/jenkins_scripts
 2012-09-12 03:29:12 -07:00
Walzer ba5f0996ad update tools/jenkins_scripts/ 2012-09-12 18:27:57 +08:00
Walzer 7d13516056 rename JenkinsScript to more comfortable 2012-09-12 16:00:36 +08:00
dualface e1149b0edd Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-11 17:57:27 +08:00
James Chen ef059a8db5 Merge pull request #1305 from dualface/gles20 
fixed #1477: Updated TestLua.
 2012-09-11 02:36:38 -07:00
dualface 3f37d95a0b Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-11 17:35:56 +08:00
YuLei 209e44ff09 [Lua] update HelloLua 2012-09-11 17:31:21 +08:00
YuLei 9de34c4f07 [Lua] remove unused codes 2012-09-11 17:13:45 +08:00
YuLei ab6a476deb update TestLua 2012-09-11 17:13:20 +08:00
James Chen fe5c2f438d Merge pull request #1303 from dualface/gles20 
fixed #1477: Updated CCLuaEngine for new script binding protocol.
 2012-09-11 01:18:08 -07:00
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