Skip to content

Conversation

crazyhappygame
Copy link
Contributor

Copy resources to "Resources/" like in linux configuration

@crazyhappygame
Copy link
Contributor Author

@drelaptop could you merge it.

@drelaptop drelaptop changed the title Resources Copy resources to "Resources/" on win32 like in linux configuration Nov 12, 2018
@drelaptop drelaptop merged commit 8a142cb into cocos2d:v3 Nov 12, 2018
@drelaptop drelaptop added this to the 3.17.1 milestone Nov 12, 2018
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Dec 3, 2018
* commit '8a142cbf88894e1f6bba3d320a69029daecd988f':
  Copy resources to "Resources/" on win32 like in linux configuration (cocos2d#19153)
  Action::Repeat fix NaN error (cocos2d#19158)

# Conflicts:
#	templates/js-template-default/CMakeLists.txt
#	templates/lua-template-default/CMakeLists.txt
#	tests/js-tests/project/CMakeLists.txt
#	tests/lua-empty-test/project/CMakeLists.txt
#	tests/lua-tests/project/CMakeLists.txt
huangwei1024 pushed a commit to huangwei1024/cocos2d-x that referenced this pull request Jun 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants