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

6280 Commits

Author SHA1 Message Date
minggo bfa78a8d73 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1555-update 2012-11-12 11:02:30 +08:00
minggo 3eb2e7cd85 Update AUTHORS 2012-11-12 10:57:53 +08:00
minggo d4aeb8076c Merge pull request #1562 from mingulov/apk 
Android: Access to files from APK is boosted
 2012-11-11 18:55:03 -08:00
James Chen 336b0ae724 Merge pull request #1567 from dumganhar/iss1557-marmalade 
fixed #1557: Marmalade support (merge PR #1481)
 2012-11-11 18:47:10 -08:00
James Chen b5b0e289eb fixed #1557: set the window size of TestCpp for marmalade port. 2012-11-12 10:46:26 +08:00
James Chen ceced09c2d CCLuaEngine::executeAccelerometerEvent return 0 by default. 2012-11-12 10:37:42 +08:00
James Chen 833b5b1be8 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 
Conflicts:
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/sprite_nodes/CCSprite.cpp
	samples/TestCpp/Classes/TouchesTest/Ball.cpp
	samples/TestCpp/Classes/VisibleRect.cpp
	samples/TestCpp/Classes/VisibleRect.h
 2012-11-12 10:20:04 +08:00
Denis Mingulov 869168a884 ZipFile - speedup initialization for zip archive by 30-50% 
unzip.h/.cpp - unzGoToFirstFile/unzGoToNextFile retrieves information
about the current file, so it is possible to remove redundant calls
to unzGetCurrentFileInfo and speed up general execution.

unzip.h/.cpp are modified accordingly by creation unzGoToFirstFile64
and unzGoToNextFile64 with file info (unz_file_info64) and name as
possible output parameters.

ZipFile::setFilter (it is used to create a file list at ZipFile
constructor) - redundant calls to unzGetCurrentFileInfo64 are removed,
so briefly the time required to generate a zip file list is something
like 1 average old unzLocateFile call.
 2012-11-11 15:04:41 +02:00
Denis Mingulov eaed42c8bd Zip support: broken CRC check / unzCloseCurrentFile 
A fix for changes at 75ae8d2201
- unzOpenCurrentFile3 has set pfile_in_zip_read_info->crc32_wait
just in case if Zip file has unknown structure / might not be
unpacked, so almost any unpacked file was considered as having
UNZ_CRCERROR.
 2012-11-11 10:22:48 +02:00
minggo ac363576a9 issue #1555:add CCPyhsicsDebugNode 2012-11-09 17:52:12 +08:00
Denis Mingulov 83cf8aaf29 Android: Access to files from APK is boosted - 1st review update 2012-11-09 09:53:40 +02:00
minggo d2a5723973 issue #1555:add CCDrawNode 2012-11-09 12:08:18 +08:00
James Chen ff6c304a13 Merge pull request #1564 from CocosRobot/updategeneratedsubmodule_1352386390 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-08 06:56:20 -08:00
CocosRobot cfd84b3fe6 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-08 22:53:19 +08:00
Denis Mingulov 071d264cc5 Android: Access to files from APK is boosted 
Open APK file just once and cache a file list information (name and
position inside archive). Also a general ZipFile helper class is
created to read multiple files from Zip archives - might be used
for another platforms if needed.

Previously it was so for each separate file access operation:
- Open zip archive, initially parse its structure (unzOpen)
- Locate the particular file there by a linear search through
  full archive (unzLocateFile).
  So if file does not exist - still an archive has to be handled
  fully, even slower than a file exists.
- Read file.
- Close zip archive

After this commit:
- Once - open zip/apk file and collect file list information
  (average consumed time - the same like a search for 2 different
  files by unzLocateFile)
- When needed - directly retrieve file position inside the archive,
  setting it up to the zip reader and reading file

ZipFile class is located in support/zip_support/ZipUtils.h and .cpp
to prevent creation of a new files and adding them to multiple
project files.
 2012-11-08 13:46:53 +02:00
minggo 6159a8b592 issue #1555:add CCClippingNode 2012-11-08 17:55:25 +08:00
James Chen 5649502b25 Merge pull request #1561 from dumganhar/gles20 
Redirected cocos2d-html5-tests to cocos2d-js-tests
 2012-11-08 00:09:08 -08:00
James Chen 81aff37457 Redirected cocos2d-html5-tests to cocos2d-js-tests 2012-11-08 16:06:32 +08:00
minggo 168cde4099 Merge pull request #1560 from dumganhar/iss1556-particle 
fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc.
 2012-11-07 22:18:31 -08:00
James Chen 6d1a7e089b fixed #1556: Removed CCParticleFire::create(const char* pListFile) since particle can be constructed from plist by CCParticleSystemQuad::create(plist). 2012-11-08 12:55:32 +08:00
James Chen 4d48e79d47 fixed #1556: Added a newline at the end of firePngData.h file. 2012-11-08 12:06:02 +08:00
James Chen 4a37c8fa8b fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc. 
Added some static constructors.
 2012-11-08 12:03:49 +08:00
Walzer ea1a8b1b19 add Win 8 Metro and WP8 description into readme 2012-11-08 10:59:05 +08:00
minggo 908cc5e2bd Merge pull request #1559 from minggo/iss1545-not-use-macro 
fixed #1545:remove the usage of CREATE_FUNC
 2012-11-07 18:51:04 -08:00
minggo 4efdbca23b fixed #1545:remove the usage of CREATE_FUNC 2012-11-08 10:41:14 +08:00
minggo f9dac4d804 Update AUTHORS 2012-11-07 13:43:01 +08:00
minggo 3f3d09fabb Merge pull request #1532 from wenbin1989/gles20 
Add error handler when read image data using libjpeg.
 2012-11-06 20:10:21 -08:00
James Chen 7fe15d7571 Merge pull request #1556 from dumganhar/gles20 
Updated the submodule reference of "cocos2d-html5-tests" to the latest version.
 2012-11-06 01:07:15 -08:00
James Chen 6f377855e4 Updated the submodule reference of "cocos2d-html5-tests" to the latest version. 2012-11-06 17:06:04 +08:00
James Chen 7f098d803d Merge pull request #1555 from CocosRobot/updategeneratedsubmodule_1352192487 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-06 01:03:15 -08:00
CocosRobot b72c48f4c5 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-06 17:01:34 +08:00
James Chen 2193940b27 Merge pull request #1554 from dumganhar/gles20 
issue #1549: Fix some issues.
[1]Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS.
[2]Updated cocos2dx.ini. Renamed some functions.
[3]Added "ccdictionary_to_jsval" function, now TMXOrthoObjectsTest and TMXIsoObjectsTest don't crash.
 2012-11-06 01:00:31 -08:00
James Chen 449c719d96 issue #1549: Added "ccdictionary_to_jsval" function, now TMXOrthoObjectsTest and TMXIsoObjectsTest don't crash. 2012-11-06 16:11:45 +08:00
James Chen 26af535521 issue #1549: Updated cocos2dx.ini. Renamed some functions. 2012-11-06 14:19:27 +08:00
James Chen 21e4f80fbd Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
James Chen 5f28ef38c7 Merge pull request #1553 from CocosRobot/updategeneratedsubmodule_1352167965 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-05 18:13:52 -08:00
CocosRobot 5efdb93ef7 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-06 10:12:52 +08:00
James Chen 7af32050b3 Merge pull request #1552 from dumganhar/gles20 
Updated the submodule references of "tools/cxx-generator" and "cocos2d-html5-test"
 2012-11-05 18:11:52 -08:00
James Chen 5226fbac27 Updated the submodule reference of "samples/TestJavascript/cocos2d-html5-tests". 2012-11-06 10:10:25 +08:00
James Chen 0f3e0daeab Updated the submodule reference of "tools/cxx-generator". 2012-11-06 10:08:48 +08:00
James Chen 9c23065508 Merge pull request #1551 from dumganhar/gles20 
issue #1549: Using new JS API for MoonWarriors.
 2012-11-05 07:29:17 -08:00
James Chen ceb4371f12 issue #1549: Using new JS API for MoonWarriors. 
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
 2012-11-05 23:22:59 +08:00
James Chen 8d13269950 Merge pull request #1550 from dumganhar/iss1549-js-test 
issue #1549: Update the submodule reference of 'cocos2d-html5-tests' to the latest version.
 2012-11-05 03:00:30 -08:00
James Chen 1596603377 issue #1549: Update the submodule reference of 'cocos2d-html5-tests' to the latest version. 2012-11-05 18:59:42 +08:00
James Chen 289915b3a2 Merge pull request #1549 from CocosRobot/updategeneratedsubmodule_1352112593 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-11-05 02:55:25 -08:00
CocosRobot 7de31acd38 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-11-05 18:50:00 +08:00
James Chen 3d815da9db Merge pull request #1548 from dumganhar/iss1549-js-test 
issue #1549: Synchronizing to the latest cocos2d-html5-test
 2012-11-05 02:48:51 -08:00
James Chen 57f4e82f75 issue #1549: Made the window size same as cocos2d-html5 (800x450) on win32. 2012-11-05 18:46:23 +08:00
James Chen 4a6d922ea4 issue #1549: Updated tools/tojs/cocos2dx.ini. 2012-11-05 18:45:39 +08:00
James Chen 10ba589ed5 issue #1549: * Arguments in callbacks: 
instead of: callback(this, func), it is now:callback( func, [this] )
 2012-11-05 18:44:28 +08:00