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

160 Commits

Author SHA1 Message Date
James Chen f5a46d1d23 Merge pull request #1 from minggo/iss1454_javascript 
issue #1454:modify ios project resources
 2012-08-31 07:29:11 -07:00
minggo 1ea039d21d issue #1454:modify ios project resources 2012-08-31 22:23:30 +08:00
James Chen 0d2c2b3bf8 issue #1454: Updated win32 project configuration and some .plist files. 
Removed old binding files.
 2012-08-31 22:01:57 +08:00
James Chen e7e954045a issue #1454: Updated TestJavascript/proj.android/build_native.sh. 2012-08-31 21:30:58 +08:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
James Chen dd8c993581 issue #1454: Removed some duplicated resources files. 2012-08-31 19:50:20 +08:00
minggo 860d3eff4b issue #1454: make js binding work together with lua binding and native codes 2012-08-31 17:55:45 +08:00
James Chen e2629ef175 Fixed some compile errors on win32. 2012-08-30 23:10:09 +08:00
James Chen e584b94728 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js 
Conflicts:
	scripting/javascript/bindings/cocos2d_generated.cpp
 2012-08-30 20:16:54 +08:00
mustime e1db27fb0d issue #1425: add ActionsEaseTest & MotionStreakTest 2012-08-30 16:39:58 +08:00
mustime 2bfa5dfc1e issue #1425: fix a problem when handling touch event 2012-08-30 16:38:16 +08:00
mustime 2961666fbc issue #1425: add MotionStreakTest for TestLua 2012-08-30 15:55:13 +08:00
mustime fc8cba66e0 issue #1425: add ActionsEaseTest to TestLua 2012-08-30 15:35:04 +08:00
mustime 009d15845a issue #1425: update lua script 2012-08-30 15:32:29 +08:00
Rohan Kuruvilla 743478570c Chipmunk support 
* Changing CGPoint to cpVect
 * Fix build and test code
 2012-08-29 16:35:30 -07:00
folecr 4ebafb0ae3 Remove reference to Resources/JS. This code is not used in the test suite. 2012-08-29 15:59:48 -07:00
James Chen 21547fb96f Don't make CCScriptEngineProtocol inherits from CCObject since setScriptEngine is invoked only once in AppDelegate.cpp, 
It will affect the lifecycle of ScriptCore instance, the autorelease pool will be destroyed before destructing ScriptCore.
So a crash will appear on Win32 if you close the game window.
 2012-08-29 14:49:04 -07:00
James Chen a2b5916301 Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'. 
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
 2012-08-29 14:49:03 -07:00
mustime 289eb65dde issue #1425: fix a problem that missing "MainMenu" 2012-08-29 18:16:59 +08:00
mustime c15c96ac28 Merge https://github.com/cocos2d/cocos2d-x into testlua 2012-08-29 17:29:33 +08:00
mustime cc4573c3e4 issue #1425: add ParticleTest to TestLua 2012-08-29 17:17:36 +08:00
mustime df25d56cc3 issue #1425: update pkg for tolua++ binding 2012-08-29 17:10:06 +08:00
folecr 143cd39269 -DCOCOS2D_JAVASCRIPT added to APP_FLAGS in Application.mk. Applied to all files. 2012-08-28 19:07:50 -07:00
folecr 51911d066d Add flags : COCOS2D_JAVASCRIPT and COCOS2D_DEBUG=2 2012-08-28 17:44:01 -07:00
folecr 6f7cb44c62 Build script magic to deal with Image and Fonts on Android. 
* Copy Images/* and Fonts/* into assets
 * Ignore assets/Images and assets/Fonts directories when packaging
 2012-08-28 17:44:01 -07:00
folecr 9fa24f07f5 Excluded *.pvr.gz from packaging 2012-08-28 17:44:00 -07:00
folecr e00240c8aa Rename Resources/JS to Resources/oldjs to avoid conflict with js 2012-08-28 17:44:00 -07:00
folecr ab80fdd908 Add library reference to Cocos Android Java code 2012-08-28 17:44:00 -07:00
folecr a03dc1f7e8 Generate an Android build.xml 2012-08-28 17:44:00 -07:00
folecr 148b67d374 Disable use of chipmunk 2012-08-28 17:44:00 -07:00
folecr 4256dc6830 Update makefiles 2012-08-28 17:43:58 -07:00
folecr 421d60e4f2 Package the js directory 2012-08-28 17:43:57 -07:00
folecr f09bddd0f7 Add refernence to chipmunk static library 2012-08-28 17:43:56 -07:00
folecr 7017f772b2 Remove editor backup file 2012-08-28 17:43:56 -07:00
minggo f0068209f3 Merge pull request #1252 from mustime/testlua 
issue #1425: add EffectTest to TestLua
 2012-08-28 01:05:50 -07:00
mustime 22cf904038 issue #1425: add EffectTest to TestLua 2012-08-28 15:44:09 +08:00
minggo ff34cb7b39 issue #1425: add icons for testlua 2012-08-28 14:34:22 +08:00
minggo 76410f4b5b Merge pull request #1248 from mustime/testlua 
Testlua
 2012-08-27 23:18:22 -07:00
mustime f63a719981 issue #1425: fix the problem that missing Resources path 2012-08-28 14:14:09 +08:00
mustime 8ec843785c issue #1425: change the title from "HelloLua" to "TestLua" 2012-08-28 11:56:23 +08:00
mustime 4237ec42be issue #1425: add ios project for TestLua 2012-08-28 11:49:22 +08:00
mustime 9afede2474 issue #1425: update lua files 2012-08-28 11:48:34 +08:00
mustime 567f4b15aa issue #1425: fix a problem when searching lua files on ios project 2012-08-28 11:47:06 +08:00
Rohan Kuruvilla 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
minggo d1f92b8da4 Merge pull request #1239 from mustime/testlua 
Testlua
 2012-08-27 02:45:29 -07:00
James Chen ef906cd2ba Merge pull request #1247 from dumganhar/gles20 
Updated Makefiles for linux port.
 2012-08-27 01:45:26 -07:00
James Chen dd26a2fcd8 Updated Makefiles for linux port. 2012-08-27 16:43:02 +08:00
minggo 0e81fd0568 fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC 2012-08-27 16:11:07 +08:00
mustime c0c3222238 issue #1425: fix a typo error 2012-08-27 15:42:19 +08:00
mustime fa3ec83eec issue #1425: fix a problem when copying files to assets 2012-08-27 15:35:25 +08:00