From 1469a9e3962efb37b4a436ade4c202f25ed0669c Mon Sep 17 00:00:00 2001 From: "auria.mg" Date: Tue, 7 Jun 2016 19:49:33 -0400 Subject: [PATCH 1/5] Update pot file, slightly breaking string freeze. Sorry about that, better late than never :S --- data/po/supertuxkart.pot | 103 +++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 47 deletions(-) diff --git a/data/po/supertuxkart.pot b/data/po/supertuxkart.pot index 8e5cd9902..6d7bd51c4 100644 --- a/data/po/supertuxkart.pot +++ b/data/po/supertuxkart.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: supertuxkart\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-23 09:00-0400\n" +"POT-Creation-Date: 2016-05-30 18:52-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -196,7 +196,7 @@ msgstr "" #: src/states_screens/arenas_screen.cpp:83 #: src/states_screens/easter_egg_screen.cpp:145 #: src/states_screens/grand_prix_editor_screen.cpp:327 -#: src/states_screens/kart_selection.cpp:287 +#: src/states_screens/kart_selection.cpp:286 #: src/states_screens/tracks_and_gp_screen.cpp:148 msgid "Add-Ons" msgstr "" @@ -216,7 +216,7 @@ msgstr "" #: src/states_screens/edit_track_screen.cpp:147 #: src/states_screens/gp_info_screen.cpp:76 #: src/states_screens/grand_prix_editor_screen.cpp:324 -#: src/states_screens/kart_selection.cpp:279 +#: src/states_screens/kart_selection.cpp:278 #: src/states_screens/options_screen_video.cpp:389 #: src/states_screens/tracks_and_gp_screen.cpp:138 #: src/states_screens/tracks_screen.cpp:142 @@ -453,7 +453,7 @@ msgstr "" #. I18N: In soccer setup screen #. I18N: ./data/gui/tutorial_message_dialog.stkgui #. I18N: Button in tutorial -#: src/states_screens/race_result_gui.cpp:203 +#: src/states_screens/race_result_gui.cpp:205 msgid "Continue" msgstr "" @@ -795,7 +795,7 @@ msgstr "" #. I18N: In the user screen #. I18N: ./data/gui/user_screen_tab.stkgui #. I18N: In the user screen -#: src/states_screens/main_menu_screen.cpp:77 +#: src/states_screens/main_menu_screen.cpp:78 #: src/states_screens/online_profile_friends.cpp:222 msgid "Online" msgstr "" @@ -933,7 +933,7 @@ msgstr "" #. I18N: Difficulty #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Difficulty -#: src/race/race_manager.hpp:542 +#: src/race/race_manager.hpp:544 #: src/states_screens/ghost_replay_selection.cpp:120 msgid "Novice" msgstr "" @@ -944,7 +944,7 @@ msgstr "" #. I18N: Difficulty #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Difficulty -#: src/race/race_manager.hpp:543 +#: src/race/race_manager.hpp:545 #: src/states_screens/ghost_replay_selection.cpp:120 msgid "Intermediate" msgstr "" @@ -955,7 +955,7 @@ msgstr "" #. I18N: Difficulty #. I18N: ./data/gui/select_challenge.stkgui #. I18N: Difficulty -#: src/race/race_manager.hpp:544 +#: src/race/race_manager.hpp:546 #: src/states_screens/ghost_replay_selection.cpp:119 msgid "Expert" msgstr "" @@ -964,7 +964,7 @@ msgstr "" #. I18N: Difficulty #. I18N: ./data/gui/race_setup.stkgui #. I18N: Difficulty -#: src/race/race_manager.hpp:545 +#: src/race/race_manager.hpp:547 #: src/states_screens/ghost_replay_selection.cpp:118 msgid "SuperTux" msgstr "" @@ -996,7 +996,7 @@ msgstr "" #. I18N: ./data/gui/online/guest_login.stkgui #. I18N: ./data/gui/user_screen.stkgui -#: src/states_screens/main_menu_screen.cpp:78 +#: src/states_screens/main_menu_screen.cpp:79 msgid "Login" msgstr "" @@ -1544,7 +1544,7 @@ msgstr "" #. I18N: ./data/gui/race_paused_dialog.stkgui #. I18N: Race paused button -#: src/states_screens/race_result_gui.cpp:226 +#: src/states_screens/race_result_gui.cpp:228 msgid "Setup New Race" msgstr "" @@ -1699,6 +1699,10 @@ msgstr "" msgid "Hacienda" msgstr "" +#. I18N: ../stk-assets/tracks/icy_soccer_field/track.xml +msgid "Icy Soccer Field" +msgstr "" + #. I18N: Cutscene subtitle from ../stk-assets/tracks/introcutscene2/scene.xml #. I18N: ../stk-assets/tracks/introcutscene2/scene.xml msgid "What's wrong, little hippies? Your great gnu leader is missing?" @@ -1778,6 +1782,10 @@ msgstr "" msgid "Temple" msgstr "" +#. I18N: ../stk-assets/tracks/volcano_island/track.xml +msgid "Volcan Island" +msgstr "" + #. I18N: ../stk-assets/tracks/xr591/track.xml msgid "XR591" msgstr "" @@ -1934,12 +1942,12 @@ msgid "" "created." msgstr "" -#: src/graphics/irr_driver.cpp:1895 +#: src/graphics/irr_driver.cpp:1896 #, c-format msgid "FPS: %d/%d/%d - PolyCount: %d Solid, %d Shadows - LightDist : %d" msgstr "" -#: src/graphics/irr_driver.cpp:1906 +#: src/graphics/irr_driver.cpp:1907 #, c-format msgid "FPS: %d/%d/%d - %d KTris" msgstr "" @@ -2626,7 +2634,7 @@ msgstr "" msgid "You finished the race!" msgstr "" -#: src/main.cpp:1234 +#: src/main.cpp:1296 msgid "" "SuperTuxKart may connect to a server to download add-ons and notify you of " "updates. We also collect anonymous hardware statistics to help with the " @@ -2636,12 +2644,12 @@ msgid "" "edit \"Connect to the Internet\" and \"Send anonymous HW statistics\")." msgstr "" -#: src/main.cpp:1384 +#: src/main.cpp:1446 msgid "" "Your driver version is too old. Please install the latest video drivers." msgstr "" -#: src/main.cpp:1396 +#: src/main.cpp:1458 msgid "" "Your OpenGL version appears to be too old. Please verify if an update for " "your video driver is available. SuperTuxKart requires OpenGL 3.1 or better." @@ -2679,11 +2687,11 @@ msgstr "" msgid "WRONG WAY!" msgstr "" -#: src/modes/world.cpp:1196 +#: src/modes/world.cpp:1208 msgid "You have been eliminated!" msgstr "" -#: src/modes/world.cpp:1199 +#: src/modes/world.cpp:1211 #, c-format msgid "'%s' has been eliminated." msgstr "" @@ -2827,7 +2835,7 @@ msgid "Please wait while addons are updated" msgstr "" #: src/states_screens/addons_screen.cpp:512 -#: src/states_screens/main_menu_screen.cpp:550 +#: src/states_screens/main_menu_screen.cpp:553 msgid "" "Sorry, an error occurred while contacting the add-ons website. Make sure you " "are connected to the Internet and that SuperTuxKart is not blocked by a " @@ -2840,7 +2848,7 @@ msgstr "" #. I18N: track group name #: src/states_screens/arenas_screen.cpp:81 #: src/states_screens/easter_egg_screen.cpp:143 -#: src/states_screens/kart_selection.cpp:285 +#: src/states_screens/kart_selection.cpp:284 #: src/states_screens/tracks_and_gp_screen.cpp:146 msgid "standard" msgstr "" @@ -3263,16 +3271,16 @@ msgid "User defined" msgstr "" #. I18N: when failing a GP -#: src/states_screens/grand_prix_lose.cpp:150 +#: src/states_screens/grand_prix_lose.cpp:153 msgid "Better luck next time!" msgstr "" -#: src/states_screens/grand_prix_win.cpp:125 -#: src/states_screens/race_result_gui.cpp:192 +#: src/states_screens/grand_prix_win.cpp:126 +#: src/states_screens/race_result_gui.cpp:194 msgid "You completed a challenge!" msgstr "" -#: src/states_screens/grand_prix_win.cpp:281 +#: src/states_screens/grand_prix_win.cpp:283 msgid "You completed the Grand Prix!" msgstr "" @@ -3291,25 +3299,25 @@ msgid "" "Press the 'Select' button to join the game" msgstr "" -#: src/states_screens/main_menu_screen.cpp:489 +#: src/states_screens/main_menu_screen.cpp:492 msgid "" "You can not play online without internet access. If you want to play online, " "go to options, select tab 'User Interface', and edit \"Connect to the " "Internet\"." msgstr "" -#: src/states_screens/main_menu_screen.cpp:513 +#: src/states_screens/main_menu_screen.cpp:516 msgid "" "You can not download addons without internet access. If you want to download " "addons, go to options, select tab 'User Interface', and edit \"Connect to " "the Internet\"." msgstr "" -#: src/states_screens/main_menu_screen.cpp:545 +#: src/states_screens/main_menu_screen.cpp:548 msgid "The add-ons module is currently disabled in the Options screen" msgstr "" -#: src/states_screens/main_menu_screen.cpp:557 +#: src/states_screens/main_menu_screen.cpp:560 msgid "Please wait while the add-ons are loading" msgstr "" @@ -3634,20 +3642,20 @@ msgid "GOAL!" msgstr "" #. I18N: string used to show the author of the music. (e.g. "Sunny Song" by "John Doe") -#: src/states_screens/race_gui_base.cpp:502 +#: src/states_screens/race_gui_base.cpp:504 msgid "by" msgstr "" -#: src/states_screens/race_gui_base.cpp:610 +#: src/states_screens/race_gui_base.cpp:612 msgid "Collect nitro!" msgstr "" -#: src/states_screens/race_gui_base.cpp:612 +#: src/states_screens/race_gui_base.cpp:614 msgid "Follow the leader!" msgstr "" #. I18N: When some GlobalPlayerIcons are hidden, write "Top 10" to show it -#: src/states_screens/race_gui_base.cpp:778 +#: src/states_screens/race_gui_base.cpp:780 #, c-format msgid "Top %i" msgstr "" @@ -3673,40 +3681,40 @@ msgstr "" msgid "Press fire to start the challenge" msgstr "" -#: src/states_screens/race_result_gui.cpp:173 +#: src/states_screens/race_result_gui.cpp:175 msgid "Continue." msgstr "" -#: src/states_screens/race_result_gui.cpp:176 +#: src/states_screens/race_result_gui.cpp:178 msgid "Quit the server." msgstr "" -#: src/states_screens/race_result_gui.cpp:193 +#: src/states_screens/race_result_gui.cpp:195 msgid "You completed challenges!" msgstr "" -#: src/states_screens/race_result_gui.cpp:206 +#: src/states_screens/race_result_gui.cpp:208 msgid "Abort Grand Prix" msgstr "" -#: src/states_screens/race_result_gui.cpp:216 +#: src/states_screens/race_result_gui.cpp:218 msgid "Restart" msgstr "" -#: src/states_screens/race_result_gui.cpp:222 +#: src/states_screens/race_result_gui.cpp:224 msgid "Back to challenge selection" msgstr "" -#: src/states_screens/race_result_gui.cpp:228 +#: src/states_screens/race_result_gui.cpp:230 msgid "Back to the menu" msgstr "" -#: src/states_screens/race_result_gui.cpp:371 +#: src/states_screens/race_result_gui.cpp:373 msgid "Do you really want to abort the Grand Prix?" msgstr "" -#: src/states_screens/race_result_gui.cpp:513 -#: src/states_screens/race_result_gui.cpp:884 +#: src/states_screens/race_result_gui.cpp:498 +#: src/states_screens/race_result_gui.cpp:861 msgid "Eliminated" msgstr "" @@ -3722,21 +3730,22 @@ msgstr "" msgid "It's a draw" msgstr "" -#: src/states_screens/race_result_gui.cpp:1105 -#: src/states_screens/race_result_gui.cpp:1153 +#. I18N: indicates a player that scored in their own goal in result screen +#: src/states_screens/race_result_gui.cpp:1106 +#: src/states_screens/race_result_gui.cpp:1154 msgid "(Own Goal)" msgstr "" -#: src/states_screens/race_result_gui.cpp:1218 +#: src/states_screens/race_result_gui.cpp:1219 #, c-format msgid "Track %i/%i" msgstr "" -#: src/states_screens/race_result_gui.cpp:1302 +#: src/states_screens/race_result_gui.cpp:1303 msgid "Grand Prix progress:" msgstr "" -#: src/states_screens/race_result_gui.cpp:1340 +#: src/states_screens/race_result_gui.cpp:1341 msgid "Highscores" msgstr "" From d234954e1432b6a498bfabd31b14264adf499320 Mon Sep 17 00:00:00 2001 From: Benau Date: Wed, 8 Jun 2016 08:40:33 +0800 Subject: [PATCH 2/5] Call enterRaceOverState from base class for 3SB too --- src/modes/three_strikes_battle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp index 2cf5db320..c770d82a0 100644 --- a/src/modes/three_strikes_battle.cpp +++ b/src/modes/three_strikes_battle.cpp @@ -535,6 +535,8 @@ void ThreeStrikesBattle::getKartsDisplayInfo( //----------------------------------------------------------------------------- void ThreeStrikesBattle::enterRaceOverState() { + WorldWithRank::enterRaceOverState(); + if (UserConfigParams::m_arena_ai_stats) { float runtime = (irr_driver->getRealTime()-m_start_time)*0.001f; @@ -545,7 +547,5 @@ void ThreeStrikesBattle::enterRaceOverState() delete this; main_loop->abort(); } - else - WorldStatus::enterRaceOverState(); -} // enterRaceOverState +} // enterRaceOverState From 88dd5512291b946a168e43097e0f5c87a3a25ab8 Mon Sep 17 00:00:00 2001 From: LoadingPleaseWait Date: Tue, 7 Jun 2016 23:37:14 -0500 Subject: [PATCH 3/5] Toggle graphical options from command line --- src/main.cpp | 78 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e4328463d..82e0a414b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -469,7 +469,7 @@ void setupRaceStart() Log::warn("main", "Kart '%s' is unknown so will use the " "default kart.", UserConfigParams::m_default_kart.c_str()); - race_manager->setPlayerKart(0, + race_manager->setPlayerKart(0, UserConfigParams::m_default_kart.getDefaultValue()); } else @@ -535,7 +535,7 @@ void cmdLineHelp() // " n=2: recorded key strokes\n" // " --test-ai=n Use the test-ai for every n-th AI kart.\n" // " (so n=1 means all Ais will be the test ai)\n" - // " + // " " --server=name Start a server (not a playing client).\n" " --lan-server=name Start a LAN server (not a playing client).\n" " --server-password= Sets a password for a server (both client&server).\n" @@ -705,6 +705,72 @@ int handleCmdLinePreliminary() if(CommandLine::has("--windowed") || CommandLine::has("-w")) UserConfigParams::m_fullscreen = false; + // toggle graphical options + if (CommandLine::has("--enable-glow")) + UserConfigParams::m_glow = true; + else if (CommandLine::has("--disable-glow")) + UserConfigParams::m_glow = false; + if (CommandLine::has("--enable-bloom")) + UserConfigParams::m_bloom = true; + else if (CommandLine::has("--disable-bloom")) + UserConfigParams::m_bloom = false; + if (CommandLine::has("--enable-light-shaft")) + UserConfigParams::m_light_shaft = true; + else if (CommandLine::has("--disable-light-shaft")) + UserConfigParams::m_light_shaft = false; + if (CommandLine::has("--enable-dynamic-lights")) + UserConfigParams::m_dynamic_lights = true; + else if (CommandLine::has("--disable-dynamic-lights")) + UserConfigParams::m_dynamic_lights = false; + // depth of field + if (CommandLine::has("--enable-dof")) + UserConfigParams::m_dof = true; + else if (CommandLine::has("--disable-dof")) + UserConfigParams::m_dof = false; + // global illumination + if (CommandLine::has("--enable-gi")) + UserConfigParams::m_gi = true; + else if (CommandLine::has("--disable-gi")) + UserConfigParams::m_gi = false; + // animated scenery + if (CommandLine::has("--enable-gfx")) + UserConfigParams::m_graphical_effects = true; + else if (CommandLine::has("--disable-gfx")) + UserConfigParams::m_graphical_effects = false; + if (CommandLine::has("--enable-motion-blur")) + UserConfigParams::m_motionblur = true; + else if (CommandLine::has("--disable-motion-blur")) + UserConfigParams::m_motionblur = false; + // anti-aliasing + if (CommandLine::has("--enable-mlaa")) + UserConfigParams::m_mlaa = true; + else if (CommandLine::has("--disable-mlaa")) + UserConfigParams::m_mlaa = false; + if (CommandLine::has("--enable-texture-compression")) + UserConfigParams::m_texture_compression = true; + else if (CommandLine::has("--disable-texture-compression")) + UserConfigParams::m_texture_compression = false; + // screen space ambient occluison + if (CommandLine::has("--enable-ssao")) + UserConfigParams::m_ssao = true; + else if (CommandLine::has("--disable-ssao")) + UserConfigParams::m_ssao = false; + // image based lighting + if (CommandLine::has("--enable-ibl")) + UserConfigParams::m_degraded_IBL = false; + else if (CommandLine::has("--disable-ibl")) + UserConfigParams::m_degraded_IBL = true; + // high definition textures user choice + if (CommandLine::has("--enable-hd-textures")) + UserConfigParams::m_high_definition_textures = 2 | 1; + else if (CommandLine::has("--disable-hd-textures")) + UserConfigParams::m_high_definition_textures = 2; + if (CommandLine::has("--enable-trilinear")) + UserConfigParams::m_trilinear = true; + else if (CommandLine::has("--disable-trilinear")) + UserConfigParams::m_trilinear = false; + + // Enable loading grand prix from local directory if(CommandLine::has("--add-gp-dir", &s)) { @@ -723,6 +789,10 @@ int handleCmdLinePreliminary() UserConfigParams::m_xmas_mode = n; if (CommandLine::has("--easter", &n)) UserConfigParams::m_easter_ear_mode = n; + if (CommandLine::has("--shadows", &n)) + UserConfigParams::m_shadows_resolution = n; + if (CommandLine::has("--anisotropic", &n)) + UserConfigParams::m_anisotropic = n; // Useful for debugging: the temple navmesh needs 12 minutes in debug // mode to compute the distance matrix!! @@ -832,7 +902,7 @@ int handleCmdLine() NetworkConfig::get()->setIsWAN(); STKHost::create(); Log::info("main", "Creating a WAN server '%s'.", s.c_str()); - } + } if (CommandLine::has("--lan-server", &s)) { NetworkConfig::get()->setServerName(core::stringw(s.c_str())); @@ -840,7 +910,7 @@ int handleCmdLine() NetworkConfig::get()->setIsLAN(); STKHost::create(); Log::info("main", "Creating a LAN server '%s'.", s.c_str()); - } + } if (CommandLine::has("--server-password", &s)) { NetworkConfig::get()->setPassword(s); From 8e886b796ad1857eba10bdb75c80cee2bbc6e526 Mon Sep 17 00:00:00 2001 From: "auria.mg" Date: Wed, 8 Jun 2016 19:54:17 -0400 Subject: [PATCH 4/5] Improve python script that sets translation authors to be able to process all files at once --- data/po/update_po_authors.py | 124 ++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 60 deletions(-) diff --git a/data/po/update_po_authors.py b/data/po/update_po_authors.py index 1eceb2452..360aef89b 100755 --- a/data/po/update_po_authors.py +++ b/data/po/update_po_authors.py @@ -1,5 +1,5 @@ #!/usr/bin/env python - +# -*- coding: utf-8 -*- # A simple script that adds all authors from transifex, which are # listed in comments at the beginning of the file, to the # 'translator-credits' translations - where launchpad added them @@ -19,75 +19,79 @@ import re import sys if __name__ == "__main__": - if len(sys.argv)!=2: + if len(sys.argv) < 2: print "Usage: getpo_authors.py PATH_TO_PO_FILE" sys.exit(-1) - f = open(sys.argv[1], "r") - if not f: - print "Can not find", sys.argv[1] - exit - lines = f.readlines() + for filename in sys.argv[1:]: + print("Processing file ", filename) + f = open(filename, "r") + if not f: + print "Can not find", filename + exit + lines = f.readlines() - f.close() + f.close() - new_authors = [] - found = 0 + new_authors = [] + found = 0 - # Find all authors with a simple finite state machine: - contributions = -1 - line_count = 0 - for i in lines: - line = i[:-1] # remove \n - if line=="# Translators:": - found = 1 - elif found and line[:2]=="# " and line [:14]!="# FIRST AUTHOR": - new_authors.append(line[2:]) - elif line[:5]=="msgid": - found = 0 - elif line[:31]== "msgstr \"Launchpad Contributions": - contributions = line_count - line_count = line_count + 1 + # Find all authors with a simple finite state machine: + contributions = -1 + line_count = 0 + for i in lines: + line = i[:-1] # remove \n + if line=="# Translators:": + found = 1 + elif found and line[:2]=="# " and line [:14]!="# FIRST AUTHOR": + new_authors.append(line[2:]) + elif line[:5]=="msgid": + found = 0 + elif line[:31]== "msgstr \"Launchpad Contributions": + contributions = line_count + line_count = line_count + 1 - # Delete all email addresses - not sure if the authors - # would want them to be published - email=re.compile(" *<.*@.*\..*> *") # one @ and one dot at least - for i in range(len(new_authors)): - g = email.search(new_authors[i]) - if g: - new_authors[i] = new_authors[i][:g.start()] \ - + new_authors[i][g.end():] + # Delete all email addresses - not sure if the authors + # would want them to be published + email=re.compile(" *<.*@.*\..*> *") # one @ and one dot at least + for i in range(len(new_authors)): + g = email.search(new_authors[i]) + if g: + new_authors[i] = new_authors[i][:g.start()] \ + + new_authors[i][g.end():] - # Get the old authors from the translator-credits string: - if contributions>0: - # Ignore the first entry, which is "msgstr ...", and the - # last two characters, which are the '"\n'. - old_authors = lines[contributions][:-2].split("\\n")[1:] - for i in range(len(old_authors)): - old_authors[i] = old_authors[i].strip() - else: - old_authors=[] - - all_authors = old_authors + new_authors; - all_authors = sorted(all_authors, key=lambda x: x.lower()) - all_authors_string = reduce(lambda x,y: x+"\\n"+y, all_authors, "") + # Get the old authors from the translator-credits string: + if contributions>0: + # Ignore the first entry, which is "msgstr ...", and the + # last two characters, which are the '"\n'. + old_authors = lines[contributions][:-2].split("\\n")[1:] + for i in range(len(old_authors)): + old_authors[i] = old_authors[i].strip() + else: + old_authors=[] + + all_authors = old_authors + new_authors; + all_authors = sorted(all_authors, key=lambda x: x.lower()) + all_authors_string = reduce(lambda x,y: x+"\\n"+y, all_authors, "") - credits_line = "msgstr \"Launchpad Contributions:%s\"\n"%all_authors_string - # If no old authors exists, write a new entry: - if contributions==-1: - lines.append("\n") - lines.append("#: src/states_screens/credits.cpp:209\n") - lines.append("msgid \"translator-credits\"\n") - lines.append(credits_line) - else: - # Otherwise just replace the old contribution string - lines[contributions] = credits_line + credits_line = "msgstr \"Launchpad Contributions:%s\"\n"%all_authors_string + # If no old authors exists, write a new entry: + if contributions==-1: + lines.append("\n") + lines.append("#: src/states_screens/credits.cpp:209\n") + lines.append("msgid \"translator-credits\"\n") + lines.append(credits_line) + else: + # Otherwise just replace the old contribution string + lines[contributions] = credits_line - # Overwrite old file - f = open(sys.argv[1], "w") - for i in lines: - f.write(i) - f.close() + # Overwrite old file + f = open(filename, "w") + for i in lines: + f.write(i) + f.close() + + print("Done with ", filename) From 95602791cf84ea039b57f2154fd37a55ffa1da15 Mon Sep 17 00:00:00 2001 From: LoadingPleaseWait Date: Wed, 8 Jun 2016 22:19:15 -0500 Subject: [PATCH 5/5] Document graphical configuration command line options --- src/main.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 82e0a414b..03b10a884 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -554,6 +554,38 @@ void cmdLineHelp() " with colons (:).\n" " --cutscene=NAME Launch the specified track as a cutscene.\n" " This is for internal debugging use only.\n" + " --enable-glow Enable glow effect.\n" + " --disable-glow Disable glow effect.\n" + " --enable-bloom Enable bloom graphical effect.\n" + " --disable-bloom Disable bloom graphical effect.\n" + " --enable-light-shaft Enable light shafts (God rays).\n" + " --disable-light-shaft Disable light shafts (God rays).\n" + " --enable-dof Enable depth of field.\n" + " --disable-dof Disable depth of field.\n" + " --enable-gi Enable global illumination.\n" + " --disable-gi Disable global illumination.\n" + " --enable-gfx Enable animated scenery.\n" + " --disable-gfx Disable animated scenery.\n" + " --enable-motion-blur Enable motion blur.\n" + " --disable-motion-blur Disable motion blur.\n" + " --enable-mlaa Enable anti-aliasing.\n" + " --disable-mlaa Disable anti-aliasing.\n" + " --enable-texture-compression Enable texture compression.\n" + " --disable-texture-compression Disable texture compression.\n" + " --enable-ssao Enable screen space ambient occlusion.\n" + " --disable-ssao Disable screen space ambient occlusion.\n" + " --enable-ibl Enable image based lighting.\n" + " --disable-ibl Disable image based lighting.\n" + " --enable-hd-textures Enable high definition textures.\n" + " --disable-hd-textures Disable high definition textures.\n" + " --enable-dynamic-lights Enable advanced pipline graphical options.\n" + " --disable-dynamic-lights Disable advanced pipline graphical options.\n" + " --enable-trilinear Enable trilinear texture filtering.\n" + " --disable-trilinear Use bilinear texture filtering.\n" + " --anisotropic=n Anisotropic filtering quality (0 to disable).\n" + " Takes precedence over trilinear or bilinear\n" + " texture filtering.\n" + " --shadows=n Set shadow quality (0 to disable shadows).\n" "\n" "You can visit SuperTuxKart's homepage at " "http://supertuxkart.sourceforge.net\n\n",