Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dualface/v3quick
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3
Choose a base ref
...
head repository: zlQhs/v3quick
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3quick
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
8 contributors
Loading
Showing 5,184 changed files with 769,624 additions and 540,280 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
18 changes: 18 additions & 0 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# 4 space indentation
[*.cpp]
indent_style = space
indent_size = 4

[*.h]
indent_style = space
indent_size = 4
95 changes: 16 additions & 79 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@

.*
*.o
dist_workdir/

# Ignore thumbnails created by windows
Thumbs.db

@@ -37,19 +42,12 @@ ipch/

# Ignore files build by ndk and eclipse
libs/
bin/
proj.android/bin/
obj/
gen/
assets/
local.properties

# Ignore python compiled files
*.pyc

# Ignore files build by airplay and marmalade
build_*_xcode/
build_*_vc10/

# Ignore files build by xcode
*.mode*v*
*.pbxuser
@@ -62,78 +60,17 @@ xcschememanagement.plist
._.*
xcuserdata/
DerivedData/

# Ignore files built by AppCode
.idea/

# Ignore files built by bada
.Simulator-Debug/
.Target-Debug/
.Target-Release/

# Ignore files built by blackberry
Simulator/
Device-Debug/
Device-Release/

# Ignore vim swaps
*.swp
*.swo

# Ignore files created by create_project.py
projects/

# Ignore config files in javascript bindings generator
tools/tojs/user.cfg
# ... userconf.ini generated if running from tools/tojs
tools/tojs/userconf.ini
tools/tolua/userconf.ini
# ... userconf.ini generated if running from tools/jenkins_scripts/mac/android/
tools/jenkins_scripts/mac/android/userconf.ini

# CTags
tags

# ignore files, created with make-all-linux-project script
/lib
/build/linux-build

# Cmake files
CMakeCache.txt
CMakeFiles
Makefile
cmake_install.cmake

# Ignore files generated by console
build/build/
cocos/scripting/lua-bindings/proj.ios_mac/build/
tests/*/runtime/
tests/*/publish/
build.xcarchive/

# Android
project.properties

# Ignore prebuilt libraries folder
/external/xxhash/
/external/curl/
/external/edtaa3func/
/external/freetype2/
/external/glfw3/
/external/jpeg/
/external/json/
/external/linux-specific/
/external/lua/
/external/png/
/external/sqlite3/
/external/tiff/
/external/tinyxml2/
/external/unzip/
/external/webp/
/external/websockets/
/external/win32-specific/
/external/winrt-specific/
/external/wp8-specific/
/external/version.json
/templates/lua-template-runtime/runtime
/v*-deps-*.zip
/v*-lua-runtime-*.zip
#
quick/player/win_bin_*
player3.app
player3.exe

v3-deps-1.zip
v3-deps-2.zip
v3-deps-4.zip
v3-lua-runtime-1.1.3.zip
12 changes: 0 additions & 12 deletions .gitmodules
View file

This file was deleted.

44 changes: 0 additions & 44 deletions .travis.yml
View file

This file was deleted.

Loading