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

256 Commits

Author SHA1 Message Date
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
James Chen 942c797749 Removing unused codes. 2013-06-07 15:39:18 +08:00
Ricardo Quesada 428711482e Adds missing config files for CCConfiguration 
...and add functionality on the Director to override the default values
from the config file.

Supported values:

 - cocos2d.x.fps
 - cocos2d.x.display_fps
 - cocos2d.x.gl.projection
 - cocos2d.x.texture.pixel_format_for_png
 - cocos2d.x.texture.pvrv2_has_alpha_premultiplied

If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used

IMPORTANT:
 The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
 in the Android, Linux, Win32 projects.
 Already added in OS X and iOS Xcode projects.
 2013-06-06 12:23:44 -07:00
James Chen ed4b9b2bb3 Marmalade projects fix. 2013-06-06 14:26:35 +08:00
James Chen f22d320797 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 2013-06-06 14:24:58 +08:00
minggo a9788a7f9d Merge pull request #2767 from chengstory/master_Components#2 
1.  change “bool isEnabled()”  to "bool isEnabled() const".
 2013-06-05 00:52:32 -07:00
chengstory ca3dc682ea 1. change “bool isEnabled()” to "bool isEnabled() const". 
2.  dolete license.
 2013-06-05 15:05:49 +08:00
James Chen 26219d4a14 Minor fix in CCConfiguration. 2013-06-05 09:41:03 +08:00
James Chen 2a16a6b17f Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value 2013-06-05 09:36:53 +08:00
chengstory a5f8e2c27e no message 2013-06-04 17:54:05 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
James Chen 988269f9fa fixed #2252: Updating iOS and mac project configuration. 2013-06-04 15:03:10 +08:00
flaming0 39ce9b4813 Update spine runtime 2013-06-04 14:46:46 +08:00
Ricardo Quesada 69e8628626 Adds setObject to CCConfiguration 
also adds the test
 2013-06-03 13:49:06 -07:00
James Chen d0680258c6 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:03:38 +08:00
James Chen f2f0f031c7 fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 09:55:43 +08:00
James Chen 4b8f76c903 WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-02 18:56:49 +08:00
James Chen cedb427a6e fixed #1647: Adding WebSocket support for Cpp and JSB. 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-02 18:55:57 +08:00
Ricardo Quesada f6665d492b CCConfiguration supports default values in the query 
Adds tests for the new API as well
 2013-05-30 16:10:31 -07:00
Ricardo Quesada ebb392ca8e CCConfiguration has format 
CCconfiguration has a file format.
It has a data and metadata
 2013-05-28 18:15:16 -07:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
Lee, Jae-Hong 47fac0ed98 Implement CCEditBox for Tizen. (develop branch) 2013-05-26 20:40:13 +09:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
James Chen 731b3c2324 fixed #2215: Updating project configuration for other platforms after adding ConfigurationTest. 2013-05-23 10:09:35 +08:00
Ricardo Quesada 207fc4be9c Adds ConfigurationTest to the suite 2013-05-22 17:56:05 -07:00
James Chen c1d85aaab2 Merge pull request #2611 from pyrasis/tizen_2.1 
Update projects to Tizen 2.1 SDK.
 2013-05-22 02:07:06 -07:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09:00
minggo d1a8f54113 Merge pull request #2609 from j4m3z0r/emscriptenate 
Add Audio Support for Emscripten
 2013-05-21 18:32:12 -07:00
Lee, Jae-Hong 6f34c7cb46 Support Tizen 2.1 SDK. 2013-05-21 21:22:31 +09:00
minggo cc2b00e9fe Merge pull request #2573 from j4m3z0r/emscriptenate 
Use browser font rendering instead of FreeType
 2013-05-20 22:50:28 -07:00
James Gregory da7113a04f Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them. 2013-05-20 20:09:56 -07:00
Lee, Jae-Hong e1a947637f Use libcocos2d.a HelloCpp, TestCpp, and SimpleGame. 2013-05-21 10:43:24 +09:00
James Gregory a1ff189854 Query the GL canvas for its width and height and use that rather than hardcoding it. Default the frame size to the whole canvas, and update the samples to use iPad resolution (1024x768). 2013-05-17 12:39:18 -07:00
Lee, Jae-Hong 1c170aedd3 Adding README.mdown for TestCpp 2013-05-16 20:52:19 +09:00
Lee, Jae-Hong 6b990209a2 Set the static libarary pathes. 2013-05-16 20:25:12 +09:00
Lee, Jae-Hong 6289a20fcb Adding design size for Tizen. 2013-05-16 20:23:21 +09:00
Lee, Jae-Hong fc28943b3f set screen orientation landscape. TestCpp project. 2013-05-16 20:17:41 +09:00
Lee, Jae-Hong 2a332a5862 Replace \ to / in include and library pathes. 2013-05-16 20:16:27 +09:00
Lee, Jae-Hong c426370f63 Replace tab to spaces. 2013-05-16 20:14:40 +09:00
Lee, Jae-Hong bd71c8775d Modify library link order. 2013-05-16 20:14:16 +09:00
Lee, Jae-Hong 09a0eec90a Enable chipmunk. 2013-05-16 20:14:03 +09:00
Lee, Jae-Hong 34599daf9d Enable Box2D. 2013-05-16 20:13:36 +09:00
Lee, Jae-Hong 9bbfdf2adb Adding placeholder.txt files. 2013-05-16 20:12:31 +09:00
Lee, Jae-Hong ca69bf39c8 Modify the output filename. 2013-05-16 20:11:33 +09:00
Lee, Jae-Hong e445af65ad Adding license. 2013-05-16 20:11:14 +09:00
Lee, Jae-Hong 9db7b7f3a3 Adding TestCpp project for Tizen. 2013-05-16 20:10:53 +09:00
carlo morgantini 36b88039a1 CCLabelTTF C++ test fixed 2013-05-15 16:37:08 -07:00
carlo morgantini cab90dd276 CCTextDefinition is passed now by pointers 2013-05-15 16:35:24 -07:00
carlo morgantini 2430d79642 changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF 2013-05-15 16:29:33 -07:00