Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,707 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

101 Commits

Author SHA1 Message Date
James Chen 3885772e5f Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7 
closed #2920: fix bug: voice recognition input crash on ios7
 2014-02-21 13:46:31 +08:00
boyu0 6f7dde3a99 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-20 16:51:21 +08:00
James Chen 0d8846d876 closed #4097: Adds a macro to disable inserting script binding relevant codes. 2014-02-20 16:40:46 +08:00
James Chen 472c630277 issue #4097: Deletes CCEditBoxImplTizen.h/.cpp. 2014-02-20 16:40:12 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
boyu0 a261ba9df2 issue #2920: Change internal ios keyboard type EditBox::InputMode::NUMERIC from UIKeyboardTypeNumbersAndPunctuation to UIKeyboardTypeDecimalPad 2014-02-17 14:33:26 +08:00
boyu0 20ee1d2666 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-07 11:37:01 +08:00
Ricardo Quesada 862500f99a Renames EGLView -> GLView 2014-01-30 15:40:56 -08:00
Ricardo Quesada 4cbbd8a9f5 EGLView is not longer a singleton 2014-01-30 15:11:54 -08:00
boyu0 00b5a9add5 issue #2920: fix indent 2014-01-27 18:22:35 +08:00
boyu0 e16e6a8e84 issue #2920: fix coding style 2014-01-27 18:19:10 +08:00
boyu0 23d2d586ed closed #2920: fix bug voice recognition input crash on ios7 2014-01-27 18:08:34 +08:00
Ricardo Quesada 8ecaf49f93 GLView improvements 
it is not longer a singleton
it is possible to specify the size
 2014-01-23 15:36:55 -08:00
James Chen a63f092d94 closed #3808: EditBox on Mac works again. 2014-01-22 10:53:43 +08:00
Ricardo Quesada d0dbf34319 removes "include "cocos2d.h" from cocos2d files 2014-01-16 21:35:58 -08:00
James Chen 6827538802 Adds override keyword for override functions. 2014-01-04 18:12:09 +08:00
boyu0 07925d112e issue #2920: add version detect. 2013-12-25 17:21:28 +08:00
boyu0 3764005d88 issue #2920: add “FIX ME” comment. 2013-12-25 14:46:29 +08:00
boyu0 622431758e issue #2920: temporary fix dictation input crash on ios7. 2013-12-25 10:22:52 +08:00
Ricardo Quesada 0222c6544e Migration to Mat4x4 
Armature not migrated yet

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-12-09 17:32:51 -08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
samuele3hu d8bd65b2e8 issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
James Chen 343c98af13 Fixing warnings of the order of member variables and fixing errors for tizen projects. 2013-07-29 14:07:57 +08:00
James Chen 387ae822b1 issue #2430: Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp 2013-07-26 22:57:15 +08:00
James Chen 2bfccb4a43 A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType 2013-07-26 21:36:32 +08:00
minggo 3cb40b36e4 issue #2430:fix some errors 2013-07-26 18:07:40 +08:00
minggo a7c1904eb8 issue #2430:move EditBox enum into class 2013-07-26 17:45:01 +08:00
minggo f55d73194e issue 2430:use enum class for Control enum values 2013-07-26 14:37:26 +08:00
James Chen 1db847ad7c issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00
James Chen b58d18e20a More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix. 2013-07-22 14:28:19 +08:00
Ricardo Quesada ba6ab126c6 More best practices fixes 
- class order fixes
  - static methods (creators) at the beginning
  - then constructors / destructors
  - then init
- more `const` fixes
  - adds some const getters
  - some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
 2013-07-18 16:30:19 -07:00
minggo eada29ee40 issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
minggo 15096b0716 issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated 2013-07-12 14:30:26 +08:00
minggo bb758df0d0 issue #2393:mark ccp as deprecated 2013-07-12 14:11:55 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
minggo c37af8fa77 issue #2393:mark functions in CCPointExtensions deprecated 2013-07-11 16:38:58 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
minggo dfde41b932 issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
samuele3hu ec2f5376f1 issue #2244:Add namespace to some enums 2013-07-05 16:05:38 +08:00
samuele3hu 570f2663f4 issue #2244:Modify ScriptData struct and functions related with sendEvent 2013-07-04 15:44:42 +08:00
samuele3hu 9b08cee01f issue #22434:make some execute funs into one funs in ScriptEngineProtocol 2013-07-02 15:23:51 +08:00
Justin Hawkwood 9067918d73 Set textview_hidden to true on init 2013-06-26 13:44:49 -07:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
Ricardo Quesada 578bce4bc8 Re-adds 'CC' prefix to objective-c classes. 
And also makes it compile on Mac, which was broken
 2013-06-20 17:46:22 -07:00
James Chen cb67ed0227 issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
James Chen e281fdfa73 issue #2129: Renaming EditBoxImplIOS to EditBoxImplIOS_objc since it will be conflict with CCEditBoxImplIOS after removing CC prefix. 2013-06-20 13:07:09 +08:00