Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update README.md #3

Merged
merged 5 commits into from
Nov 25, 2019
Merged

Update README.md #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dcb1d57
Update README.md
halx99 Nov 25, 2019
60662af
skip gen luabindings for ci
halx99 Nov 25, 2019
9aeb04d
fix CMakeLists.txt for apple
halx99 Nov 25, 2019
9e7ffd7
update deps to v5-deps-2
halx99 Nov 25, 2019
8cb40c3
Update ProgramStateRegistry.cpp
halx99 Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ _USRSTUDIOPDLL
- [x] 2. Remove SimpleAudio
- [ ] 3. Remove offthread file operation
- [x] 4. Remove getSutiableFOpen, avoid reduce performance, there is another better solution for support: ```just doesn't convert path to utf-8 in FileUtils manually implementation```
- [x] 5. Optimize CCDownloader, curl for all platforms
- [x] 5. Refactor CCDownloader, curl for all platforms, don't use scheduler to retrive progress info, make it more reuseable
- [ ] 7. Refactor engine-v5-deps, all compile as vs2019 MSVC 19.22.27905.0
- [x] 8. minizip-1.2.0
- [x] 9. ccMessageBox
Expand Down
1 change: 0 additions & 1 deletion cocos/audio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ elseif(APPLE)
set(COCOS_AUDIO_PLATFORM_HEADER
audio/apple/AudioDecoder.h
audio/apple/AudioPlayer.h
audio/apple/AudioMacros.h
audio/apple/AudioCache.h
audio/apple/AudioEngineImpl.h
)
Expand Down
2 changes: 0 additions & 2 deletions cocos/renderer/backend/ProgramStateRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#pragma once

#include "ProgramStateRegistry.h"

CC_BACKEND_BEGIN
Expand Down
4 changes: 2 additions & 2 deletions external/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "v5-deps-1",
"zip_file_size": "103868946",
"version": "v5-deps-2",
"zip_file_size": "103868975",
"repo_name": "engine-v5-3rd",
"repo_parent": "https://github.com/simdsoft/",
"move_dirs": {
Expand Down
2 changes: 1 addition & 1 deletion tools/travis-scripts/run-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function genernate_binding_codes()

echo "Create auto-generated luabinding glue codes."
pushd "$COCOS2DX_ROOT/tools/tolua"
python ./genbindings.py
# python ./genbindings.py
popd
}

Expand Down