Commit Graph

43 Commits

Author SHA1 Message Date
leeda 18a6d8241d update Copyright. might need manual fix later (#18659)
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
minggo 4ca29ac1cf Merge v3.15.1 (#17897)
* remove APP_SHORT_COMMANDS setting (#17722)

some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.

* Particle font size should be a const value (#17676)

* Particle font size should be a const value

* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.

* JSB SocketIO.connect supports to pass a CA cert file (#17736)

* JSB SocketIO.connect supports to pass a CA cert file

* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.

* The optimization for huawei. (#17832)

* The optimization for huawei.

* setAnimationInterval fix for all platforms.

* disable debug

* include fix.

* Uses better configuration for huawei optimization (#17838)

* Uses better configuration for huawei optimization

* Updates jar file and uncomment fps controlling code

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840)

* update release not and version (#17845)

* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861)

* Updates jar to resolve warning while packaging APK file. (#17863)

* update release date (#17870)

* fix compiling error
2017-06-05 13:37:50 +08:00
James Chen 6217d8c5ca fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback (#17593)
* Moves the implementation of AudioEngine::AudioInfo to cpp file.

* fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback

* fixed #17591: Adds test case.
2017-03-27 17:28:39 +08:00
James Chen ab9104f3ce Updates templates for switching AudioEngine in AppDelegate.cpp. (#17555) 2017-03-22 11:19:25 +08:00
CocosRobot d07794052f Update license to 2017 (#17362)
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
mogemimi 777a97e141 Fix typo in AudioState (#17258) 2017-02-04 10:34:34 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
MagicXrEv 8e6ca57f4f lua binding : Rename end() to endToLua(). 2016-06-14 23:35:17 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
cesarpachon 40f6f76030 AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries 2015-11-26 22:22:05 -05:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
WenhaiLin 102020d831 1.AudioEngine:support callback for preload feature.
2.AudioEngineThreadPool:Make the number of thread be a fixed number.
2015-07-28 15:27:07 +08:00
WenhaiLin 86a68f5a09 AudioEngine:refine thread pool 2015-07-09 14:31:03 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00
linshun 77639bc88e issue #12078: Added audio group. 2015-05-28 15:46:02 +08:00
anniruddh.koppal 2db5a89b87 Added new audio engine with wav support 2015-05-15 18:17:52 -07:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
Wenhai Lin fdffad3956 [ci skip]Fixed warnings when generating docs by doxygen. 2015-03-27 10:52:59 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
Conflicts:
	cocos/audio/include/SimpleAudioEngine.h
2015-03-19 20:28:29 +08:00
dingpinglv 1b179c2b02 Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h 2015-03-19 20:20:16 +08:00
VisualSJ f87b06a1c8 Add javascript notes...
cocos/2d/CCAction.h
  cocos/2d/CCActionCamera.h
  cocos/2d/CCActionCatmullRom.h
  cocos/2d/CCActionInstant.h
  cocos/2d/CCActionInterval.h
  cocos/2d/CCActionManager.h
  cocos/audio/include/AudioEngine.h
  cocos/audio/include/SimpleAudioEngine.h
2015-03-19 18:41:11 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
raydelto e20c347767 Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID 2014-12-31 20:51:45 -04:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00
Dhilan007 f52c3e5a83 Remove unneeded include in AudioEngine.h 2014-11-13 22:02:28 +08:00
martell fe32bcb952 added support for static and shared builds with audio and studio
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:52 +01:00
Dhilan007 18307d52da fix macro 2014-09-30 09:48:24 +08:00
Ricardo Quesada 7a1dac5aa6 Fixes audio issues when using CMake on Mac 2014-09-29 14:07:11 -03:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +08:00
Dhilan007 9942206c53 move AudioEngine in cocos2d:experimental namespace 2014-09-16 10:22:25 +08:00
Dhilan007 e588b371bd Replace with 'struct' for AudioInfo/ProfileHelper. 2014-09-10 14:09:42 +08:00
Dhilan007 e45a4ff1bd 1.Fix name of variables.
2.Fix control of volume on android.
2014-09-10 13:47:17 +08:00
Dhilan007 f2b7bd62d5 update Xcode project for audio engine 2014-09-09 11:41:17 +08:00
Dhilan007 6b4b5ed943 Refactoring API:
1.Remove Singleton Pattern
2.Make AudioProfile clear.
2014-09-05 11:13:51 +08:00
Dhilan007 ca652cefee New audio engine API[2d] 2014-09-03 18:18:47 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
huangshiwu 24d68305e1 WP8 compile fix 2014-08-07 11:56:28 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
Ricardo Quesada 6b29391212 Adds markdown comments in the doxstrings
Since Doxygen 1.8.0 (we are already using it), it is possible to
add markdown comments in the doxygen strings.

This will make our comments easier to read.

This patch  only adds markdown to CCNode.h as a test.

If you like, I'll keep adding markdown comments as I see them.
Please, encourage the rest of the team to do the same.
2013-11-11 20:21:01 -08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00