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

5871 Commits

Author SHA1 Message Date
Trent Millar a12054c00f Adding the VC++2012 template to install-templates-msvc.bat 
Tested against VS2012 RTM.

Note, the .sln location is incorect on all the templates. It needs to
move up relative to the cocos2d-x  folder.
I can look at fixing this later but for now I guess it must have been
left to the user to manually move it.
 2012-09-01 14:32:46 -06:00
trentmillar a42533ebd9 adding VC2012 sln. Also to build-win32.bat 
I changed the ordering in the bat file to process newer VC versions
before older ones. This was an issue for me running multiple versions of
VS on my box
 2012-09-01 11:42:59 -06:00
YuLei c86595ddde [Lua] remove glLineWidth() 2012-09-02 01:18:28 +08:00
YuLei 135f2fdabd remove unused files 2012-09-02 01:13:52 +08:00
YuLei 6f3833af73 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:56:27 +08:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
James Chen 35f6f937c9 Merge pull request #1271 from mustime/testlua 
issue #1425: add NodeTest to TestLua.
 2012-09-01 01:52:42 -07:00
James Chen 45a712e932 Merge pull request #1276 from dumganhar/gles20 
fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla.
 2012-08-31 19:51:43 -07:00
James Chen 382b08a947 fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla . 2012-09-01 10:49:15 +08:00
Rohan Kuruvilla 374232ac88 Adding xcode template for cocos2dx-js 2012-08-31 12:07:58 -07:00
James Chen 1deabca65b Merge pull request #1274 from dumganhar/iss1454_javascript 
issue #1454: fixed bugs in test-particles.js.
 2012-08-31 08:30:46 -07:00
James Chen 8e290cad6e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript 2012-08-31 23:29:02 +08:00
James Chen 94a1aa6123 issue #1454: fixed bugs in test-particles.js. 2012-08-31 23:28:43 +08:00
minggo 362cba4e79 Merge pull request #1273 from minggo/iss1454_javascript 
issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh
 2012-08-31 08:17:56 -07:00
minggo dacf1704fc issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh 2012-08-31 23:16:36 +08:00
James Chen ef272e8ac6 Merge pull request #1272 from dumganhar/iss1454_javascript 
issue #1454: Removed COCOS2D_JAVASCRIPT macro.
 2012-08-31 07:35:02 -07:00
James Chen fde8473415 Merge branch 'iss1454_javascript' of https://github.com/dumganhar/cocos2d-x into iss1454_javascript 2012-08-31 22:33:34 +08:00
James Chen 0f213beae2 issue #1454: Fixed a bug in CCMenuItem::activate. 2012-08-31 22:33:14 +08:00
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 458bb2c343 Moved Default.png to proj.ios, added ForestFire.plist. 2012-08-31 19:51:22 +08:00
James Chen dd8c993581 issue #1454: Removed some duplicated resources files. 2012-08-31 19:50:20 +08:00
James Chen 9d75f33b7e Merge branch 'iss1454_javascript' of https://github.com/minggo/cocos2d-x into iss1454_javascript 2012-08-31 19:33:23 +08:00
mustime 31655bb6ca issue #1425: add NodeTest to TestLua 2012-08-31 18:40:21 +08:00
mustime f5506d58e1 issue #1425: update pkg files and recreate binding 2012-08-31 18:29:44 +08:00
mustime f070864429 issue #1425: add NodeTest to TestLua 2012-08-31 18:26:27 +08:00
mustime 680e189365 issue #1425: update lua script 2012-08-31 18:25:28 +08:00
mustime 1092d04b7c issue #1425: fix "Issue1305" test case in ActionsTest 2012-08-31 18:22:43 +08:00
James Chen 629a033f71 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-31 18:18:49 +08:00
James Chen 7923848f5a Merge pull request #1270 from dumganhar/gles20 
issue #1404: Updated authority for .sh files. Made them can be executable
 2012-08-31 03:18:25 -07:00
James Chen 509abfc34c Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-31 18:16:55 +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 4c3c032ec5 issue #1404: Updated authority for .sh files. Made them can be executable. 2012-08-31 14:54:10 +08:00
James Chen 0c1ab9597c Merge pull request #1267 from John-cdy/gles20 
issue #1404: Add ios and mac os test scripts,update python and shell scr...
 2012-08-30 22:54:35 -07:00
Caidongyang 59934dbb6a issue #1404: Add ios and mac os test scripts,update python and shell scripts. 2012-08-31 13:37:54 +08:00
YuLei 748d64ecc0 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-08-31 09:47:03 +08:00
Martin Sherburn afd8391ca8 Fixed bug where texParams would get lost after reloading textures on android 2012-08-30 20:36:24 +01:00
James Chen 8e0bfe2186 Merge pull request #1264 from edbartley/gles20 
fixed #1452: CCRGBAProtocol must be public in order for actions like CCTintTo to have an affect on the CCScale9Sprite.
 2012-08-30 08:31:01 -07:00
James Chen a76b4280bc Merge pull request #1265 from dumganhar/js 
fixed #1451: Merged new js-binding codes.
 2012-08-30 08:26:31 -07:00
James Chen e2629ef175 Fixed some compile errors on win32. 2012-08-30 23:10:09 +08:00
fish 847ccaff7d CCRGBAProtocol must be public in order for actions like CCTintTo to have an affect on the CCScale9Sprite. 2012-08-30 10:39:36 -04: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
James Chen 413066dfa6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-30 18:34:59 +08:00
James Chen bddd7df779 Merge pull request #1263 from dumganhar/gles20 
Updated android template.
 2012-08-30 03:31:18 -07:00
James Chen 9857337102 Updated android template. 
In eclipse, please using import the created project.
 2012-08-30 18:27:35 +08:00
minggo 85ff7386a6 Merge pull request #1262 from mustime/testlua 
Testlua
 2012-08-30 02:06:55 -07:00
mustime 55a9444186 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua 2012-08-30 16:45:40 +08:00