Merge branch 'develop'

.clang-format

@@ -0,0 +1,34 @@
+BasedOnStyle: Mozilla
+UseTab: Always
+IndentWidth: 4
+TabWidth: 4
+
+#From https://github.com/mozilla/gecko-dev/blob/master/.clang-format
+# Prevent the loss of indentation with these macros
+MacroBlockBegin: "^\
+NS_INTERFACE_MAP_BEGIN|\
+NS_INTERFACE_TABLE_HEAD|\
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION|\
+NS_IMPL_CYCLE_COLLECTION_.*_BEGIN|\
+NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED|\
+NS_INTERFACE_TABLE_BEGIN|\
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED|\
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED$"
+MacroBlockEnd: "^\
+NS_INTERFACE_MAP_END|\
+NS_IMPL_CYCLE_COLLECTION_.*_END|\
+NS_INTERFACE_TABLE_END|\
+NS_INTERFACE_MAP_END_INHERITING|\
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END_INHERITED|\
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED$"
+
+SortIncludes: false
+
+
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterEnum: true
+  AfterStruct: true
+  AfterFunction: true
+  AfterClass: true
+  SplitEmptyFunction: true

.githooks/pre-commit

@@ -0,0 +1,2 @@
+#!/bin/sh
+./format.sh "pre-commit"

.gitignore

@@ -3,6 +3,11 @@
 *.obj
 *.a
 
+# Doxygen documentation
+Utils/temp
+stepmania.chm
+# For people using vscode
+.vscode
 # CMake Files/Directories
 CMakeFiles/
 CMakeCache.txt
@@ -24,6 +29,9 @@ src/generated
 extern/mad-0.15.1b/config.h
 extern/libjpeg/jconfig.h
 extern/newogg/include/ogg/config_types.h
+Program/*.dll
+!Program/parallel_lights_io.dll
+!Program/dlls/*.dll
 
 # Text Editor Based Items
 *.log
@@ -48,6 +56,9 @@ PBProject/Hardware.plist
 *.dmg
 .DS_Store
 
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+
 # Visual Studio
 *.sln
 *.vcxproj

.travis.yml

@@ -3,106 +3,115 @@ dist: trusty
 sudo: required
 
 matrix:
-  include:
-  - env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF
-      WITH_FFMPEG_JOBS=1
-    os: osx
-  - env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF
-      WITH_FFMPEG_JOBS=1
-    compiler: clang
-    addons: &1
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-precise-3.6
-        packages:
-        - nasm
-        - libudev-dev
-        - clang-3.6
-        - libmad0-dev
-        - libgtk2.0-dev
-        - binutils-dev
-        - libasound-dev
-        - libpulse-dev
-        - libjack-dev
-        - libc6-dev
-        - libogg-dev
-        - libvorbis-dev
-        - libxtst-dev
-        - libxrandr-dev
-        - libglew-dev
-        - libuv-dev
-  - env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=ON
-      WITH_FFMPEG_JOBS=1
-    compiler: clang
-    addons: *1
-  - env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1 MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-    compiler: gcc
-    addons:
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        packages:
-        - nasm
-        - libudev-dev
-        - gcc-5
-        - g++-5
-        - libmad0-dev
-        - libgtk2.0-dev
-        - binutils-dev
-        - libasound-dev
-        - libpulse-dev
-        - libjack-dev
-        - libc6-dev
-        - libogg-dev
-        - libvorbis-dev
-        - libxtst-dev
-        - libxrandr-dev
-        - libglew-dev
-        - libuv-dev
-      coverity_scan:
-        project:
-          name: etternagame/etterna
-          description: "Build submitted via Travis CI"
-        notification_email: [email protected]
-        build_command_prepend: "cov-configure --comptype g++ --compiler g++-5 --template"
-        build_command: "make -j 4"
-        branch_pattern: coverity_scan
+        include:
+                - env:
+                          CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF
+                          WITH_FFMPEG_JOBS=1
+                  os: osx
+                - env:
+                          CXX_COMPILER=clang++-5.0 CC_COMPILER=clang-5.0 BUILD_TYPE=Release WITH_FFMPEG=OFF
+                          WITH_FFMPEG_JOBS=1
+                  compiler: clang
+                  addons: &1
+                          apt:
+                                  sources:
+                                          - ubuntu-toolchain-r-test
+                                          - llvm-toolchain-precise
+                                  packages:
+                                          - nasm
+                                          - libudev-dev
+                                          - clang-5.0
+                                          - clang-format-5.0
+                                          - libmad0-dev
+                                          - libgtk2.0-dev
+                                          - binutils-dev
+                                          - libasound-dev
+                                          - libpulse-dev
+                                          - libjack-dev
+                                          - libc6-dev
+                                          - libogg-dev
+                                          - libvorbis-dev
+                                          - libxtst-dev
+                                          - libxrandr-dev
+                                          - libglew-dev
+                                          - libuv-dev
+                - env:
+                          CXX_COMPILER=clang++-5.0 CC_COMPILER=clang-5.0 BUILD_TYPE=Release WITH_FFMPEG=ON
+                          WITH_FFMPEG_JOBS=1
+                  compiler: clang
+                  addons: *1
+                - env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1 MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+                  compiler: gcc
+                  addons:
+                          apt:
+                                  sources:
+                                          - ubuntu-toolchain-r-test
+                                          - llvm-toolchain-precise
+                                  packages:
+                                          - nasm
+                                          - libudev-dev
+                                          - gcc-5
+                                          - g++-5
+                                          - libmad0-dev
+                                          - libgtk2.0-dev
+                                          - binutils-dev
+                                          - libasound-dev
+                                          - libpulse-dev
+                                          - libjack-dev
+                                          - libc6-dev
+                                          - libogg-dev
+                                          - libvorbis-dev
+                                          - libxtst-dev
+                                          - libxrandr-dev
+                                          - libglew-dev
+                                          - libuv-dev
+                                          - clang-format-5.0
+                          coverity_scan:
+                                  project:
+                                          name: etternagame/etterna
+                                          description: "Build submitted via Travis CI"
+                                  notification_email: [email protected]
+                                  build_command_prepend: "cov-configure --comptype g++ --compiler g++-5 --template"
+                                  build_command: "make -j 4"
+                                  branch_pattern: coverity_scan
 
 before_script:
-  - if [ "${CXX_COMPILER}" = "g++-5" ]; then export CXX="g++-5" CC="gcc-5"; fi
-  - if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi
-  - git submodule update --init
-  - mkdir ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
-  - if [ "$TRAVIS_OS_NAME" != "osx" ]; then cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl;
-    export LIBRARY_SEARCH_PATHS=${TRAVIS_BUILD_DIR}/Xcode/Libraries;
-    export LIBRARY_PATH=${TRAVIS_BUILD_DIR}/Xcode/Libraries;
-    brew install --HEAD libuv --universal;
-    brew install yasm;
-    brew install nasm;
-    brew uninstall libuv;
-    brew install libuv --universal;
-    brew uninstall openssl;
-    brew install openssl --universal;
-    brew uninstall zlib;
-    brew install zlib --universal;
-    cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G "Xcode" ..; fi
+        - if [ "${CXX_COMPILER}" = "g++-5" ]; then export CXX="g++-5" CC="gcc-5"; fi
+        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi
+        - git submodule update --init
+        - mkdir ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
+        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}; fi
+        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl;
+          export LIBRARY_SEARCH_PATHS=${TRAVIS_BUILD_DIR}/Xcode/Libraries;
+          export LIBRARY_PATH=${TRAVIS_BUILD_DIR}/Xcode/Libraries;
+          brew install --HEAD libuv --universal;
+          brew install yasm;
+          brew install nasm;
+          brew uninstall libuv;
+          brew install libuv --universal;
+          brew uninstall openssl;
+          brew install openssl --universal;
+          brew uninstall zlib;
+          brew install zlib --universal;
+          brew install grep --with-default-names;
+          brew install clang-format --universal;
+          cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G "Xcode" ..; fi
 
 script:
-  - if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j 4; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target Etterna -destination 'platform=OS X,arch=x86_64' -xcconfig ../Xcode/conf.cnf -configuration RelWithDebInfo;
-    mv ../*.app ../Etterna.app;
-    xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target dmg -configuration RelWithDebInfo; fi
+        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j 4; fi
+        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target Etterna -destination 'platform=OS X,arch=x86_64' -xcconfig ../Xcode/conf.cnf -configuration RelWithDebInfo;
+          mv ../*.app ../Etterna.app;
+          xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target dmg -configuration RelWithDebInfo; fi
+        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then cd .. && bash format-check.sh; fi
 
 before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.2.6;
-    gem install dropbox-deployment; fi
+        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.2.6;
+          gem install dropbox-deployment; fi
 
 after_success:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cd ${TRAVIS_BUILD_DIR};
-    ruby uploadDmg.rb; fi
-    
+        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cd ${TRAVIS_BUILD_DIR};
+          ruby uploadDmg.rb; fi
+
 env:
-  global:
-    secure: gXXVXUQdzic8X/WhHgPih7zEPOMvzz1o4XudnEgiIGrk5gwVajXLVc0TEVT9uogeuHZxhT0sM7idYmtSXTe6zUBfoV/WXnyfeZVQhI59iy35bWUKdbpPpO9bAafdmMB2d9b3v5QT8iubOPAudVNGENBZiXiGovAJBmqxnjpjdU1aQBsy5rhFssSOcizIV7GrOcsCGoilTceonPtLp8xX2mt/WQJhPHrAUmZks5uPNNYDXv9a8BoLeTYKzbFoz7GNvoxEUfmFV2W2jr/szfpnbmvRMqKgErsJDlc2b/oaD0EKUJOdu8eNNuOpLKZSPiMQstmDZtQ65boOuXVudAx3T1zFaDhhP3PZwG6KLwnrf0ttLRSdIW5Mm+SzEHuJXp2qwBPyAQJIKJLqqu/OUeNorWfz0jFvYyVlNZlTX5ZaxjEj05qj3DAEfokCuueNY+KFccdouMQX0ks3of4/WKLYH1BL743Binc5SYgK38xA7bzwcjFyyEBQFoc9FayrLkk0Yi/ed2mV1XdBvr7vmFxYDlZQkg425KLtCX7GN/++5FVF01IH1cZa3siJ7XT5EJBu6vxisByHRwPSWWagn2WgvkxHjgAnBcvgYBIcoKsxFBytsyyh3g5fVSWovSnTerr5glwv7cXdyhMAXp1gGL900tjij0BiEWRzKfbiroDjVn0=
+        global:
+                secure: gXXVXUQdzic8X/WhHgPih7zEPOMvzz1o4XudnEgiIGrk5gwVajXLVc0TEVT9uogeuHZxhT0sM7idYmtSXTe6zUBfoV/WXnyfeZVQhI59iy35bWUKdbpPpO9bAafdmMB2d9b3v5QT8iubOPAudVNGENBZiXiGovAJBmqxnjpjdU1aQBsy5rhFssSOcizIV7GrOcsCGoilTceonPtLp8xX2mt/WQJhPHrAUmZks5uPNNYDXv9a8BoLeTYKzbFoz7GNvoxEUfmFV2W2jr/szfpnbmvRMqKgErsJDlc2b/oaD0EKUJOdu8eNNuOpLKZSPiMQstmDZtQ65boOuXVudAx3T1zFaDhhP3PZwG6KLwnrf0ttLRSdIW5Mm+SzEHuJXp2qwBPyAQJIKJLqqu/OUeNorWfz0jFvYyVlNZlTX5ZaxjEj05qj3DAEfokCuueNY+KFccdouMQX0ks3of4/WKLYH1BL743Binc5SYgK38xA7bzwcjFyyEBQFoc9FayrLkk0Yi/ed2mV1XdBvr7vmFxYDlZQkg425KLtCX7GN/++5FVF01IH1cZa3siJ7XT5EJBu6vxisByHRwPSWWagn2WgvkxHjgAnBcvgYBIcoKsxFBytsyyh3g5fVSWovSnTerr5glwv7cXdyhMAXp1gGL900tjij0BiEWRzKfbiroDjVn0=

BGAnimations/flash/default.lua

@@ -1,9 +1,9 @@
 local flashColor = color(Var "Color1")
 return Def.Quad {
-	InitCommand=function(self)
-		self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH*2,SCREEN_HEIGHT*2):diffuse(flashColor)
-	end;
-	GainFocusCommand=function(self)
+	InitCommand = function(self)
+		self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2):diffuse(flashColor)
+	end,
+	GainFocusCommand = function(self)
 		self:finishtweening():diffusealpha(1):accelerate(0.6):diffusealpha(0)
-	end;
-};
+	end
+}

BGAnimations/white flash/default.lua

@@ -1,8 +1,8 @@
-return Def.Quad {    
-    InitCommand=function(self)
-    	self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH*2,SCREEN_HEIGHT*2)
-    end;
-    GainFocusCommand=function(self)
-    	self:finishtweening():diffusealpha(1):accelerate(0.6):diffusealpha(0)
-    end;
-};
+return Def.Quad {
+	InitCommand = function(self)
+		self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2)
+	end,
+	GainFocusCommand = function(self)
+		self:finishtweening():diffusealpha(1):accelerate(0.6):diffusealpha(0)
+	end
+}

BGAnimations/white reverse flash/default.lua

@@ -1,8 +1,8 @@
-return Def.Quad {    
-    InitCommand=function(self)
-    	self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH*2,SCREEN_HEIGHT*2)
-    end;
-    GainFocusCommand=function(self)
-    	self:finishtweening():diffusealpha(0):accelerate(0.6):diffusealpha(1)
-    end;
-};
+return Def.Quad {
+	InitCommand = function(self)
+		self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2)
+	end,
+	GainFocusCommand = function(self)
+		self:finishtweening():diffusealpha(0):accelerate(0.6):diffusealpha(1)
+	end
+}

BGAnimations/yellow flash/default.lua

@@ -1,8 +1,8 @@
 return Def.Quad {
-    InitCommand=function(self)
-    	self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH*2,SCREEN_HEIGHT*2)
-    end;
-    GainFocusCommand=function(self)
-    	self:finishtweening():diffuse(color("#FFFFA0")):accelerate(0.6):diffusealpha(0)
-    end;
-};
+	InitCommand = function(self)
+		self:x(SCREEN_CENTER_X):y(SCREEN_CENTER_Y):scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2)
+	end,
+	GainFocusCommand = function(self)
+		self:finishtweening():diffuse(color("#FFFFA0")):accelerate(0.6):diffusealpha(0)
+	end
+}

BackgroundEffects/Centered.lua

@@ -1,21 +1,23 @@
-local Color1 = color(Var "Color1");
+local Color1 = color(Var "Color1")
 
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand= function(self)
-			self:xy(_screen.cx, _screen.cy):diffuse(Color1):effectclock("music")
-			-- Explanation in StretchNoLoop.lua.
-			if self.GetTexture then
-				self:GetTexture():rate(self:GetParent():GetUpdateRate())
+local t =
+	Def.ActorFrame {
+	LoadActor(Var "File1") ..
+		{
+			OnCommand = function(self)
+				self:xy(_screen.cx, _screen.cy):diffuse(Color1):effectclock("music")
+				-- Explanation in StretchNoLoop.lua.
+				if self.GetTexture then
+					self:GetTexture():rate(self:GetParent():GetUpdateRate())
+				end
+			end,
+			GainFocusCommand = function(self)
+				self:play()
+			end,
+			LoseFocusCommand = function(self)
+				self:pause()
 			end
-		end,
-		GainFocusCommand=function(self)
-			self:play()
-		end;
-		LoseFocusCommand=function(self)
-			self:pause()
-		end;
-	};
-};
+		}
+}
 
-return t;
+return t