Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
This commit is contained in:
SoftCoder
commit
83ece3d7c8
|
|
@ -1 +1 @@
|
|||
Subproject commit 0ebb6df9491841a83a872d2a95291e6ee6f17750
|
||||
Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7
|
||||
|
|
@ -3,6 +3,13 @@ MEGAGLEST CHANGELOG
|
|||
|
||||
To see a timeline of detail changes please visit:
|
||||
https://github.com/MegaGlest/megaglest-source/commits/master
|
||||
|
||||
v3.12.0
|
||||
- MegaGlest uses SDL2 now
|
||||
- glowing meshes. ( models can glow like particles do )
|
||||
- console message for finished upgrades
|
||||
- new parameter to set servers titles
|
||||
|
||||
v3.11.1
|
||||
- no more false clicks when commanding via mini map
|
||||
- map editor has a more useful and powerful map height randomizer
|
||||
|
|
|
|||
|
|
@ -85,8 +85,7 @@ cd "$RELEASEDIR"
|
|||
mkdir -p "$RELEASEDIR/docs/"
|
||||
cd "$RELEASEDIR/docs/"
|
||||
git archive --remote ${REPODIR}/data/glest_game/ HEAD:docs | tar x
|
||||
git archive --remote ${REPODIR} HEAD:docs/ CHANGELOG.txt | tar x
|
||||
git archive --remote ${REPODIR} HEAD:docs/ README.txt | tar x
|
||||
git archive --remote ${REPODIR} HEAD:docs | tar x
|
||||
|
||||
cd "$RELEASEDIR"
|
||||
mkdir -p "$RELEASEDIR/maps/"
|
||||
|
|
|
|||
|
|
@ -39,26 +39,6 @@ cd docs
|
|||
git archive --remote ${REPODIR} HEAD:docs | tar x
|
||||
cd "$RELEASEDIR"
|
||||
|
||||
echo "Exporting files in mk/linux ..."
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ glest.ini | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/shared/ glestkeys.ini | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/shared/ servers.ini | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/shared/ glest.ico | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.bmp | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.png | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.xpm | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest.desktop | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest_editor.desktop | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ megaglest_g3dviewer.desktop | tar x
|
||||
|
||||
echo "Exporting files in data/glest_game ..."
|
||||
git archive --remote ${REPODIR} HEAD:mk/shared/ megaglest.ico | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/shared/ g3dviewer.ico | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/shared/ editor.ico | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest_g3dviewer | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ start_megaglest_mapeditor | tar x
|
||||
git archive --remote ${REPODIR} HEAD:mk/linux/ setupBuildDeps.sh | tar x
|
||||
git archive --remote ${REPODIR} HEAD: CMakeLists.txt | tar x
|
||||
|
||||
# exit 1
|
||||
|
|
|
|||
|
|
@ -178,7 +178,6 @@ cmake \
|
|||
-DMOJOSETUP_INPUT_XZ=TRUE \
|
||||
-DMOJOSETUP_BUILD_LUAC=TRUE \
|
||||
-DMOJOSETUP_GUI_GTKPLUS2=TRUE \
|
||||
-DMOJOSETUP_GUI_GTKPLUS2_STATIC=TRUE \
|
||||
-DMOJOSETUP_GUI_NCURSES=TRUE \
|
||||
-DMOJOSETUP_GUI_NCURSES_STATIC=TRUE \
|
||||
-DMOJOSETUP_GUI_STDIO=TRUE \
|
||||
|
|
@ -220,8 +219,9 @@ for feh in *.so *.dll *.dylib ; do
|
|||
done
|
||||
|
||||
# Compile the Lua scripts, put them in the base archive.
|
||||
for feh in ../scripts/*.lua ; do
|
||||
./mojoluac $LUASTRIPOPT -o ../image/scripts/${feh}c $feh
|
||||
for feh in ../mojosetup/scripts/*.lua ; do
|
||||
feh_b="$(basename $feh)"
|
||||
./mojoluac $LUASTRIPOPT -o ../image/scripts/${feh_b}c $feh
|
||||
done
|
||||
|
||||
# Don't want the example config...use our's instead.
|
||||
|
|
@ -235,20 +235,22 @@ rm -f ../image/scripts/app_localization.luac
|
|||
# Fill in the rest of the Base Archive...
|
||||
cd ..
|
||||
|
||||
# Compress the main data archive
|
||||
cd data
|
||||
#${megaglest_archiver_app_data} ${megaglest_archivefilename_data}
|
||||
tar -cf - * | xz > ../$megaglest_archivefilename_data
|
||||
# now remove everything except for the docs folder and the data archive
|
||||
shopt -s extglob
|
||||
rm -rf !(docs|$megaglest_archivefilename_data)
|
||||
# now remove everything in the docs except files listed in config.lua
|
||||
cd docs
|
||||
rm -rf !(gnu_gpl_*.txt|cc-by-sa-*-unported.txt|README.txt)
|
||||
cd ..
|
||||
if [ $REPACKONLY -eq 0 ]; then
|
||||
# Compress the main data archive
|
||||
cd data
|
||||
#${megaglest_archiver_app_data} ${megaglest_archivefilename_data}
|
||||
tar -cf - * | xz > ../$megaglest_archivefilename_data
|
||||
# now remove everything except for the docs folder and the data archive
|
||||
rm -rf !(docs|${megaglest_archivefilename_data})
|
||||
# now remove everything in the docs except files listed in config.lua
|
||||
cd docs
|
||||
rm -rf !(gnu_gpl_*.txt|cc-by-sa-*-unported.txt|README.txt)
|
||||
cd ..
|
||||
|
||||
cd ..
|
||||
mv -f $megaglest_archivefilename_data data/
|
||||
cd ..
|
||||
mv -f $megaglest_archivefilename_data data/
|
||||
fi
|
||||
|
||||
cp -R data/* image/data/
|
||||
cp meta/* image/meta/
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 56568ec29653c07334c149ab4f7c2b312ae8213b
|
||||
Subproject commit 0bc051300e71b01d332f03e6e7acb7d066052052
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
Name "${APNAME} ${APVER}"
|
||||
SetCompressor /FINAL /SOLID lzma
|
||||
SetCompressorDictSize 64
|
||||
OutFile "${APNAME}-Installer-${APVER}_i386_win32.exe"
|
||||
OutFile "${APNAME}-Installer-${APVER}_windows_XXbit.exe"
|
||||
Icon "..\..\shared\megaglest.ico"
|
||||
UninstallIcon "..\..\shared\megaglest.ico"
|
||||
!define MUI_ICON "..\..\shared\megaglest.ico"
|
||||
|
|
@ -68,6 +68,10 @@ Function .onInit
|
|||
InitPluginsDir
|
||||
FunctionEnd
|
||||
|
||||
Function un.onInit
|
||||
InitPluginsDir
|
||||
FunctionEnd
|
||||
|
||||
Function myGUIInit
|
||||
SetOutPath '$PLUGINSDIR'
|
||||
File megaglestinstallscreen.jpg
|
||||
|
|
@ -226,9 +230,9 @@ Section "${APNAME} (required)"
|
|||
; Set output path to the installation directory.
|
||||
SetOutPath $INSTDIR
|
||||
; Put file there
|
||||
File /NONFATAL "..\megaglest.exe"
|
||||
File /NONFATAL "..\megaglest_editor.exe"
|
||||
File /NONFATAL "..\megaglest_g3dviewer.exe"
|
||||
File /NONFATAL "..\..\..\data\glest_game\megaglest.exe"
|
||||
File /NONFATAL "..\..\..\data\glest_game\megaglest_editor.exe"
|
||||
File /NONFATAL "..\..\..\data\glest_game\megaglest_g3dviewer.exe"
|
||||
|
||||
File /NONFATAL "..\megaglestx64.exe"
|
||||
File /NONFATAL "..\megaglest_editorx64.exe"
|
||||
|
|
@ -240,39 +244,37 @@ Section "${APNAME} (required)"
|
|||
File "..\glest.ini"
|
||||
File "..\..\shared\glestkeys.ini"
|
||||
File "..\..\shared\servers.ini"
|
||||
File /NONFATAL "..\openal32.dll"
|
||||
File /NONFATAL "..\..\..\data\glest_game\openal32.dll"
|
||||
File /NONFATAL "..\openal64.dll"
|
||||
|
||||
File "..\NetworkThrottleFix.reg"
|
||||
|
||||
File /NONFATAL "..\libvlccore.dll"
|
||||
File /NONFATAL "..\libvlc.dll"
|
||||
File /NONFATAL /r /x .git /x .svn /x mydata "..\plugins"
|
||||
File /NONFATAL /r /x .git /x .svn /x mydata "..\lua"
|
||||
#File /NONFATAL "..\libvlccore.dll"
|
||||
#File /NONFATAL "..\libvlc.dll"
|
||||
#File /NONFATAL /r /x .gitignore /x .svn /x mydata "..\plugins"
|
||||
#File /NONFATAL /r /x .gitignore /x .svn /x mydata "..\lua"
|
||||
|
||||
SetOutPath "$INSTDIR\blender\"
|
||||
File /NONFATAL "..\xml2g.exe"
|
||||
File /NONFATAL "..\g2xml.exe"
|
||||
#File /NONFATAL "..\..\..\data\glest_game\xml2g.exe"
|
||||
#File /NONFATAL "..\..\..\data\glest_game\g2xml.exe"
|
||||
|
||||
File /NONFATAL "..\xml2gx64.exe"
|
||||
File /NONFATAL "..\g2xmlx64.exe"
|
||||
#File /NONFATAL "..\xml2gx64.exe"
|
||||
#File /NONFATAL "..\g2xmlx64.exe"
|
||||
|
||||
File /r /x .git /x .svn /x mydata /x g2xml /x xml2g "..\..\..\source\tools\glexemel\*.*"
|
||||
File /r /x .gitignore /x .svn /x mydata /x g2xml /x xml2g "..\..\..\source\tools\glexemel\*.py"
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
File /r /x .git /x .svn /x mydata /x cegui "..\..\..\data\glest_game\data"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\docs"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\maps"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\scenarios"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\techs"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\tilesets"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\tutorials"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\data"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\docs"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\maps"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\scenarios"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\techs"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\tilesets"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\data\glest_game\tutorials"
|
||||
|
||||
SetOutPath "$INSTDIR\docs\"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\docs\*.*"
|
||||
|
||||
SetOutPath "$INSTDIR\data\core\misc_textures\flags"
|
||||
File /r /x .git /x .svn /x mydata "..\..\..\data\glest_game\data\core\misc_textures\flags\*.*"
|
||||
File /r /x .gitignore /x .svn /x mydata "..\..\..\docs\*.*"
|
||||
|
||||
SetOutPath $INSTDIR
|
||||
|
||||
; Write the installation path into the registry
|
||||
|
|
@ -306,20 +308,19 @@ Section "Start Menu Shortcuts"
|
|||
CreateDirectory "$SMPROGRAMS\${APNAME}"
|
||||
CreateDirectory "$APPDATA\megaglest"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
|
||||
|
||||
${If} ${FileExists} "$INSTDIR\megaglest.exe"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
|
||||
${ElseIf} ${FileExists} "$INSTDIR\megaglestx64.exe"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglestx64.exe" "" "$INSTDIR\megaglestx64.exe" 0 "" "" "${APNAME}"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editorx64.exe" "" "$INSTDIR\megaglest_editorx64.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewerx64.exe" "" "$INSTDIR\megaglest_g3dviewerx64.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
|
||||
${EndIf}
|
||||
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Main.lnk" "$INSTDIR" "" "" 0 "" "" "This folder is the ${APNAME} installation folder"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} User Data.lnk" "$APPDATA\megaglest" "" "" 0 "" "" "This folder contains downloaded data (such as mods) and your personal ${APNAME} configuration"
|
||||
|
||||
${If} ${FileExists} "$INSTDIR\megaglest.exe"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewer.exe" "" "$INSTDIR\megaglest_g3dviewer.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editor.exe" "" "$INSTDIR\megaglest_editor.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglest.exe" "" "$INSTDIR\megaglest.exe" 0 "" "" "${APNAME}"
|
||||
${ElseIf} ${FileExists} "$INSTDIR\megaglestx64.exe"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} G3D Viewer.lnk" "$INSTDIR\megaglest_g3dviewerx64.exe" "" "$INSTDIR\megaglest_g3dviewerx64.exe" 0 "" "" "${APNAME} MegaGlest G3D Viewer"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME} Map Editor.lnk" "$INSTDIR\megaglest_editorx64.exe" "" "$INSTDIR\megaglest_editorx64.exe" 0 "" "" "${APNAME} MegaGlest Map Editor"
|
||||
CreateShortCut "$SMPROGRAMS\${APNAME}\${APNAME}.lnk" "$INSTDIR\megaglestx64.exe" "" "$INSTDIR\megaglestx64.exe" 0 "" "" "${APNAME}"
|
||||
${EndIf}
|
||||
|
||||
SectionEnd
|
||||
|
||||
;--------------------------------
|
||||
|
|
|
|||
|
|
@ -5212,11 +5212,17 @@ int glestMain(int argc, char** argv) {
|
|||
vector<string> paramPartTokens;
|
||||
Tokenize(mapName,paramPartTokens,"=");
|
||||
if(paramPartTokens.size() >= 2 && paramPartTokens[1].length() > 0) {
|
||||
string autoloadMapName = paramPartTokens[1];
|
||||
vector<string> paramPartTokens2;
|
||||
string tileset="forest";
|
||||
Tokenize(paramPartTokens[1],paramPartTokens2,",");
|
||||
if(paramPartTokens2.size() >= 2 && paramPartTokens2[1].length() > 0) {
|
||||
tileset = paramPartTokens2[1];
|
||||
}
|
||||
string autoloadMapName = paramPartTokens2[0];
|
||||
|
||||
GameSettings *gameSettings = &startupGameSettings;
|
||||
gameSettings->setMap(autoloadMapName);
|
||||
gameSettings->setTileset("forest");
|
||||
gameSettings->setTileset(tileset);
|
||||
gameSettings->setTech("megapack");
|
||||
gameSettings->setDefaultUnits(false);
|
||||
gameSettings->setDefaultResources(false);
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ void printParameterHelp(const char *argv0, bool foundInvalidArgs) {
|
|||
printf("\n%s=x\t\t\tAuto load a mod by mod pathname.",GAME_ARGS[GAME_ARG_MOD]);
|
||||
|
||||
// "================================================================================"
|
||||
printf("\n%s=x\t\t\tAuto Preview a map by map name.",GAME_ARGS[GAME_ARG_PREVIEW_MAP]);
|
||||
printf("\n%s=Map,Tileset\tAuto Preview a map by map name. (tileset is optional)",GAME_ARGS[GAME_ARG_PREVIEW_MAP]);
|
||||
printf("\n%s\t\t\tdisplays the version string of this program.",GAME_ARGS[GAME_ARG_VERSION]);
|
||||
printf("\n%s\t\t\tdisplays your video driver's OpenGL info.",GAME_ARGS[GAME_ARG_OPENGL_INFO]);
|
||||
printf("\n%s\t\t\tdisplays your SDL version information.",GAME_ARGS[GAME_ARG_SDL_INFO]);
|
||||
|
|
|
|||
Loading…
Reference in New Issue