author | Wuzzy <Wuzzy2@mail.ru> |
Wed, 18 Jul 2018 02:05:05 +0200 | |
changeset 13507 | 7e188a28f078 |
parent 13506 | 36f3f77e9b1b |
child 13508 | da59012fbd7a |
--- a/QTfrontend/ui/widget/chatwidget.cpp Wed Jul 18 01:35:59 2018 +0200 +++ b/QTfrontend/ui/widget/chatwidget.cpp Wed Jul 18 02:05:05 2018 +0200 @@ -381,7 +381,10 @@ return QString("<span class=\"nick\">%1</span>").arg(nickname.toHtmlEscaped()); } -const QRegExp HWChatWidget::URLREGEXP = QRegExp("(http(s)?://)?(www\\.)?((([^/:?&#]+\\.)?hedgewars\\.org|code\\.google\\.com|googlecode\\.com|hh\\.unit22\\.org)(/[^ ]*)?)"); +// Regex to make some URLs clickable for selected domains: +// - hedgewars.org (official website) +// - hh.unit22.org (community addon server) +const QRegExp HWChatWidget::URLREGEXP = QRegExp("(http(s)?://)?(www\\.)?((([^/:?&#]+\\.)?hedgewars\\.org|hh\\.unit22\\.org)(/[^ ]*)?)"); bool HWChatWidget::containsHighlight(const QString & sender, const QString & message) { @@ -401,7 +404,7 @@ QString HWChatWidget::messageToHTML(const QString & message) { QString formattedStr = message.toHtmlEscaped(); - // link some urls + // link some URLs formattedStr = formattedStr.replace(URLREGEXP, "<a href=\"http\\2://\\4\">\\4</a>"); return formattedStr; }
--- a/misc/hats_js_anim.xhtml Wed Jul 18 01:35:59 2018 +0200 +++ b/misc/hats_js_anim.xhtml Wed Jul 18 02:05:05 2018 +0200 @@ -45,7 +45,7 @@ <script type="application/ecmascript"> //<![CDATA[ /* javascript version of a sprite sheet - this could be pretty trivially done in pure HTML, but maintenance -would be easier with a server-side portion. list of sprites could be gotten from googlecode, but would require XSS whitelisting */ +would be easier with a server-side portion. list of sprites could be gotten from server, but would require XSS whitelisting */ /*var masks = ['2001suit2', '2001suit', '4gsuif', 'AkuAku', 'android', 'angel', 'anzac', 'apple', 'ash', 'Balrog', 'banana', 'Bandit', 'bat', 'beaver', 'beefeater', 'Blanka', 'BlankaToothless', 'BlueCap', 'BlueHair', 'bobby2v', 'bobby', 'Bob', 'BrainSlugMouth', 'BrainSlug', 'britishpithhelmet', 'britmedic', 'britsapper', 'Bub', 'Bunny', 'bushhider', 'charlesdegaulle', 'charmander', 'chef', 'chikorita', 'Chunli', 'clown-copper', 'clown-crossed', 'clown', 'Coonskin3', 'Cororon', 'Cowboy', 'crown', 'cyborg', 'darthvader', 'Deer', 'desertgrenadier01', 'desertgrenadier02', 'desertgrenadier04', 'desertgrenadier05', 'desertgrenadierofficer', 'desertmedic', 'desertsapper1', 'desertsapper2', 'diglett', 'Disguise', 'Dragon', 'dwarf', 'eastertop', 'Elvis', 'Eva_00b', 'Eva_00y', 'Falcon', 'frenchwwigasmask', 'frenchwwihelmet', 'Gasmask', 'Geordi', 'germanwiimedichelmet', 'germanwwihelmetmustache', 'germanwwiipithhelmetdes', 'germanwwitankhelmet', 'Glasses', 'GreenCap', 'GreenHair', 'grenadier1', 'GreyHair', 'Guile', 'hedgehogk', 'HogInTheHat', 'hogpharoah', 'Honda', 'IndianChief', 'infernalhorns', 'InfernalHorns', 'Jason', 'jigglypuff', 'judo', 'junior', 'Ken', 'KirbyMask', 'kiss_criss', 'kiss_frehley', 'kiss_simmons', 'kiss_stanley', 'knight', 'Kululun', 'Ladle', 'lambda', 'Laminaria', 'laurel', 'lemon', 'link', 'lugia', 'Luigi', 'Mario', 'MegaHogX', 'metalband', 'mexicansunbrero', 'mickey_ears', 'Moose', 'mp3', 'mudkip', 'Mummy', 'naruto', 'NinjaFull', 'NinjaStraight', 'NinjaTriangle', 'OldMan', 'OrangeHair', 'orange', 'Pantsu', 'Pig', 'pikachu', 'PinkHair', 'pinksunhat', 'pirate_jack_bandana', 'pirate_jack', 'plainpith', 'Plunger', 'policecap', 'porkey', 'PrincessDaisy', 'PrincessPeach', 'Pumpkin_Hat', 'PurpleHair', 'quotecap', 'Rain', 'Rambo', 'rasta', 'RedCap', 'RedHair', 'RobinHood', 'royalguard', 'RSR', 'Ryu', 'Samurai', 'Samus', 'Santa', 'SauceBoatSilver', 'ShaggyYeti', 'sheep', 'ShortHair_Black', 'ShortHair_Brown', 'ShortHair_Grey', 'ShortHair_Red', 'ShortHair_Yellow', 'Skull', 'Sleepwalker', 'slowpoke', 'Sniper', 'Sonic', 'sovietcomrade2', 'sovietcomrade', 'SparkleSuperFun', 'SparkssHelmet', 'spartan', 'spcartman', 'spidey', 'spkenny', 'spkyle', 'spstan', 'squirtle', 'sth_AmyClassic', 'sth_Amy', 'sth_Eggman', 'sth_Knux', 'sth_Metal', 'sth_Shadow', 'sth_Sonic', 'sth_Super', 'sth_Tails', 'stormcloud', 'stormtrooper', 'StrawHatEyes', 'StrawHatFacial', 'StrawHat', 'Sunglasses', 'SunWukong', 'Teacup', 'Teapot', 'terminatorc', 'Terminator_Glasses', 'thug', 'Toad', 'tophats', 'touhou_chen', 'touhou_marisa', 'touhou_patchouli', 'touhou_remelia', 'touhou_suwako', 'touhou_yukari', 'trenchgrenadier1', 'trenchgrenadier2', 'trenchgrenadier3', 'ushanka', 'vampirichog', 'Vega', 'venom', 'Viking', 'voltorb', 'Wario', 'WhySoSerious', 'WizardHat', 'YellowCap', 'YellowHair', 'Zombi'];*/ var masks = []; var themes = {
--- a/misc/theme_editor.html Wed Jul 18 01:35:59 2018 +0200 +++ b/misc/theme_editor.html Wed Jul 18 02:05:05 2018 +0200 @@ -33,27 +33,27 @@ sky = new Image(); sky.onload = tryToDraw; - sky.src = 'http://hedgewars.googlecode.com/hg/share/hedgewars/Data/Themes/Nature/Sky.png'; + sky.src = 'https://hg.hedgewars.org/hedgewars/raw-file/tip/share/hedgewars/Data/Themes/Nature/Sky.png'; clouds = new Image(); clouds.onload = tryToDraw; - clouds.src = 'http://hedgewars.googlecode.com/hg/share/hedgewars/Data/Graphics/Clouds.png'; + clouds.src = 'https://hg.hedgewars.org/hedgewars/raw-file/tip/share/hedgewars/Data/Graphics/Clouds.png'; horizont = new Image(); horizont.onload = tryToDraw; - horizont.src = 'http://hedgewars.googlecode.com/hg/share/hedgewars/Data/Themes/Nature/horizont.png'; + horizont.src = 'https://hg.hedgewars.org/hedgewars/raw-file/share/hedgewars/Data/Themes/Nature/horizont.png'; land = new Image(); land.onload = tryToDraw; - land.src = 'http://hedgewars.googlecode.com/hg/share/hedgewars/Data/Themes/Nature/LandTex.png'; + land.src = 'https://hg.hedgewars.org/hedgewars/raw-file/tip/share/hedgewars/Data/Themes/Nature/LandTex.png'; border = new Image(); border.onload = tryToDraw; - border.src = 'http://hedgewars.googlecode.com/hg/share/hedgewars/Data/Themes/Nature/Border.png'; + border.src = 'https://hg.hedgewars.org/hedgewars/raw-file/tip/share/hedgewars/Data/Themes/Nature/Border.png'; water = new Image(); water.onload = tryToDraw; - water.src = 'http://hedgewars.googlecode.com/hg/share/hedgewars/Data/Graphics/BlueWater.png'; + water.src = 'https://hg.hedgewars.org/hedgewars/raw-file/tip/share/hedgewars/Data/Graphics/BlueWater.png'; landArray = new Array(512); for (var x = 0; x < landArray.length; x++)
--- a/tools/build_windows.bat Wed Jul 18 01:35:59 2018 +0200 +++ b/tools/build_windows.bat Wed Jul 18 02:05:05 2018 +0200 @@ -1,6 +1,20 @@ +:: WARNNG WARNING WARNING :: +:: This Batch script is BROKEN and EXTREMELY OUTDATED! +:: It does not work with latest version and needs a complete redo or removal. +:: Its functionality has been disabled. + +:: Print dummy text and return. +echo Sorry, this script is outdated. You're on your own. +exit + + +:::::::::::::::::::::::::::::: +:: Old script code follows ... +:::::::::::::::::::::::::::::: @echo off ::edit these variables if you need set PASCAL=C:\FPC\2.6.0\bin\i386-win32\ +:: FIXME: Go Qt 5 set QTDIR=C:\QtSDK\Desktop\Qt\4.7.4\mingw\bin set PATH=%PATH%;%PASCAL% set BUILD_TYPE="Debug" @@ -14,10 +28,12 @@ for %%G in (QtCored4 QtGuid4 QtNetworkd4) do xcopy /d/y %QTDIR%\%%G.dll %CD%\bin\ ) :: should you libgcc dynamically you should try adding libgcc_s_dw2-1 and mingwm10 +:: FIXME: Use Qt5 for %%G in (QtCore4 QtGui4 QtNetwork4) do ( xcopy /d/y %QTDIR%\%%G.dll %CD%\bin\ ) +:: FIXME: Use SDL 2.0 if not exist %CD%\misc\winutils\bin\ mkdir %CD%\misc\winutils\bin\ if not exist %CD%\misc\winutils\bin\SDL.dll cscript %CD%\tools\w32DownloadUnzip.vbs http://www.libsdl.org/release/SDL-1.2.15-win32.zip %CD%\misc\winutils\bin if not exist %CD%\misc\winutils\bin\SDL_image.dll cscript %CD%\tools\w32DownloadUnzip.vbs http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12-win32.zip %CD%\misc\winutils\bin @@ -26,6 +42,7 @@ if not exist %CD%\misc\winutils\bin\SDL_ttf.dll cscript %CD%\tools\w32DownloadUnzip.vbs http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11-win32.zip %CD%\misc\winutils\bin ::for video recording +:: FIXME: googlecode.com is defunct. if not exist %CD%\misc\winutils\bin\avformat-54.dll cscript %CD%\tools\w32DownloadUnzip.vbs http://hedgewars.googlecode.com/files/libav-win32-20121022-dll.zip %CD%\misc\winutils\bin ::this is needed because fpc png unit hardcodes libpng-1.2.12