merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2019 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 8 insertions, 7 deletions

diff --git a/Lua/installer/settings/files_main_install.nsh b/Lua/installer/settings/files_main_install.nsh
index 605725aa..c2cdf727 100644
--- a/Lua/installer/settings/files_main_install.nsh
+++ b/Lua/installer/settings/files_main_install.nsh
@@ -4,25 +4,26 @@
 

 ; Create Directories:

 

-CreateDirectory $INSTDIR\plugins

-CreateDirectory $INSTDIR\songs

-CreateDirectory $INSTDIR\screenshots

-CreateDirectory $INSTDIR\playlists

+CreateDirectory $INSTDIR\Plugins

+CreateDirectory $INSTDIR\Songs

+CreateDirectory $INSTDIR\Screenshots

+CreateDirectory $INSTDIR\Playlists

+CreateDirectory $INSTDIR\Covers

 

 SetOutPath "$INSTDIR"

 

-; themes, languages, sounds, visuals dir

+; themes, languages, sounds, fonts, visuals dir

 

 File /r ..\game\themes

 File /r ..\game\languages

 File /r ..\game\sounds

+File /r ..\game\fonts

 File /r ..\installerdependencies\visuals

 

 ; Root dir:

 

 File ..\installerdependencies\dll\*.dll

 

-

 File ..\ChangeLog.txt

 File ..\ChangeLog.german.txt

 File ..\README.txt

@@ -34,7 +35,7 @@ File "..\${exe}.exe"
 

 ; Covers dir:

 

-SetOutPath "$INSTDIR\covers"

+SetOutPath "$INSTDIR\Covers"

 

 IfFileExists $INSTDIR\covers\covers.ini +2 0

 File ..\game\covers\Covers.ini