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

5428 Commits

Author SHA1 Message Date
mustime 6ac99e687b issue #1425: fix a error when designating the Resources path 2012-08-27 15:09:27 +08:00
James Chen 6681cf74ef Merge pull request #1243 from dumganhar/gles20 
Resource file searching implementation for blackberry port.
 2012-08-26 22:54:51 -07:00
James Chen 28150573c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-27 13:48:55 +08:00
James Chen 7ccb720104 Resource file searching implementation for blackberry. 
Updated the package names of blackberry samples.
 2012-08-27 13:48:17 +08:00
mustime be116f5352 issue #1425: update TestLua project 2012-08-27 11:43:47 +08:00
minggo c7d365ca1c Merge pull request #1231 from donaldalanmorrison/gles20 
Gles20
 2012-08-26 20:17:40 -07:00
minggo b3b00a5ccd Merge pull request #1230 from John-cdy/gles20 
issue #1404:Modify some parameters in script files for windows.
 2012-08-26 20:04:51 -07:00
minggo 8f7e1c4fb1 Merge pull request #1242 from minggo/gles20 
fix a bug in android template
 2012-08-26 19:53:27 -07:00
minggo c1d6edc7ad fix a bug in android template 2012-08-27 10:50:55 +08:00
minggo 6e2b718243 Merge pull request #1241 from minggo/gles20 
add NULL as the last parameter to prevent crashing when creating CCSequence
 2012-08-26 19:48:36 -07:00
minggo a80c282844 add NULL as the last parameter to prevent crashing when creating CCSequence 2012-08-27 10:47:32 +08:00
James Chen 19589a3579 Merge pull request #1240 from dumganhar/gles20 
fixed some warnings in java codes for android port.
 2012-08-26 19:32:24 -07:00
mustime f641602e6e issue #1425: update vs10 proj configuration for TestLua 2012-08-27 10:23:05 +08:00
James Chen 1eb0d8bfd6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-27 10:22:05 +08:00
James Chen 3d0b5bf455 fixed some warnings in java codes for android port. 2012-08-27 10:21:43 +08:00
mustime 7f55980259 issue #1425: add copy commands to copy Resources to android/assets 2012-08-27 10:12:33 +08:00
mustime 6cc4eb8878 issue #1425: remove copying Resources files commands in VS10 2012-08-27 10:04:30 +08:00
mustime 1b70d8193f Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 
Conflicts:
	samples/TestLua/proj.win32/TestLua.win32.vcxproj
 2012-08-27 10:00:00 +08:00
YuLei a38b8d4a00 [Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function 
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
 2012-08-25 17:08:33 +08:00
YuLei 64bf35a00a Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-08-25 15:06:20 +08:00
YuLei 8b54355aa1 [Lua] update luabinding 
[Lua] add LuaValue, LuaDict, LuaArray
 2012-08-25 15:05:59 +08:00
Donald Alan Morrison 5075a83271 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/kazmath/src/ray2.c
 2012-08-25 00:00:27 -07:00
Donald Alan Morrison 857608495c Plugged CoreFoundation memory leaks identified by Static Analyzer. 2012-08-24 23:34:20 -07:00
YuLei bf3ce7cf76 [Lua] update Lua to 5.1.5 2012-08-25 14:32:06 +08:00
Donald Alan Morrison 9f1899978e Fixed potential memory leak identified by Static Analyzer. 2012-08-24 21:39:41 -07:00
Donald Alan Morrison e4f6e48bf5 Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 12:01:26 -07:00
Donald Alan Morrison 3eb3ebc67a Fixed VS2010 Warning C4800: 'void *' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 11:20:23 -07:00
Donald Alan Morrison ee9f3d09a8 Fixed VS2010 Warning C4334: '<<' : result of 32-bit shift implicitly 
converted to 64 bits.
 2012-08-24 09:22:02 -07:00
Donald Alan Morrison 2b4bab18af Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 09:00:57 -07:00
Donald Alan Morrison 9ef8b3b699 Fixed Warning C4114: same type qualifier used more than once. (Definition 
signature does not match Implementation signature.)
 2012-08-24 08:52:29 -07:00
Donald Alan Morrison eaf0e71e57 Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 08:35:48 -07:00
James Chen 94af6928f2 Merge pull request #1238 from dumganhar/gles20 
Some commits for blackberry port.
[1] Updated create-qnx-project.sh. Made it works ok under OSX and Linux system.
[2] Renamed create-qnx-project.sh(.vbs) to create-blackberry-project.sh(.vbs).
 2012-08-24 07:47:34 -07:00
James Chen 2af86897b0 Renamed create-qnx-project.sh(.vbs) to create-blackberry-project.sh(.vbs). 2012-08-24 22:40:05 +08:00
James Chen 92e702ca8a Updated create-qnx-project.sh. Made it works ok under OSX and Linux system. 2012-08-24 22:34:01 +08:00
James Chen 66ecdbfe6b Merge pull request #1237 from dumganhar/gles20 
Updated vs2010 project configuration for TestLua.
 2012-08-24 03:43:03 -07:00
James Chen 1a5dd4fbb0 Updated vs2010 project configuration for TestLua. 2012-08-24 18:42:03 +08:00
James Chen b2df641305 Merge pull request #1236 from dumganhar/gles20 
Added vs2008 project for TestLua.
 2012-08-24 03:28:53 -07:00
James Chen 86d1d457a1 Added vs2008 project for TestLua. 2012-08-24 18:27:47 +08:00
James Chen 3f1884935f Merge pull request #1235 from dumganhar/gles20 
[WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath.
 2012-08-24 03:04:52 -07:00
James Chen 6c4bdc238f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 18:02:34 +08:00
James Chen 2eeca6f000 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-08-24 18:02:00 +08:00
James Chen 369eb3daa3 [WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath. 2012-08-24 18:01:16 +08:00
minggo cb93713433 Merge pull request #1234 from minggo/gles20 
use absolute path in CCFileUtils
 2012-08-24 02:58:33 -07:00
minggo bcd691ad9f use absolute path in CCFileUtils 2012-08-24 17:55:29 +08:00
James Chen bf2cd46a16 Merge pull request #1233 from dumganhar/gles20 
Updated create-qnx-project.sh.
 2012-08-24 01:46:34 -07:00
James Chen e07e0214f0 Updated create-qnx-project.sh. 2012-08-24 16:43:30 +08:00
Donald Alan Morrison 5ba3ff4d9a Fixed VS2010 Warning C4065: switch statement contains 'default' but no 'case' labels. 2012-08-24 01:33:28 -07:00
James Chen 8d55bae974 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 16:12:03 +08:00
minggo cf1d61f3de Merge pull request #1232 from minggo/gles20 
fix compiling error of linux
 2012-08-24 01:09:37 -07:00
James Chen 087341b316 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-24 16:03:14 +08:00