[hedgewars] 02/03: Merge tag 'upstream/0.9.22_git20150914'

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Mon Sep 14 11:13:19 UTC 2015


This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 277b73cf8f72b6977915880d6e3197d52e3b7f9e
Merge: e61b972 7d311c6
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Sep 14 10:19:45 2015 +0200

    Merge tag 'upstream/0.9.22_git20150914'
    
    Upstream version 0.9.22~git20150914

 .travis.yml                                        |    6 +-
 CMakeLists.txt                                     |   14 +-
 CREDITS                                            |    2 +
 CTestTestfile.cmake                                |   16 +-
 ChangeLog.txt                                      |   17 +
 QTfrontend/CMakeLists.txt                          |    4 +-
 QTfrontend/achievements.cpp                        |    2 +-
 QTfrontend/achievements.h                          |    2 +-
 QTfrontend/binds.cpp                               |    2 +-
 QTfrontend/binds.h                                 |    2 +-
 QTfrontend/campaign.cpp                            |    2 +-
 QTfrontend/campaign.h                              |    2 +-
 QTfrontend/drawmapscene.cpp                        |    2 +-
 QTfrontend/drawmapscene.h                          |    2 +-
 QTfrontend/game.cpp                                |   17 +-
 QTfrontend/game.h                                  |    2 +-
 QTfrontend/gameuiconfig.cpp                        |    2 +-
 QTfrontend/gameuiconfig.h                          |    2 +-
 QTfrontend/hwconsts.cpp.in                         |    2 +-
 QTfrontend/hwconsts.h                              |    2 +-
 QTfrontend/hwform.cpp                              |    6 +-
 QTfrontend/hwform.h                                |    2 +-
 QTfrontend/main.cpp                                |    2 +-
 QTfrontend/model/GameStyleModel.cpp                |    2 +-
 QTfrontend/model/GameStyleModel.h                  |    2 +-
 QTfrontend/model/HatModel.cpp                      |    2 +-
 QTfrontend/model/HatModel.h                        |    2 +-
 QTfrontend/model/MapModel.cpp                      |    2 +-
 QTfrontend/model/MapModel.h                        |    2 +-
 QTfrontend/model/ThemeModel.cpp                    |    2 +-
 QTfrontend/model/ThemeModel.h                      |    2 +-
 QTfrontend/model/ammoSchemeModel.cpp               |  227 +-
 QTfrontend/model/ammoSchemeModel.h                 |    2 +-
 QTfrontend/model/netserverslist.cpp                |    2 +-
 QTfrontend/model/netserverslist.h                  |    2 +-
 QTfrontend/model/playerslistmodel.cpp              |    1 +
 QTfrontend/model/playerslistmodel.h                |    2 +
 QTfrontend/model/roomslistmodel.cpp                |    2 +-
 QTfrontend/model/roomslistmodel.h                  |    2 +-
 QTfrontend/net/hwmap.cpp                           |    8 +-
 QTfrontend/net/hwmap.h                             |    5 +-
 QTfrontend/net/netregister.cpp                     |    2 +-
 QTfrontend/net/netregister.h                       |    2 +-
 QTfrontend/net/netserver.cpp                       |    2 +-
 QTfrontend/net/netserver.h                         |    2 +-
 QTfrontend/net/netudpserver.cpp                    |    2 +-
 QTfrontend/net/netudpserver.h                      |    2 +-
 QTfrontend/net/netudpwidget.cpp                    |    2 +-
 QTfrontend/net/netudpwidget.h                      |    2 +-
 QTfrontend/net/newnetclient.cpp                    |    2 +-
 QTfrontend/net/newnetclient.h                      |    2 +-
 QTfrontend/net/proto.cpp                           |    2 +-
 QTfrontend/net/proto.h                             |    2 +-
 QTfrontend/net/recorder.cpp                        |    2 +-
 QTfrontend/net/recorder.h                          |    2 +-
 QTfrontend/net/tcpBase.cpp                         |    2 +-
 QTfrontend/net/tcpBase.h                           |    2 +-
 QTfrontend/sdlkeys.h                               |    2 +-
 QTfrontend/servermessages.h                        |   59 +-
 QTfrontend/team.cpp                                |    2 +-
 QTfrontend/team.h                                  |    2 +-
 QTfrontend/ui/dialog/ask_quit.cpp                  |    2 +-
 QTfrontend/ui/dialog/ask_quit.h                    |    2 +-
 QTfrontend/ui/dialog/input_ip.cpp                  |    2 +-
 QTfrontend/ui/dialog/input_ip.h                    |    2 +-
 QTfrontend/ui/dialog/input_password.cpp            |    2 +-
 QTfrontend/ui/dialog/input_password.h              |    2 +-
 QTfrontend/ui/dialog/upload_video.cpp              |    2 +-
 QTfrontend/ui/dialog/upload_video.h                |    2 +-
 QTfrontend/ui/page/AbstractPage.cpp                |    2 +-
 QTfrontend/ui/page/AbstractPage.h                  |    2 +-
 QTfrontend/ui/page/pageadmin.cpp                   |    2 +-
 QTfrontend/ui/page/pageadmin.h                     |    2 +-
 QTfrontend/ui/page/pagecampaign.cpp                |    2 +-
 QTfrontend/ui/page/pagecampaign.h                  |    2 +-
 QTfrontend/ui/page/pageconnecting.cpp              |    2 +-
 QTfrontend/ui/page/pageconnecting.h                |    2 +-
 QTfrontend/ui/page/pagedata.cpp                    |    2 +-
 QTfrontend/ui/page/pagedata.h                      |    2 +-
 QTfrontend/ui/page/pagedrawmap.cpp                 |    2 +-
 QTfrontend/ui/page/pagedrawmap.h                   |    2 +-
 QTfrontend/ui/page/pageeditteam.cpp                |    2 +-
 QTfrontend/ui/page/pageeditteam.h                  |    2 +-
 QTfrontend/ui/page/pagegamestats.cpp               |    2 +-
 QTfrontend/ui/page/pagegamestats.h                 |    2 +-
 QTfrontend/ui/page/pageinfo.cpp                    |    2 +-
 QTfrontend/ui/page/pageinfo.h                      |    2 +-
 QTfrontend/ui/page/pageingame.cpp                  |    2 +-
 QTfrontend/ui/page/pageingame.h                    |    2 +-
 QTfrontend/ui/page/pagemain.cpp                    |    2 +-
 QTfrontend/ui/page/pagemain.h                      |    2 +-
 QTfrontend/ui/page/pagemultiplayer.cpp             |    2 +-
 QTfrontend/ui/page/pagemultiplayer.h               |    2 +-
 QTfrontend/ui/page/pagenet.cpp                     |    2 +-
 QTfrontend/ui/page/pagenet.h                       |    2 +-
 QTfrontend/ui/page/pagenetgame.cpp                 |    2 +-
 QTfrontend/ui/page/pagenetgame.h                   |    2 +-
 QTfrontend/ui/page/pagenetserver.cpp               |    2 +-
 QTfrontend/ui/page/pagenetserver.h                 |    2 +-
 QTfrontend/ui/page/pageoptions.cpp                 |    2 +-
 QTfrontend/ui/page/pageoptions.h                   |    2 +-
 QTfrontend/ui/page/pageplayrecord.cpp              |    2 +-
 QTfrontend/ui/page/pageplayrecord.h                |    2 +-
 QTfrontend/ui/page/pageroomslist.cpp               |    6 +-
 QTfrontend/ui/page/pageroomslist.h                 |    2 +-
 QTfrontend/ui/page/pagescheme.cpp                  |   51 +-
 QTfrontend/ui/page/pagescheme.h                    |    3 +-
 QTfrontend/ui/page/pageselectweapon.cpp            |    2 +-
 QTfrontend/ui/page/pageselectweapon.h              |    2 +-
 QTfrontend/ui/page/pagesingleplayer.cpp            |    2 +-
 QTfrontend/ui/page/pagesingleplayer.h              |    2 +-
 QTfrontend/ui/page/pagetraining.cpp                |    2 +-
 QTfrontend/ui/page/pagetraining.h                  |    2 +-
 QTfrontend/ui/page/pagevideos.cpp                  |    2 +-
 QTfrontend/ui/page/pagevideos.h                    |    2 +-
 QTfrontend/ui/widget/FreqSpinBox.cpp               |    2 +-
 QTfrontend/ui/widget/FreqSpinBox.h                 |    2 +-
 QTfrontend/ui/widget/HistoryLineEdit.cpp           |    2 +-
 QTfrontend/ui/widget/HistoryLineEdit.h             |    2 +-
 QTfrontend/ui/widget/SmartLineEdit.cpp             |    2 +-
 QTfrontend/ui/widget/SmartLineEdit.h               |    2 +-
 QTfrontend/ui/widget/SquareLabel.cpp               |    2 +-
 QTfrontend/ui/widget/SquareLabel.h                 |    2 +-
 QTfrontend/ui/widget/about.cpp                     |    2 +-
 QTfrontend/ui/widget/about.h                       |    2 +-
 QTfrontend/ui/widget/bgwidget.cpp                  |    2 +-
 QTfrontend/ui/widget/bgwidget.h                    |    2 +-
 QTfrontend/ui/widget/chatwidget.cpp                |    2 +-
 QTfrontend/ui/widget/chatwidget.h                  |    2 +-
 QTfrontend/ui/widget/databrowser.cpp               |    2 +-
 QTfrontend/ui/widget/databrowser.h                 |    2 +-
 QTfrontend/ui/widget/drawmapwidget.cpp             |    2 +-
 QTfrontend/ui/widget/drawmapwidget.h               |    2 +-
 QTfrontend/ui/widget/feedbackdialog.cpp            |    4 +-
 QTfrontend/ui/widget/feedbackdialog.h              |    2 +-
 QTfrontend/ui/widget/fpsedit.cpp                   |    2 +-
 QTfrontend/ui/widget/fpsedit.h                     |    2 +-
 QTfrontend/ui/widget/frameTeam.cpp                 |    2 +-
 QTfrontend/ui/widget/frameTeam.h                   |    2 +-
 QTfrontend/ui/widget/gamecfgwidget.cpp             |   47 +-
 QTfrontend/ui/widget/gamecfgwidget.h               |    2 +-
 QTfrontend/ui/widget/hatbutton.cpp                 |    2 +-
 QTfrontend/ui/widget/hatbutton.h                   |    2 +-
 QTfrontend/ui/widget/hatprompt.cpp                 |    2 +-
 QTfrontend/ui/widget/hatprompt.h                   |    2 +-
 QTfrontend/ui/widget/hedgehogerWidget.cpp          |    2 +-
 QTfrontend/ui/widget/hedgehogerWidget.h            |    2 +-
 QTfrontend/ui/widget/igbox.cpp                     |    2 +-
 QTfrontend/ui/widget/igbox.h                       |    2 +-
 QTfrontend/ui/widget/keybinder.cpp                 |    2 +-
 QTfrontend/ui/widget/keybinder.h                   |    2 +-
 QTfrontend/ui/widget/lineeditcursor.cpp            |    2 +-
 QTfrontend/ui/widget/lineeditcursor.h              |    2 +-
 QTfrontend/ui/widget/mapContainer.cpp              |    4 +-
 QTfrontend/ui/widget/mapContainer.h                |    5 +-
 QTfrontend/ui/widget/qpushbuttonwithsound.cpp      |    2 +-
 QTfrontend/ui/widget/qpushbuttonwithsound.h        |    2 +-
 QTfrontend/ui/widget/roomnameprompt.cpp            |    2 +-
 QTfrontend/ui/widget/roomnameprompt.h              |    2 +-
 QTfrontend/ui/widget/seedprompt.cpp                |    2 +-
 QTfrontend/ui/widget/seedprompt.h                  |    2 +-
 QTfrontend/ui/widget/selectWeapon.cpp              |    2 +-
 QTfrontend/ui/widget/selectWeapon.h                |    2 +-
 QTfrontend/ui/widget/teamselect.cpp                |    2 +-
 QTfrontend/ui/widget/teamselect.h                  |    2 +-
 QTfrontend/ui/widget/teamselhelper.cpp             |    2 +-
 QTfrontend/ui/widget/teamselhelper.h               |    2 +-
 QTfrontend/ui/widget/themeprompt.cpp               |    2 +-
 QTfrontend/ui/widget/themeprompt.h                 |    2 +-
 QTfrontend/ui/widget/togglebutton.cpp              |    2 +-
 QTfrontend/ui/widget/togglebutton.h                |    2 +-
 QTfrontend/ui/widget/vertScrollArea.cpp            |    2 +-
 QTfrontend/ui/widget/vertScrollArea.h              |    2 +-
 QTfrontend/ui/widget/weaponItem.cpp                |    2 +-
 QTfrontend/ui/widget/weaponItem.h                  |    2 +-
 QTfrontend/ui_hwform.cpp                           |    2 +-
 QTfrontend/ui_hwform.h                             |    2 +-
 QTfrontend/util/DataManager.cpp                    |    2 +-
 QTfrontend/util/DataManager.h                      |    2 +-
 QTfrontend/util/LibavInteraction.cpp               |    2 +-
 QTfrontend/util/LibavInteraction.h                 |    2 +-
 QTfrontend/util/MessageDialog.cpp                  |    2 +-
 QTfrontend/util/MessageDialog.h                    |    2 +-
 QTfrontend/util/SDLInteraction.cpp                 |    4 +-
 QTfrontend/util/SDLInteraction.h                   |    2 +-
 QTfrontend/util/namegen.cpp                        |    2 +-
 QTfrontend/util/namegen.h                          |    2 +-
 QTfrontend/util/platform/CocoaInitializer.h        |    2 +-
 QTfrontend/util/platform/CocoaInitializer.mm       |    2 +-
 QTfrontend/util/platform/InstallController.cpp     |    2 +-
 QTfrontend/util/platform/InstallController.h       |    2 +-
 QTfrontend/util/platform/M3Panel.h                 |    2 +-
 QTfrontend/util/platform/M3Panel.mm                |    2 +-
 QTfrontend/util/platform/SparkleAutoUpdater.mm     |    2 +-
 QTfrontend/util/platform/xfire.cpp                 |    2 +-
 QTfrontend/util/platform/xfire.h                   |    2 +-
 QTfrontend/weapons.h                               |  108 +-
 README                                             |    2 +-
 cmake_modules/compilerchecks.cmake                 |    2 +-
 cmake_modules/paths.cmake                          |    3 +-
 gameServer/Actions.hs                              |   22 +-
 gameServer/ClientIO.hs                             |    3 +-
 gameServer/ConfigFile.hs                           |    2 +-
 gameServer/Consts.hs                               |    2 +-
 gameServer/CoreTypes.hs                            |   17 +-
 gameServer/EngineInteraction.hs                    |   31 +-
 gameServer/FloodDetection.hs                       |    2 +-
 gameServer/HWProtoChecker.hs                       |    2 +-
 gameServer/HWProtoCore.hs                          |   37 +-
 gameServer/HWProtoInRoomState.hs                   |   89 +-
 gameServer/HWProtoLobbyState.hs                    |   81 +-
 gameServer/HWProtoNEState.hs                       |    2 +-
 gameServer/HandlerUtils.hs                         |    2 +-
 gameServer/JoinsMonitor.hs                         |    2 +-
 gameServer/NetRoutines.hs                          |   12 +-
 gameServer/OfficialServer/DBInteraction.hs         |    2 +-
 gameServer/OfficialServer/GameReplayStore.hs       |    2 +-
 gameServer/OfficialServer/checker.hs               |   30 +-
 gameServer/OfficialServer/extdbinterface.hs        |   90 +-
 gameServer/Opts.hs                                 |    2 +-
 gameServer/RoomsAndClients.hs                      |    2 +-
 gameServer/ServerCore.hs                           |    2 +-
 gameServer/ServerState.hs                          |    2 +-
 gameServer/Store.hs                                |    2 +-
 gameServer/Utils.hs                                |    2 +-
 gameServer/Votes.hs                                |   43 +-
 gameServer/hedgewars-server.cabal                  |    2 +-
 gameServer/hedgewars-server.hs                     |    2 +-
 gameServer/stresstest.hs                           |    2 +-
 gameServer/stresstest2.hs                          |    2 +-
 gameServer/stresstest3.hs                          |    2 +-
 hedgewars/ArgParsers.pas                           |    4 +-
 hedgewars/CMakeLists.txt                           |   16 +-
 hedgewars/PNGh.pas                                 |    2 +-
 hedgewars/SDLh.pas                                 |   38 +-
 hedgewars/avwrapper/avwrapper.c                    |    2 +-
 hedgewars/config.inc.in                            |    2 +-
 hedgewars/hwLibrary.pas                            |    2 +-
 hedgewars/hwengine.pas                             |   27 +-
 hedgewars/options.inc                              |    2 +-
 hedgewars/pas2cRedo.pas                            |    6 +-
 hedgewars/uAI.pas                                  |    2 +-
 hedgewars/uAIActions.pas                           |    2 +-
 hedgewars/uAIAmmoTests.pas                         |    5 +-
 hedgewars/uAIMisc.pas                              |    2 +-
 hedgewars/uAmmos.pas                               |    6 +-
 hedgewars/uCaptions.pas                            |    2 +-
 hedgewars/uChat.pas                                |  651 +++-
 hedgewars/uCollisions.pas                          |   27 +-
 hedgewars/uCommandHandlers.pas                     |   20 +-
 hedgewars/uCommands.pas                            |    2 +-
 hedgewars/uConsole.pas                             |    2 +-
 hedgewars/uConsts.pas                              |    7 +-
 hedgewars/uDebug.pas                               |    2 +-
 hedgewars/uFloat.pas                               |    2 +-
 hedgewars/uGame.pas                                |    6 +-
 hedgewars/uGears.pas                               |   80 +-
 hedgewars/uGearsHandlers.pas                       |    2 +-
 hedgewars/uGearsHandlersMess.pas                   |  360 +-
 hedgewars/uGearsHandlersRope.pas                   |    4 +-
 hedgewars/uGearsHedgehog.pas                       |   24 +-
 hedgewars/uGearsList.pas                           |   90 +-
 hedgewars/uGearsRender.pas                         |  124 +-
 hedgewars/uGearsUtils.pas                          |   20 +-
 hedgewars/uIO.pas                                  |   13 +-
 hedgewars/uInputHandler.pas                        |    2 +-
 hedgewars/uLand.pas                                |   33 +-
 hedgewars/uLandGenMaze.pas                         |   70 +-
 hedgewars/uLandGraphics.pas                        |  248 +-
 hedgewars/uLandObjects.pas                         |   72 +-
 hedgewars/uLandPainted.pas                         |    2 +-
 hedgewars/uLandTemplates.pas                       |   49 +-
 hedgewars/uLandTexture.pas                         |    2 +-
 hedgewars/uLandUtils.pas                           |    2 +-
 hedgewars/uLocale.pas                              |   16 +-
 hedgewars/uMisc.pas                                |    5 +-
 hedgewars/uPhysFSLayer.pas                         |    4 +
 hedgewars/uRandom.pas                              |    2 +-
 hedgewars/uRender.pas                              |  314 +-
 hedgewars/uRenderUtils.pas                         |    4 +-
 hedgewars/uScript.pas                              |  355 +-
 hedgewars/uSinTable.pas                            |    2 +-
 hedgewars/uSound.pas                               |   21 +-
 hedgewars/uStats.pas                               |    2 +-
 hedgewars/uStore.pas                               |   28 +-
 hedgewars/uTeams.pas                               |   16 +-
 hedgewars/uTextures.pas                            |    2 +-
 hedgewars/uTouch.pas                               |    1 +
 hedgewars/uTypes.pas                               |   51 +-
 hedgewars/uUtils.pas                               |    2 +-
 hedgewars/uVariables.pas                           |  151 +-
 hedgewars/uVideoRec.pas                            |    2 +-
 hedgewars/uVisualGears.pas                         |   18 +-
 hedgewars/uVisualGearsHandlers.pas                 |   59 +-
 hedgewars/uVisualGearsList.pas                     |    5 +-
 hedgewars/uWorld.pas                               |  272 +-
 man/hedgewars.6                                    |    2 +-
 misc/OfficialChallenges/racer_#13.hwmap            |    1 +
 misc/OfficialChallenges/racer_#14.hwmap            |    1 +
 misc/OfficialChallenges/racer_#15.hwmap            |    1 +
 misc/OfficialChallenges/racer_#16.hwmap            |    1 +
 misc/liblua/Xcode/Lua.xcodeproj/project.pbxproj    |   48 +-
 .../Xcode/Physfs.xcodeproj/project.pbxproj         |   44 +-
 .../Xcode/Physlayer.xcodeproj/project.pbxproj      |   42 +-
 misc/libphyslayer/physfscompat.c                   |    2 +-
 misc/libphyslayer/physfscompat.h                   |    2 +-
 .../src/org/hedgewars/hedgeroid/SDLActivity.java   |    2 +-
 project_files/frontlib/hwconsts.h                  |    2 +-
 project_files/frontlib/net/netconn.c               |    2 +-
 project_files/hwc/CMakeLists.txt                   |    1 +
 project_files/hwc/rtl/system.c                     |   46 +-
 project_files/hwc/rtl/system.h                     |    9 +
 share/Info.plist.in                                |    4 +-
 share/hedgewars/Data/Forts/CakeR.png               |  Bin 230953 -> 0 bytes
 share/hedgewars/Data/Forts/CastleR.png             |  Bin 89560 -> 0 bytes
 share/hedgewars/Data/Forts/EvilChickenR.png        |  Bin 216484 -> 0 bytes
 share/hedgewars/Data/Forts/FlowerhogR.png          |  Bin 75251 -> 0 bytes
 share/hedgewars/Data/Forts/HydrantR.png            |  Bin 190343 -> 0 bytes
 share/hedgewars/Data/Forts/LegoR.png               |  Bin 39608 -> 0 bytes
 share/hedgewars/Data/Forts/PlaneR.png              |  Bin 133037 -> 0 bytes
 share/hedgewars/Data/Forts/StatueR.png             |  Bin 65100 -> 0 bytes
 share/hedgewars/Data/Forts/SteelTowerR.png         |  Bin 130755 -> 0 bytes
 share/hedgewars/Data/Forts/TankR.png               |  Bin 185567 -> 0 bytes
 share/hedgewars/Data/Forts/UFOR.png                |  Bin 79033 -> 0 bytes
 share/hedgewars/Data/Forts/WoodR.png               |  Bin 270926 -> 0 bytes
 share/hedgewars/Data/Graphics/AirMine.png          |  Bin 0 -> 3141 bytes
 share/hedgewars/Data/Graphics/AmmoMenu/Ammos.png   |  Bin 58957 -> 59701 bytes
 .../hedgewars/Data/Graphics/AmmoMenu/Ammos_bw.png  |  Bin 34209 -> 45439 bytes
 share/hedgewars/Data/Graphics/Flags/cm_balls.png   |  Bin 0 -> 758 bytes
 share/hedgewars/Data/Graphics/Flags/cm_bubbles.png |  Bin 0 -> 674 bytes
 share/hedgewars/Data/Graphics/Flags/cm_cheese.png  |  Bin 0 -> 225 bytes
 .../hedgewars/Data/Graphics/Flags/cm_crosshair.png |  Bin 0 -> 328 bytes
 share/hedgewars/Data/Graphics/Flags/cm_cyborg.png  |  Bin 0 -> 604 bytes
 .../Data/Graphics/Flags/cm_danger_fire.png         |  Bin 0 -> 399 bytes
 .../Data/Graphics/Flags/cm_danger_stripes.png      |  Bin 0 -> 181 bytes
 .../hedgewars/Data/Graphics/Flags/cm_duckhead.png  |  Bin 0 -> 713 bytes
 share/hedgewars/Data/Graphics/Flags/cm_eyes.png    |  Bin 0 -> 389 bytes
 .../hedgewars/Data/Graphics/Flags/cm_firstaid.png  |  Bin 0 -> 294 bytes
 share/hedgewars/Data/Graphics/Flags/cm_flames.png  |  Bin 0 -> 838 bytes
 share/hedgewars/Data/Graphics/Flags/cm_flower.png  |  Bin 0 -> 730 bytes
 share/hedgewars/Data/Graphics/Flags/cm_girder.png  |  Bin 0 -> 278 bytes
 share/hedgewars/Data/Graphics/Flags/cm_grenade.png |  Bin 0 -> 882 bytes
 share/hedgewars/Data/Graphics/Flags/cm_heart.png   |  Bin 0 -> 665 bytes
 share/hedgewars/Data/Graphics/Flags/cm_hellish.png |  Bin 0 -> 509 bytes
 share/hedgewars/Data/Graphics/Flags/cm_hw.png      |  Bin 0 -> 463 bytes
 share/hedgewars/Data/Graphics/Flags/cm_hw2.png     |  Bin 0 -> 460 bytes
 share/hedgewars/Data/Graphics/Flags/cm_kiwi.png    |  Bin 0 -> 396 bytes
 share/hedgewars/Data/Graphics/Flags/cm_piet.png    |  Bin 0 -> 174 bytes
 share/hedgewars/Data/Graphics/Flags/cm_sine.png    |  Bin 0 -> 581 bytes
 share/hedgewars/Data/Graphics/Flags/cm_skull.png   |  Bin 0 -> 752 bytes
 share/hedgewars/Data/Graphics/Flags/cm_star.png    |  Bin 894 -> 507 bytes
 share/hedgewars/Data/Graphics/Flags/cm_test.png    |  Bin 0 -> 112 bytes
 share/hedgewars/Data/Graphics/Flags/cm_waves.png   |  Bin 0 -> 376 bytes
 share/hedgewars/Data/Graphics/Graves/Flower.png    |  Bin 1922 -> 1675 bytes
 .../hedgewars/Data/Graphics/Graves/Rubberduck.png  |  Bin 1628 -> 1535 bytes
 share/hedgewars/Data/Graphics/Graves/Statue.png    |  Bin 1522 -> 1343 bytes
 .../hedgewars/Data/Graphics/Hedgehog/amAirMine.png |  Bin 0 -> 1783 bytes
 .../Challenge_-_Speed_Shoppa_-_Hedgelove at 2x.png    |  Bin 0 -> 18048 bytes
 .../Challenge_-_Speed_Shoppa_-_Ropes at 2x.png        |  Bin 0 -> 53389 bytes
 .../Challenge_-_Speed_Shoppa_-_ShoppaKing at 2x.png   |  Bin 0 -> 14774 bytes
 share/hedgewars/Data/Graphics/TARDIS.png           |  Bin 6420 -> 0 bytes
 share/hedgewars/Data/Graphics/Timebox.png          |  Bin 0 -> 6138 bytes
 share/hedgewars/Data/Graphics/amRubber.png         |  Bin 20258 -> 20299 bytes
 share/hedgewars/Data/Graphics/missions.png         |  Bin 4416 -> 4304 bytes
 share/hedgewars/Data/Locale/campaigns_de.txt       |   46 +-
 share/hedgewars/Data/Locale/de.lua                 | 2980 ++++++++------
 share/hedgewars/Data/Locale/de.txt                 |   97 +-
 share/hedgewars/Data/Locale/en.txt                 |  152 +-
 share/hedgewars/Data/Locale/hedgewars_ar.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_bg.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_cs.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_da.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_de.ts        |  328 +-
 share/hedgewars/Data/Locale/hedgewars_el.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_en.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_es.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_fi.ts        |  945 +----
 share/hedgewars/Data/Locale/hedgewars_fr.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_gd.ts        | 3459 ++++++++++++++++
 share/hedgewars/Data/Locale/hedgewars_gl.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_hu.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_it.ts        |  861 +---
 share/hedgewars/Data/Locale/hedgewars_ja.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_ko.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_lt.ts        |  280 +-
 share/hedgewars/Data/Locale/hedgewars_ms.ts        |  280 +-
 share/hedgewars/Data/Locale/hedgewars_nl.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_pl.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_pt_BR.ts     |  855 ----
 share/hedgewars/Data/Locale/hedgewars_pt_PT.ts     |  855 ----
 share/hedgewars/Data/Locale/hedgewars_ro.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_ru.ts        |  859 ----
 share/hedgewars/Data/Locale/hedgewars_sk.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_sv.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_tr_TR.ts     |  855 ----
 share/hedgewars/Data/Locale/hedgewars_uk.ts        |  855 ----
 share/hedgewars/Data/Locale/hedgewars_zh_CN.ts     |  280 +-
 share/hedgewars/Data/Locale/hedgewars_zh_TW.ts     |  855 ----
 share/hedgewars/Data/Locale/missions_de.txt        |   11 +-
 share/hedgewars/Data/Locale/missions_en.txt        |  157 +-
 share/hedgewars/Data/Locale/tips_de.xml            |   26 +-
 share/hedgewars/Data/Locale/tips_en.xml            |   78 +-
 share/hedgewars/Data/Maps/ClimbHome/map.lua        |   72 +-
 share/hedgewars/Data/Maps/ClimbHome/mask.png       |  Bin 325117 -> 325133 bytes
 share/hedgewars/Data/Maps/ShoppaKing/map.png       |  Bin 677283 -> 621840 bytes
 share/hedgewars/Data/Maps/TrophyRace/map.png       |  Bin 783679 -> 732373 bytes
 share/hedgewars/Data/Maps/portal/mask.png          |  Bin 60510 -> 39301 bytes
 .../{01#Boot_Camp.lua => 01-Boot_Camp.lua}         |    0
 .../Missions/Campaign/A_Classic_Fairytale/epil.lua |    2 +-
 .../Campaign/A_Classic_Fairytale/family.lua        |    2 +-
 .../Campaign/A_Classic_Fairytale/queen.lua         |    2 +-
 .../Missions/Training/Basic_Training_-_Bazooka.lua |  484 +--
 .../Training/Basic_Training_-_Cluster_Bomb.lua     |  123 -
 .../Missions/Training/Basic_Training_-_Shotgun.lua |  178 -
 .../Training/Basic_Training_-_Sniper_Rifle.lua     |  698 ++--
 .../Challenge_-_Speed_Shoppa_-_Hedgelove.lua       |   38 +
 .../Training/Challenge_-_Speed_Shoppa_-_Ropes.lua  |   43 +
 .../Challenge_-_Speed_Shoppa_-_ShoppaKing.lua      |   54 +
 .../hedgewars/Data/Missions/Training/ClimbHome.lua |   24 +-
 .../Training/User_Mission_-_Nobody_Laugh.lua       |    2 +-
 .../Training/User_Mission_-_RCPlane_Challenge.lua  |  978 ++---
 .../User_Mission_-_That_Sinking_Feeling.lua        |   66 +-
 share/hedgewars/Data/Music/olympics_sd.ogg         |  Bin 0 -> 664774 bytes
 share/hedgewars/Data/Music/sdmusic.ogg             |  Bin 0 -> 816716 bytes
 .../Scripts/Multiplayer/Balanced_Random_Weapon.cfg |    2 +-
 .../Data/Scripts/Multiplayer/Capture_the_Flag.cfg  |    4 +-
 .../Data/Scripts/Multiplayer/Construction_Mode.lua | 3818 +++++++++---------
 .../Scripts/Multiplayer/Continental_supplies.lua   | 1370 ++++---
 .../Data/Scripts/Multiplayer/DiagonalMaze.cfg      |    4 +-
 .../Data/Scripts/Multiplayer/DiagonalMaze.lua      |   16 +-
 .../hedgewars/Data/Scripts/Multiplayer/Frenzy.lua  |  284 +-
 .../hedgewars/Data/Scripts/Multiplayer/Gravity.cfg |    4 +-
 .../hedgewars/Data/Scripts/Multiplayer/Gravity.lua |    9 +-
 .../{Capture_the_Flag.cfg => HedgeEditor.cfg}      |    0
 .../Data/Scripts/Multiplayer/HedgeEditor.hwp       |  Bin 0 -> 100521 bytes
 .../Data/Scripts/Multiplayer/HedgeEditor.lua       | 4115 ++++++++++++++++++++
 .../Data/Scripts/Multiplayer/Highlander.cfg        |    2 +-
 .../Data/Scripts/Multiplayer/Highlander.lua        |    6 +-
 .../hedgewars/Data/Scripts/Multiplayer/Mutant.lua  | 1236 +++---
 .../Data/Scripts/Multiplayer/No_Jumping.cfg        |    4 +-
 share/hedgewars/Data/Scripts/Multiplayer/Racer.lua | 1557 ++++----
 .../Data/Scripts/Multiplayer/Random_Weapon.cfg     |    2 +-
 .../Data/Scripts/Multiplayer/ShoppaMap.cfg         |    4 +-
 .../Data/Scripts/Multiplayer/ShoppaMap.lua         |   21 +-
 .../Data/Scripts/Multiplayer/Space_Invasion.cfg    |    4 +-
 .../Data/Scripts/Multiplayer/TechRacer.hwp         |  Bin 50966 -> 0 bytes
 .../Data/Scripts/Multiplayer/TechRacer.lua         | 2961 ++++++--------
 .../Data/Scripts/Multiplayer/The_Specialists.cfg   |    4 +-
 .../hedgewars/Data/Scripts/Multiplayer/Tumbler.cfg |    4 +-
 .../hedgewars/Data/Scripts/Multiplayer/Tunnels.cfg |    4 +-
 .../hedgewars/Data/Scripts/Multiplayer/Tunnels.lua |    2 +-
 .../hedgewars/Data/Scripts/OfficialChallenges.lua  |    8 +
 share/hedgewars/Data/Scripts/SpeedShoppa.lua       |  194 +
 share/hedgewars/Data/Scripts/TechMaps.lua          | 3858 ++++++++++++++++++
 share/hedgewars/Data/Themes/Art/Border.png         |  Bin 717 -> 577 bytes
 share/hedgewars/Data/Themes/Art/Girder.png         |  Bin 1074 -> 983 bytes
 share/hedgewars/Data/Themes/Art/Sky.png            |  Bin 44011 -> 90400 bytes
 share/hedgewars/Data/Themes/Art/horizont.png       |  Bin 35332 -> 59129 bytes
 share/hedgewars/Data/Themes/Art/theme.cfg          |    4 +-
 share/hedgewars/Data/Themes/Cake/horizont.png      |  Bin 8456 -> 14598 bytes
 share/hedgewars/Data/Themes/Olympics/theme.cfg     |    1 +
 share/version_info.txt                             |    4 +-
 tools/CMakeLists.txt                               |   13 +-
 tools/hwmap.hs                                     |  318 +-
 tools/hwmap2txt/hwmapconverter/README              |   23 +
 tools/hwmap2txt/hwmapconverter/hwmapconverter.pro  |   20 +
 tools/hwmap2txt/hwmapconverter/main.cpp            |   11 +
 tools/hwmap2txt/hwmapconverter/mainwindow.cpp      |  137 +
 tools/hwmap2txt/hwmapconverter/mainwindow.h        |   27 +
 tools/hwmap2txt/hwmapconverter/mainwindow.ui       |   62 +
 tools/pas2c/PascalParser.hs                        |    7 +-
 471 files changed, 25493 insertions(+), 32090 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git



More information about the Pkg-games-commits mailing list