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

6161 Commits

Author SHA1 Message Date
minggo 33529afc07 Merge pull request #1592 from fape/luaCocos2d 
fix compile: rename kOrientation to kCCTransitionOrientation
 2012-11-19 17:36:25 -08:00
minggo 93821be7e4 Merge pull request #1599 from folecr/androidlinkerfix 
cc_utf8_strlen is used in Android native code; should not be static
 2012-11-19 17:33:54 -08:00
folecr 03d9a04608 cc_utf8_strlen is used in Android native code; should not be static 2012-11-19 15:57:16 -08:00
folecr f111602adf Don't generate JS bindings for CCTimer::getSelector 2012-11-19 15:56:11 -08:00
Rolando Abarca d9baa8a24d fixes merge conflict 2012-11-19 11:23:08 -08:00
James Chen c3e02f3e52 Merge pull request #1597 from dumganhar/iss1555-update 
issue #1555: Updated ActionsTest.cpp, enabled point size in DrawPrimitivesTest.cpp.
 2012-11-19 02:15:22 -08:00
James Chen af36ada6e4 issue #1555: Enabled point size in DrawPrimitivesTest.cpp. 2012-11-19 17:16:45 +08:00
James Chen 18d583153b setUniformLocationwithMatrix4fv ~> setUniformLocationWithMatrix4fv 2012-11-19 17:16:06 +08:00
James Chen 5734a2d9bc issue #1555: Updated ActionsTest.cpp 2012-11-19 17:15:16 +08:00
minggo 0b5a86bf42 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1562-label-test 2012-11-19 16:29:00 +08:00
minggo 38232e4eb5 issue #1562:update TileMapTest 2012-11-19 16:28:37 +08:00
minggo 2d191befe0 Merge pull request #1596 from minggo/iss1562-label-test 
fix a memory leak in CCLabelBMFont
 2012-11-19 00:10:36 -08:00
minggo 9dc5302b4b fixed #1562:fix a memory leak in CCLabelBMFont 2012-11-19 16:08:18 +08:00
James Chen 776567726f Merge pull request #1578 from thbourlove/patch-1 
fixed #1566 :Tolua++ will regard the 'cocos2d-2' as package name, but which you want is 'Cocos2d'(input file root name).
 2012-11-18 23:00:51 -08:00
James Chen eac78bb521 Merge pull request #1595 from dumganhar/iss1565-remove-2008 
fixed #1565: Removed VS2008 support.
 2012-11-18 22:45:09 -08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
minggo 4cd124ab9f Merge pull request #1594 from minggo/iss1564-update-tests 
update MenuTest
 2012-11-18 21:59:42 -08:00
minggo 29fc9a6af7 issue #1564:update MenuTest 2012-11-19 13:57:54 +08:00
minggo 8d109b8e1d Merge pull request #1593 from minggo/iss1560-menu-touch 
fix a logical error in CCNode::schedule()
 2012-11-18 19:25:25 -08:00
minggo fb5b7ed7bb fixed #1560:fix a logical error in CCNode::schedule() 2012-11-19 11:24:03 +08:00
fape 355d8df79e fix compile: rename kOrientation to kCCTransitionOrientation 2012-11-17 19:02:04 +01:00
James Chen 8de6d310bf Merge pull request #1591 from fape/marmalade_paths 
issue #1557: [Marmalade]The S3E data dir ONLY used by the emulator/simulator.
 2012-11-17 05:40:10 -08:00
fape 30b026421e The S3E data dir ONLY used by the emulator/simulator. 2012-11-17 13:49:01 +01:00
James Chen db2175e41c Merge pull request #1582 from guanqun/build-fixes 
two simple build fixes
 2012-11-17 02:13:22 -08:00
Rolando Abarca ac539667f4 Merge remote-tracking branch 'origin/gles20' into gles20 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
	scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp
 2012-11-16 09:44:34 -08:00
James Chen b892993a83 Merge pull request #1587 from mrmop/gles20 
fixed #1559: If file in resource directory doesn't exist, it will not search the root directory.
 2012-11-16 04:56:59 -08:00
James Chen b799cf3575 Merge pull request #1588 from dumganhar/iss1555-update 
issue #1555: Minor fixes for jsbinding projects.
 2012-11-16 03:40:18 -08:00
James Chen 0223c0d70a issue #1555: Minor fixes. 2012-11-16 19:38:25 +08:00
James Chen 38fae6e4e7 Merge pull request #1586 from dumganhar/iss1555-update 
issue #1555: Fixed coordinate conversion errors.
 2012-11-16 02:57:51 -08:00
Mat Hopwood fcb265088d Rssource path root change 
fullPathFromRelativePath will now search root if file is not found in
path
 2012-11-16 10:56:11 +00:00
James Chen 18273e06e3 issue #1555: Fixed coordinate conversion errors. 
It needs to be based on 'Design Resolution Size' rather than 'Frame Size'
Please refer to the implementations of CCDirector::convertToGL and CCDirector::convertToUI.
 2012-11-16 18:55:57 +08:00
James Chen 26b31b0672 Merge pull request #1585 from dumganhar/iss1555-update 
issue #1555: Fixed some compilation errors for marmalade and blackberry ports.
 2012-11-16 02:19:54 -08:00
James Chen df6a50a23a issue #1555: Fixed some compilation error for marmalade and blackberry ports. 2012-11-16 18:13:55 +08:00
minggo 7f6e1b54ae Merge pull request #1584 from minggo/iss1555-update 
update to cocos2d-iphone v2.1 beta3
 2012-11-16 01:29:51 -08:00
minggo 08dedfe9af Merge pull request #3 from dumganhar/iss1555-update 
issue #1555: Made win32 works ok.
 2012-11-16 01:19:13 -08:00
James Chen c5b5b978fa issue #1555: Made win32 works ok. 2012-11-16 17:08:34 +08:00
James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 
Conflicts:
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
 2012-11-16 16:21:16 +08:00
minggo 9f8769a0e2 Merge pull request #1583 from dumganhar/iss1530-js-improvements 
Merged PR #1579
 2012-11-16 00:17:59 -08:00
James Chen b95ff53747 Updated cocos2dx.ini. 2012-11-16 16:00:25 +08:00
James Chen 892cb6b352 issue #1530: Using GCC4.2 compiler to build debug version of JSBinding projects since there is an unknown 'vm_protect' crash by using llvm. 2012-11-16 15:58:22 +08:00
James Chen 682faa5870 issue #1530: Don't export CCUserDefault to js since it has a private constructor. Do it in the future. 2012-11-16 15:58:21 +08:00
James Chen ee1a5a461d issue #1530: Updated cocos2d-js-test to the latest version. 2012-11-16 15:58:21 +08:00
James Chen 34f359384c issue #1530: Minor fixes in ScriptingCore.cpp, js_bindings_chipmunk_auto_classes.cpp and js_bindings_chipmunk_funcitons.cpp. 2012-11-16 15:58:20 +08:00
James Chen def0cc8c39 issue #1530: Updated TestJavascript. 2012-11-16 15:58:20 +08:00
James Chen c2d8d118bf issue #1530: Updated MoonWarriors. 2012-11-16 15:58:19 +08:00
James Chen 7557a78e05 issue #1530: Defined a macro 'snprintf' since it's named '_snprintf' on win32. 2012-11-16 15:58:19 +08:00
James Chen bb6df91749 issue #1530: Exported CCUserDefault to js. 2012-11-16 15:58:18 +08:00
James Chen da7f3f2969 issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports. 2012-11-16 15:56:51 +08:00
Rohan Kuruvilla 7381abffb3 Updating template for cocos2d-x JS 2012-11-16 15:56:31 +08:00
Rohan Kuruvilla 7305442803 Updating MoonWarriors project with new chipmunk bindings 2012-11-16 15:56:30 +08:00