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

330 Commits

Author SHA1 Message Date
James Chen 8cfe969137 Fixing compilation errors for win32. 2013-06-07 14:31:15 +08:00
Ricardo Quesada 80117afc82 Adds Base class to tests 
Base class displays the Menu( <- O -> )
Improved in some tests the way to create entries.
Instead of defining the tests twice: the "create" method, and the entry
   in the array, it is only needed in the array (ActionsTest, SpriteTest
   and Texture2DTest)
 2013-06-06 17:12:28 -07:00
James Chen 5832934e41 Reverting target to android-8. 2013-06-06 16:20:22 +08:00
James Chen deceba3fd2 Merge branch 'menuitem_toggle_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_toggle_fixes 2013-06-06 15:52:33 +08:00
Ricardo Quesada 479062fdb7 on dealloc, log "this" with %p, not %x. 
Also adds %p where it was missing.
And make a few fixes on the iOS project
 2013-06-05 18:21:05 -07:00
Ricardo Quesada 3441ca5563 MenuItemToggle is fixed 
Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
 2013-06-05 17:51:40 -07:00
James Chen 1bb73e50df Fixing a warning in Bug-458.cpp 2013-06-05 18:18:59 +08:00
James Chen dc8cfeb648 Merge branch 'menuitem_function_callback' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_function_callback 2013-06-05 16:40:25 +08:00
James Chen 993070b27e Minor fix in CCConfiguration. 2013-06-05 09:47:29 +08:00
Ricardo Quesada d27da88c06 Adds setObject to CCConfiguration 
also adds the test

Conflicts:
	scripting/javascript/bindings/generated
 2013-06-05 09:46:56 +08:00
Ricardo Quesada 4b37ec252a Adds C++11 std::function<> support to MenuItem 
Updates some of the tests
 2013-06-04 18:29:26 -07:00
Ricardo Quesada 337f966d0f It was using an clang extension for tuples<> 
Instead of converting it to pairs<>, which is compatible with gcc,
I converted it to C structs.
 2013-06-04 10:03:32 -07:00
Ricardo Quesada f22092c7fc Merge branch 'develop' into testmenu_sorted 2013-06-04 09:53:49 -07:00
James Chen 1610854902 fixed #2252: Updating iOS and mac project configuration. 2013-06-04 15:09:19 +08:00
Ricardo Quesada dccc4a3814 adds mising tests + cosmetic changes 2013-06-03 22:47:28 -07:00
James Chen 5d89a0cd0c Merge branch 'develop' into update-spine-runtime-develop 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-04 13:46:05 +08:00
Ricardo Quesada cc771da2c2 Merge branch 'develop' into testmenu_sorted 2013-06-03 22:35:55 -07:00
Ricardo Quesada cd52912f66 Main menu from test is sorted alphabetically 
Code was refactored. Now it is super easy to add a new test.
No need to add it in 3 different places
 2013-06-03 22:33:52 -07:00
Ricardo Quesada 39928d6a80 Adds std::function support in CCCallFunc 
And fixes some minor issues on the iOS and OS X projects
 2013-06-03 12:13:24 -07:00
minggo 4f484cbcbf enable c++11 for android projects 2013-06-03 11:02:41 +08:00
minggo 236286829b enable c++11 2013-06-03 11:02:35 +08:00
minggo 2cdb48bc22 enable c++11 for iOS projects 2013-06-03 10:57:06 +08:00
James Chen 2fdeab46b1 fixed #1647: [WebSocket] Fixing compilation errors on win32. 2013-06-03 10:12:55 +08:00
James Chen 0ca86db0ff fixed #1647: Renaming enumerations to Cocos2d-x style. ERROR and ERROR_TIMEOUT is defined as macros on Windows, fuck it. 2013-06-03 10:12:55 +08:00
flaming0 b87a89eaa4 Update spine runtime 2013-06-02 19:59:13 +04:00
James Chen 8e15cdf5fd WS_ERROR -> ERROR, WS_STATE -> STATE. 2013-06-01 19:51:10 +08:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
minggo 57600783c4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-05-31 10:29:39 +08:00
Ricardo Quesada 3383fc5f04 CCConfiguration supports default values in the query 
Adds tests for the new API as well
 2013-05-31 10:25:34 +08:00
minggo 1ff88de561 Merge pull request #2666 from jotel/ccdata-in-userdefault 
Ability to save/retrieve CCData into/from CCUserDefault
 2013-05-29 19:40:23 -07:00
minggo 53365b9e46 Merge pull request #2669 from frranck/master 
adding norwegian language
 2013-05-29 02:10:37 -07:00
Ricardo Quesada a219f9c520 CCConfiguration has format 
CCconfiguration has a file format.
It has a data and metadata
 2013-05-29 17:09:04 +08:00
franck 81a0fed3e2 adding norwegian language... 2013-05-29 10:31:46 +02:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01: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
James Chen 5c506e2edc Merge pull request #2607 from pyrasis/background_foreground_tizen 
Implementing foreground and background status for Tizen port.
 2013-05-21 21:43:51 -07: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 d83ed86739 Implementing foreground and background status and modify CocosDenshion comment. 2013-05-21 22:48:51 +09: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
James Chen acef98a350 Merge pull request #2572 from pyrasis/tizen 
fixed #2185: Cocos2d-x Tizen support.
 2013-05-20 20:08:28 -07:00
Lee, Jae-Hong e1a947637f Use libcocos2d.a HelloCpp, TestCpp, and SimpleGame. 2013-05-21 10:43:24 +09:00