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

6157 Commits

Author SHA1 Message Date
Rohan Kuruvilla 5fb2c0892e Updating jsb JS bootstrap files 2012-11-16 15:56:28 +08:00
Rohan Kuruvilla 39a4e6a19e Fixing bindings bug for CCScheduler. Also adding custom bindings for TMXLayer. Also updating ini 2012-11-16 15:56:27 +08:00
Rohan Kuruvilla 66f85468e5 Adding JS conversion of CCDictionary objects, also modified CCArray conversion 2012-11-16 15:56:27 +08:00
Rohan Kuruvilla 672bed3ed0 Updating bindings for ONE_BY_ONE touch handling 2012-11-16 15:56:27 +08:00
Rohan Kuruvilla f9aea7befe Changing parameter ordering for callbacks (making thisObj optional). Also adding custom bindigns for CCScheduler 2012-11-16 15:56:26 +08:00
Rohan Kuruvilla af3bc76062 Fixing script callbacks for schedule updates with negative and positive priorities 2012-11-16 15:55:34 +08:00
minggo 605771697a Merge pull request #1566 from mingulov/unzip_crc 
Zip support: broken CRC check / unzCloseCurrentFile
 2012-11-15 23:31:14 -08:00
Lu Guanqun 17e23f61a7 remove unused private field in KeypadTest 2012-11-16 15:19:43 +08:00
minggo 6a1feb70bc issue #1555:linux work ok 2012-11-16 15:16:55 +08:00
Lu Guanqun 8270ee3e48 fix -Wreorder warning 
In the class definition, the field m_nScriptHandler is declared before
m_pCallFunc, so we should follow the order in initialization as well.
 2012-11-16 15:10:25 +08:00
minggo b497143f93 issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
minggo a4a53df159 issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
Rolando Abarca 6e9d2e808c improved debugger 2012-11-15 11:14:57 -08:00
Rolando Abarca c9df076378 new JSStringWrapper 2012-11-15 11:14:37 -08:00
Rolando Abarca 2ea2cb616c adds compartment code to chipmunk 2012-11-15 11:13:32 -08:00
Rolando Abarca b894524ed0 removing some warnings 2012-11-15 11:13:21 -08:00
thbourlove 5f1476df36 Update tools/tolua++/build.php 
If you run this:
	
	tolua++ -o LuaCocos2d.cpp /path_to_cocos2d/cocos2d-2.0.3/tools/tolua++/Cocos2d.pkg
	
tolua++ will regard the 'cocos2d-2' as package name, but which you want is 'Cocos2d'(input file root name).
 2012-11-15 19:25:08 +08:00
minggo cb2bc37513 issue #1555: make tests work 2012-11-15 18:34:23 +08:00
minggo e19b418c62 issue #1555: update to v2.1 beta3 2012-11-15 17:16:51 +08:00
James Chen 6d847989d6 Merge pull request #1576 from dumganhar/iss1557-marmalade 
Merged PR #1570
 2012-11-14 18:45:57 -08:00
James Chen a3437d09df issue #1557: Fixed particle crash.We should check the file format by the file header when the format isn't defined. 2012-11-15 10:43:29 +08:00
James Chen c79cac3af6 Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade 2012-11-15 10:10:53 +08:00
Mat Hopwood 148a558405 Tiff support and resource location 
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
 2012-11-14 17:46:09 +00:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
minggo 5fd56370d8 issue #1555:fix a bug about CCGLProgram 2012-11-13 11:06:32 +08:00
minggo 6661f2c88d issue 1555:add CCPhysicsSprite 2012-11-12 15:22:26 +08:00
James Chen 5d5eda1b3d Update AUTHORS 2012-11-12 11:08:19 +08:00
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