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

11366 Commits

Author SHA1 Message Date
Ricardo Quesada e0523b3438 Merge branch 'developNewLabelForRiq' into label_merge 
Conflicts:
	cocos2dx/textures/CCTexture2D.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
	scripting/javascript/bindings/generated
	tools/bindings-generator
 2013-07-24 15:15:08 -07:00
Ricardo Quesada 943b805bc8 Fixes some warnings 
... and updates the version to pre-alpha0
 2013-07-24 14:02:36 -07:00
Thomas Perl 0557eb9674 Import local copy of libwebp to external/ 2013-07-24 19:39:26 +00:00
Thomas Perl 6e1c9b24f3 Qt 5: Add support for changing animation interval at runtime 2013-07-24 20:23:10 +02:00
Thomas Perl 97c4e4898a Qt 5: Fix language mapping in CCApplication 
Reorder language mappings as listed in the enum
definition and remove comment after checking all
available languages are added to the mapping.
 2013-07-24 20:23:09 +02:00
Thomas Perl 539f71c814 Qt 5: Implement input method showing/hiding 
[nemo] Integration of QInputMethod
 2013-07-24 20:23:09 +02:00
Thomas Perl bcee05d471 Qt 5: Add CCAccelerometer implementation 
[nemo] Add QtSensors-based Accelerometer implementation
 2013-07-24 20:23:08 +02:00
Thomas Perl 7f0a05d8c0 Initial RPM packaging for Qt5 
[nemo] Initial packaging
 2013-07-24 20:23:08 +02:00
Thomas Perl 6f4f8c0e38 Qt 5: System-wide installation of targets 2013-07-24 20:23:08 +02:00
Thomas Perl 366dbeda31 Qt 5: Build test application (Cpp/TestCpp) 2013-07-24 20:23:07 +02:00
Thomas Perl 8044c52d6d Qt 5: Add support for building libextension 2013-07-24 20:23:07 +02:00
Thomas Perl db230a3d2b Do not include Qt headers in CCApplication.h 
This avoids name collisions with the extensions sub-project
where "slots" is used as attribute of a class ("slots" is
redefined in Qt headers).
 2013-07-24 20:23:07 +02:00
Thomas Perl 485d973e24 Implement CocosDenshion backend using QMediaPlayer 
Music and effect playback works, effect playback is not
totally low-latency; we could implement our own decoding
and mixing using QAudioDecoder and QAudioOutput to get
buffering, preloading, looping and latency working well.
 2013-07-24 20:19:50 +02:00
Thomas Perl 4b52754dd3 CocosDenshion build setup for Qt 5 (no-op implementation) 
Right now, all operations are implemented as no-op, but
libcocosdenshion can now be built as shared library and used.
 2013-07-24 20:19:50 +02:00
Thomas Perl 15e3a7825c Re-enable use of CocosDenshion in SimpleGame 2013-07-24 20:19:49 +02:00
Thomas Perl e1baba5407 Build SimpleGame example 2013-07-24 20:19:20 +02:00
Thomas Perl b64c0a0e87 Platform abstraction implementation with Qt 5 
Based partially on the Linux platform abstraction, therefore
this right now works only with Qt 5 on Linux.
 2013-07-24 20:18:43 +02:00
Thomas Perl 4860e3551c Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
Thomas Perl 309269e8e2 Fix building of chipmunk on Linux 2013-07-24 20:18:42 +02:00
Thomas Perl 62958c8321 Qt5 build support (initial work) 2013-07-24 20:18:42 +02:00
carlo morgantini 97363c9382 some more cleanup and refactory for the new Label stuff 2013-07-24 10:22:46 -07:00
Éloi Rivard 682a1238fa Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
minggo 439ed140cd assign 1 to predefined macro CC_ENABLE_CHIPMUNK_INTEGRATION 2013-07-24 18:35:26 +08:00
zhangbin ed5c1afaf6 Resolve the bug in plugin qh360 2013-07-24 18:23:21 +08:00
James Chen e0f9ac82da issue #2404: Updating ExtensionsTest/CocosBuilderTest. 2013-07-24 18:17:20 +08:00
James Chen 762b987ae7 issue #2404: [Extensions] Updating the file for deprecated methods. 2013-07-24 18:00:40 +08:00
James Chen fb1b510557 issue #2404: Deprecated some methods in NodeLoaderLibrary.h/.cpp. 2013-07-24 18:00:02 +08:00
James Chen 00999b464e issue #2404: Reverting callback interface for CCBReader. 2013-07-24 17:59:21 +08:00
James Chen e5c2ad0cb8 issue #2404: Mark Texture2D::setTexParameters(const ccTexParams* texParams) as deprecated. 2013-07-24 17:54:17 +08:00
James Chen d42ff355b6 issue #2404: Mark RenderTexture:: newCCImage as deprecated. 2013-07-24 17:53:34 +08:00
James Chen 7fd0a923e9 issue #2404: Updating CCDeprecated.h, CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent; 2013-07-24 17:52:00 +08:00
minggo a76863dd7f add execution permission 2013-07-24 17:50:39 +08:00
minggo 99949331b1 fix error and compilings error in templates 2013-07-24 17:27:29 +08:00
minggo 019246fd51 travis build template too 2013-07-24 17:26:45 +08:00
minggo 9aa45b856f remove blackberry and marmalade port 2013-07-24 17:25:56 +08:00
James Chen debd1965c9 Merge branch 'deprecation' of https://github.com/azmeuk/cocos2d-x into iss2404-ext-deprecated 
Conflicts:
	cocos2dx/include/CCDeprecated.h
 2013-07-24 16:53:14 +08:00
James Chen 44a338f63c issue #2404: Re-add CallFuncND and CallFuncO and mark them as deprecated class. 2013-07-24 16:45:11 +08:00
samuele3hu 8e0a3b16a1 issue #2429:LuaWebSocket supports sending binary string passed by lua 2013-07-24 15:42:32 +08:00
samuele3hu 5b888d44e4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample 2013-07-24 15:34:32 +08:00
samuele3hu ff980477d7 issue #2429:LuaWebSocket supports passing binary string buffer to c++ 2013-07-24 15:33:37 +08:00
zhangbin 9944a5d186 Rename the singleton methods name in sample project of plugin. 
Remove the deprecated methods.
 2013-07-24 15:31:20 +08:00
zhangbin a718f8ba81 Resolve the bug : login UI of 360 & UC can't be landscape. 2013-07-24 15:29:54 +08:00
minggo ff0cbb9d0b Merge pull request #3232 from samuele3hu/TestSample 
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
 2013-07-23 23:33:28 -07:00
minggo 9b3f4a604b [ci skip] 2013-07-24 12:04:59 +08:00
samuele3hu bf692c8fde issue #2426:Modify tab and spaces 2013-07-24 12:03:54 +08:00
James Chen a2ba2e3f87 Merge pull request #3236 from dumganhar/iss2427-js-parse-plist 
closed 2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS.
 2013-07-23 20:56:30 -07:00
minggo 503f53b7c4 Merge pull request #3219 from metadao/develop 
typo; more Pythonic
 2013-07-23 20:51:56 -07:00
samuele3hu a52bab7a66 issue #2426:Modify coding style 2013-07-24 11:51:24 +08:00
James Chen 4cc3f63507 closed #2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS. 2013-07-24 11:51:12 +08:00
James Chen f429996719 Merge pull request #3233 from CocosRobot/updategeneratedsubmodule_1374635193 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-23 20:08:21 -07:00