mogemimi
0894662eff
Remove unnecessary 'extern' to prevent compiler warnings
2016-07-26 12:42:43 +09:00
CocosRobot
9566a0cb24
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 02:06:58 +00:00
minggo
e1204c6138
Merge pull request #16210 from dumganhar/fix/std-bind
...
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 09:58:01 +08:00
minggo
afc054ea2d
Merge pull request #16211 from mogemimi/fix-variable-name
...
Fix typos in variable names
2016-07-26 09:57:12 +08:00
mogemimi
093ef3a14f
Fix typos in variable names
2016-07-26 04:06:01 +09:00
James Chen
bf80f10dfd
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 00:55:32 +08:00
minggo
662a1636c3
replace __system_property_get ( #16205 )
...
* replace __system_property_get
* fix comment
2016-07-25 18:30:47 +08:00
minggo
8693db38ac
Merge pull request #16209 from CocosRobot/update_lua_bindings_1469439400
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-25 18:30:22 +08:00
minggo
23d9b9b9d4
Merge pull request #16206 from CocosRobot/update_cocosfiles_1469439224
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 18:29:56 +08:00
CocosRobot
e0abb981d5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-25 09:39:34 +00:00
CocosRobot
588ac1c70d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 09:33:45 +00:00
minggo
acddbf1284
Merge pull request #16202 from natural-law/v3
...
Update the submodule cocos2d-console.
2016-07-25 17:32:58 +08:00
minggo
aa4e82c475
Merge pull request #16204 from CocosRobot/update_cocosfiles_1469433601
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 17:32:36 +08:00
halx99
bf996c5bac
Add ETC1 builtin alpha support. ( #16118 )
...
* Add ETC1 builtin alpha support.
* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix
* Check whether etc1 alpha suffix is empty
* fix Code ident & Add etc1 alpha test case to SpriteTest.
* Remove unused ETC1AA shader programs
* Fix all review issues and endl issues
* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID
* #fix issues
2016-07-25 17:31:54 +08:00
CocosRobot
dfda0e9e67
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 08:00:03 +00:00
minggo
8c537ed209
add issue tempalte
2016-07-25 15:58:04 +08:00
minggo
cc14a06800
Issue 14206 ( #16201 )
...
* don't trigger applicationWillEnterForeground at first time to be the same as iOS
* rename first to firstTime
2016-07-25 14:25:48 +08:00
zhangbin
361a94e920
Update the submodule cocos2d-console.
...
Solve the crash problem of cocos console on some Mac machines. Related issue: #16138
2016-07-25 11:38:03 +08:00
yanli.huang
5b3eae7be8
update cocos2d-console commit ( #16196 )
2016-07-25 11:19:11 +08:00
minggo
7fed88038b
Merge pull request #16200 from mogemimi/fix-logging-typos
...
Fix typos in log messages
2016-07-25 10:32:06 +08:00
mogemimi
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
minggo
1192176877
Merge pull request #16195 from minggo/issue-12704
...
remove unneeded flag
2016-07-22 18:10:11 +08:00
minggo
e3f6a16da7
Merge pull request #16194 from minggo/socketio-issue
...
get correct control code
2016-07-22 14:56:44 +08:00
minggo
4c2234fe20
get correct control code
2016-07-22 14:30:06 +08:00
minggo
a97906a280
Merge pull request #16184 from minggo/issue-16161
...
Issue 16161
2016-07-22 13:51:54 +08:00
minggo
2491a0c33a
Merge pull request #16191 from minggo/issue-12430
...
improve log info
2016-07-22 13:51:31 +08:00
minggo
391d97d1dd
improve log info
2016-07-22 11:56:41 +08:00
minggo
8419cc2662
Merge pull request #16183 from SaxonDruce/android-willplaymusic
...
Implement willPlayBackgroundMusic() on Android
2016-07-22 10:57:26 +08:00
minggo
fcd02f109e
Merge pull request #16189 from mogemimi/fix-docs-typo
...
Fix typos in documentation and comments
2016-07-22 10:55:05 +08:00
minggo
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
Ricardo Quesada
554b3b7ca7
Merge pull request #16190 from ricardoquesada/issue_16139_bis
...
fix: FPS appears again
2016-07-21 19:44:03 -07:00
minggo
358f247700
remove unneeded flag
2016-07-22 09:42:08 +08:00
Ricardo Quesada
1a834ebdbf
fix: FPS appears again
...
Sets default glviewport() when the GLView::updateDesignResolutionSize()
is called
github issue #16139
2016-07-21 15:12:57 -07:00
Ricardo Quesada
2abd178e96
Merge pull request #16180 from ricardoquesada/issue_16113
...
test case for issue #16113
2016-07-21 10:53:38 -07:00
mogemimi
94d4971ddc
Fix typos in documentation and comments
2016-07-22 02:05:19 +09:00
SaxonDruce
bbedddbf08
Fix bugs with music not resuming when iOS app is reactivated ( #16178 )
...
* Pause instead of stopping music on resign
The [audioSource stop] causes the music to be stopped, and therefore it fails to resume later on a call to [audioSource resume], due to the addition of the if (!stopped) check in resume added in 26a04b38f2
* Don't re-pause music that has already been paused
In this situation:
1. Start game, music plays
2. Switch to Music app, game music paused, start other music
3. Switch to game, game music not resumed due to other music playing
4. Switch to Music app, stop other music
5. Switch back to game, game music should resume due to no other music playing
At step 5 the game music doesn't currently resume. This is because at step 4 when switching to the Music app, the game music gets re-paused (actually isPlaying is false, so systemPaused is set to NO, even though the music *is* still paused). This causes the music to not be resumed at step 5.
This change fixes this, by skipping the pause logic if systemPaused is already true.
Note that this is dependent on https://github.com/cocos2d/cocos2d-x/pull/16178
* Fix typo in previous fix.
2016-07-21 17:41:24 +08:00
James Chen
233f2111b9
fixed #16170 : Random crash in alGenBuffers(AudioCache::readDataTask) at startup. ( #16182 )
...
* fixed #16170 : Random crash in alGenBuffers(AudioCache::readDataTask) at startup.
* Minor fix: should -> may
* Minor fix: updates comments.
* Update comment.
* Comment fix again.
2016-07-21 16:51:04 +08:00
minggo
bb25bed6f2
Merge pull request #16164 from dumganhar/fix/iss16046-fps-clock
...
Uses std::chrono::steay_clock for calculating dt.
2016-07-21 16:01:58 +08:00
minggo
35cea378a9
Merge pull request #16172 from cezheng/fix/label_text_formatter_right_alignment
...
fix label text formatter right alignment
2016-07-21 15:21:12 +08:00
James Chen
bb004c5e22
[audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform. ( #16147 )
...
* [audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform.
* Better state control in AudioCache.
* Adds State enum class which contains INITIAL, LOADING, READY, FAILED states.
* AudioPlayer::destroy should check AudioCache::_isAudioLoaded flag, otherwise, app will freeze in cpp-tests/NewAudioEngineTest/6:Test invalid audio file.
* Should check whether state is INITIAL in the destructor of AudioCache.
* Adds test case for switching play state frequently.
* Skips invoking reading data callback if cache's state is INITIAL.
* Variables initialization for AudioCache class and fixes protential missing delete AL buffers.
2016-07-21 14:57:59 +08:00
minggo
b8f8ff0d25
Merge pull request #16177 from mogemimi/fix-constant-spelling
...
Fix typo in constant name
2016-07-21 14:41:35 +08:00
minggo
9dd03c94f3
update 3rd party library version
2016-07-21 14:38:32 +08:00
Saxon Druce
de091cd3d9
Implement willPlayBackgroundMusic() on Android, to return false if there is other music already playing in another app.
2016-07-21 14:29:13 +08:00
minggo
26dd7b2698
remove curl link for Android
2016-07-21 11:56:56 +08:00
Ricardo Quesada
aff6e7852b
test case for issue #16113
2016-07-20 19:45:52 -07:00
CocosRobot
708dab448d
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16175 )
2016-07-21 10:11:14 +08:00
CocosRobot
235e65b835
[AUTO][ci skip]: updating cocos2dx_files.json ( #16174 )
2016-07-21 10:09:27 +08:00
mogemimi
17dfd03fa7
Fix typo in constant name
2016-07-21 00:49:19 +09:00
Ricardo Quesada
62f1762ea9
Merge pull request #16165 from ricardoquesada/issue_16105_bis
...
fix: stagger tilemaps hexa works as expected
2016-07-20 05:06:31 -07:00
Ce Zheng
35b848e842
fix label text formatter right alignment
2016-07-20 18:08:15 +09:00