This is an automated email from the git hooks/post-receive script. arand-guest pushed a change to branch upstream in repository lugaru.
from f0d67ef Renamed method because DrawText is reserved on some windows build adds 724f7a6 Imported Upstream version 1.2 No new revisions were added by this update. Summary of changes: .clang-format | 30 + .gitignore | 1 + .gitlab-ci.yml | 8 +- CMakeLists.txt | 112 +- CONTENT-LICENSE.txt | 1 - Data/Campaigns/empire.txt | 80 +- Data/Campaigns/main.txt | 99 +- Data/Campaigns/seventasks.txt | 10 +- Data/Campaigns/temple.txt | 62 +- Data/Maps/{Start1 => Lugaru1} | Bin Data/Maps/{Start9 => Lugaru10} | Bin Data/Maps/{Start10 => Lugaru11} | Bin Data/Maps/{Start11 => Lugaru12} | Bin Data/Maps/{Start12 => Lugaru13} | Bin Data/Maps/{Start13 => Lugaru14} | Bin Data/Maps/{Start14 => Lugaru15} | Bin Data/Maps/{Start15 => Lugaru16} | Bin Data/Maps/{Start16 => Lugaru17} | Bin Data/Maps/{Start17 => Lugaru18} | Bin Data/Maps/{Start18 => Lugaru19} | Bin Data/Maps/{Start2 => Lugaru2} | Bin Data/Maps/{Start19 => Lugaru20} | Bin Data/Maps/{Start20 => Lugaru21} | Bin Data/Maps/{Start21 => Lugaru22} | Bin Data/Maps/{Start22 => Lugaru23} | Bin Data/Maps/{Start23 => Lugaru24} | Bin Data/Maps/{Start24 => Lugaru25} | Bin Data/Maps/{Start25 => Lugaru26} | Bin Data/Maps/{Start26 => Lugaru27} | Bin Data/Maps/{Start27 => Lugaru28} | Bin Data/Maps/{Start28 => Lugaru29} | Bin Data/Maps/{Start3 => Lugaru3} | Bin Data/Maps/{Start29 => Lugaru30} | Bin Data/Maps/{Start30 => Lugaru31} | Bin Data/Maps/{Start4 => Lugaru4} | Bin Data/Maps/{Start5 => Lugaru5} | Bin Data/Maps/{Start6 => Lugaru6} | Bin Data/Maps/{Start7 => Lugaru7} | Bin Data/Maps/{raidercamp => Lugaru8} | Bin Data/Maps/{Start8 => Lugaru9} | Bin Data/Maps/jendraz1 | Bin 15394 -> 15374 bytes Data/Maps/jendraz11 | Bin 4492 -> 4482 bytes Data/Maps/jendraz12 | Bin 11313 -> 11303 bytes Data/Maps/jendraz14 | Bin 3451 -> 3441 bytes Data/Maps/jendraz17 | Bin 4170 -> 4160 bytes Data/Maps/jendraz18 | Bin 4143 -> 4133 bytes Data/Maps/jendraz19 | Bin 5283 -> 5273 bytes Data/Maps/jendraz2 | Bin 6243 -> 6233 bytes Data/Maps/jendraz20 | Bin 6761 -> 6751 bytes Data/Maps/jendraz21 | Bin 4780 -> 4770 bytes Data/Maps/jendraz22 | Bin 5648 -> 5638 bytes Data/Maps/jendraz25 | Bin 6372 -> 6362 bytes Data/Maps/jendraz27 | Bin 2104 -> 2094 bytes Data/Maps/jendraz29 | Bin 3821 -> 3811 bytes Data/Maps/jendraz3 | Bin 7113 -> 7103 bytes Data/Maps/jendraz32 | Bin 3273 -> 3263 bytes Data/Maps/jendraz33 | Bin 2100 -> 2090 bytes Data/Maps/jendraz34 | Bin 2677 -> 2667 bytes Data/Maps/jendraz38 | Bin 12368 -> 12358 bytes Data/Maps/jendraz39 | Bin 3342 -> 3332 bytes Data/Maps/jendraz4 | Bin 6659 -> 6649 bytes Data/Maps/jendraz41 | Bin 10968 -> 10928 bytes Data/Maps/jendraz5 | Bin 6535 -> 6525 bytes Data/Maps/svenclimb | Bin 6572 -> 6538 bytes Data/Maps/svendawn | Bin 7747 -> 7715 bytes Data/Maps/svenfireice | Bin 5288 -> 5224 bytes Data/Maps/svengrotto | Bin 6714 -> 6714 bytes Data/Maps/svenheaven | Bin 5231 -> 5197 bytes Data/Maps/svenredbw3 | Bin 2606 -> 2631 bytes Data/Maps/svenredbw4 | Bin 2624 -> 2528 bytes Data/Maps/svenredbwafter | Bin 4958 -> 4653 bytes Data/Maps/svenroad | Bin 5831 -> 5799 bytes Data/Maps/svensthwrong | Bin 2484 -> 2452 bytes Data/Maps/sventemple | Bin 15766 -> 15766 bytes Data/Maps/sventhrone | Bin 4938 -> 4842 bytes Data/Maps/task15 | Bin 10099 -> 9997 bytes Data/Maps/task18 | Bin 3657 -> 3651 bytes Data/Textures/FontMono.png | Bin 0 -> 31260 bytes Data/Textures/Fur2.png | Bin 0 -> 395837 bytes Data/Textures/FurBW.jpg | Bin 257513 -> 0 bytes Data/Textures/{Fur2.jpg => FurBlack.jpg} | Bin Data/Textures/{BW2.jpg => FurBlackWhite.jpg} | Bin Data/Textures/{Fur3.jpg => FurBrown.jpg} | Bin Data/Textures/{WB2.jpg => FurBrownWhite.jpg} | Bin Data/Textures/{Chocolate.jpg => FurChocolate.jpg} | Bin Data/Textures/{David.jpg => FurDavid.jpg} | Bin Data/Textures/{Lynx.jpg => FurLynx.jpg} | Bin Data/Textures/{Opal.jpg => FurOpal.jpg} | Bin Data/Textures/{Otter.jpg => FurOtter.jpg} | Bin Data/Textures/{Sable.jpg => FurSable.jpg} | Bin Data/Textures/{Fur.jpg => FurWhite.jpg} | Bin Data/Textures/{DarkWolf.jpg => FurWolfDark.jpg} | Bin Data/Textures/{Wolf.jpg => FurWolfGrey.jpg} | Bin .../Textures/{LizardWolf.jpg => FurWolfLizard.jpg} | Bin Data/Textures/{SnowWolf.jpg => FurWolfSnow.jpg} | Bin Dist/{ => Linux}/lugaru.6 | 0 Dist/{ => Linux}/lugaru.appdata.xml | 0 Dist/{ => Linux}/lugaru.desktop | 0 Dist/{ => Linux}/lugaru.png | Bin Dist/OSX/Info.plist | 2 +- .../win-res/lugaru.ico => Dist/Windows/Lugaru.ico | Bin Docs/DEVTOOLS.txt | 89 +- Misc/list-hardcoded-paths-fixes.txt | 8 +- RELEASE-NOTES.md | 55 +- Source/Animation/Animation.cpp | 24 +- Source/Animation/Animation.def | 2 +- Source/Animation/Animation.hpp | 30 +- Source/Animation/Joint.cpp | 32 +- Source/Animation/Joint.hpp | 33 +- Source/Animation/Muscle.cpp | 63 +- Source/Animation/Muscle.hpp | 9 +- Source/Animation/Skeleton.cpp | 552 +-- Source/Animation/Skeleton.hpp | 11 +- Source/Audio/Sounds.cpp | 61 +- Source/Audio/Sounds.def | 2 +- Source/Audio/Sounds.hpp | 13 +- Source/Audio/openal_wrapper.cpp | 336 +- Source/Audio/openal_wrapper.hpp | 72 +- Source/Devtools/ConsoleCmds.cpp | 407 +- Source/Devtools/ConsoleCmds.def | 19 +- Source/Devtools/ConsoleCmds.hpp | 13 +- Source/Environment/Lights.cpp | 45 +- Source/Environment/Lights.hpp | 7 +- Source/Environment/Skybox.cpp | 89 +- Source/Environment/Skybox.hpp | 10 +- Source/Environment/Terrain.cpp | 751 ++-- Source/Environment/Terrain.hpp | 49 +- Source/Game.cpp | 83 +- Source/Game.hpp | 97 +- Source/GameDraw.cpp | 474 ++- Source/GameInitDispose.cpp | 186 +- Source/GameTick.cpp | 4360 ++++++++------------ Source/Globals.cpp | 22 +- Source/Graphic/Decal.cpp | 197 + Source/Graphic/Decal.hpp | 59 + Source/Graphic/Models.cpp | 1188 +++--- Source/Graphic/Models.hpp | 86 +- Source/Graphic/Sprite.cpp | 321 +- Source/Graphic/Sprite.hpp | 21 +- Source/Graphic/Stereo.cpp | 202 +- Source/Graphic/Stereo.hpp | 21 +- Source/Graphic/Text.cpp | 40 +- Source/Graphic/Text.hpp | 6 +- Source/Graphic/Texture.cpp | 38 +- Source/Graphic/Texture.hpp | 12 +- Source/Graphic/gamegl.hpp | 28 +- Source/Level/Awards.cpp | 31 +- Source/Level/Awards.def | 2 +- Source/Level/Awards.hpp | 21 +- Source/Level/Bonuses.def | 2 +- Source/Level/Campaign.cpp | 50 +- Source/Level/Campaign.hpp | 14 +- Source/Level/Dialog.cpp | 38 +- Source/Level/Dialog.hpp | 6 +- Source/Level/Hotspot.cpp | 18 +- Source/Level/Hotspot.hpp | 6 +- Source/{Math/Random.hpp => Lugaru.rc} | 14 +- Source/MacCompatibility.hpp | 98 - Source/Math/Frustum.cpp | 92 +- Source/Math/Frustum.hpp | 2 +- Source/Math/PhysicsMath.hpp | 763 ---- Source/Math/Quaternions.cpp | 534 --- Source/Math/Random.hpp | 2 +- Source/Math/XYZ.cpp | 255 ++ Source/Math/{Quaternions.hpp => XYZ.hpp} | 273 +- Source/Menu/Menu.cpp | 1269 +++--- Source/Menu/Menu.hpp | 21 +- Source/Objects/Object.cpp | 502 +-- Source/Objects/Object.hpp | 14 +- Source/Objects/Person.cpp | 4081 ++++++++++++------ Source/Objects/Person.hpp | 71 +- Source/Objects/PersonType.cpp | 125 + Source/Objects/PersonType.hpp | 69 + Source/Objects/Weapons.cpp | 802 ++-- Source/Objects/Weapons.hpp | 43 +- Source/Platform/Platform.hpp | 95 + .../PlatformUnix.cpp} | 52 +- .../{WinDefs.cpp => Platform/PlatformWindows.cpp} | 21 +- Source/Tutorial.cpp | 664 ++- Source/Tutorial.hpp | 2 +- Source/User/Account.cpp | 73 +- Source/User/Account.hpp | 66 +- Source/User/Settings.cpp | 135 +- Source/User/Settings.hpp | 5 +- Source/Utils/Folders.cpp | 54 +- Source/Utils/Folders.hpp | 40 +- Source/Utils/ImageIO.cpp | 125 +- Source/Utils/ImageIO.hpp | 19 +- Source/Utils/Input.cpp | 51 +- Source/Utils/Input.hpp | 11 +- Source/Utils/binio.h | 2 +- Source/Utils/pack.c | 2 +- Source/Utils/private.c | 2 +- Source/Utils/private.h | 2 +- Source/Utils/unpack.c | 2 +- Source/Version.hpp.in | 46 + Source/WinDefs.hpp | 91 - Source/main.cpp | 317 +- Source/win-res/Lugaru.rc | 72 - Source/win-res/resource.hpp | 36 - 200 files changed, 11026 insertions(+), 10805 deletions(-) create mode 100644 .clang-format rename Data/Maps/{Start1 => Lugaru1} (100%) rename Data/Maps/{Start9 => Lugaru10} (100%) rename Data/Maps/{Start10 => Lugaru11} (100%) rename Data/Maps/{Start11 => Lugaru12} (100%) rename Data/Maps/{Start12 => Lugaru13} (100%) rename Data/Maps/{Start13 => Lugaru14} (100%) rename Data/Maps/{Start14 => Lugaru15} (100%) rename Data/Maps/{Start15 => Lugaru16} (100%) rename Data/Maps/{Start16 => Lugaru17} (100%) rename Data/Maps/{Start17 => Lugaru18} (100%) rename Data/Maps/{Start18 => Lugaru19} (100%) rename Data/Maps/{Start2 => Lugaru2} (100%) rename Data/Maps/{Start19 => Lugaru20} (100%) rename Data/Maps/{Start20 => Lugaru21} (100%) rename Data/Maps/{Start21 => Lugaru22} (100%) rename Data/Maps/{Start22 => Lugaru23} (100%) rename Data/Maps/{Start23 => Lugaru24} (100%) rename Data/Maps/{Start24 => Lugaru25} (100%) rename Data/Maps/{Start25 => Lugaru26} (100%) rename Data/Maps/{Start26 => Lugaru27} (100%) rename Data/Maps/{Start27 => Lugaru28} (100%) rename Data/Maps/{Start28 => Lugaru29} (100%) rename Data/Maps/{Start3 => Lugaru3} (100%) rename Data/Maps/{Start29 => Lugaru30} (100%) rename Data/Maps/{Start30 => Lugaru31} (100%) rename Data/Maps/{Start4 => Lugaru4} (100%) rename Data/Maps/{Start5 => Lugaru5} (100%) rename Data/Maps/{Start6 => Lugaru6} (100%) rename Data/Maps/{Start7 => Lugaru7} (100%) rename Data/Maps/{raidercamp => Lugaru8} (100%) rename Data/Maps/{Start8 => Lugaru9} (100%) create mode 100644 Data/Textures/FontMono.png create mode 100644 Data/Textures/Fur2.png delete mode 100644 Data/Textures/FurBW.jpg rename Data/Textures/{Fur2.jpg => FurBlack.jpg} (100%) rename Data/Textures/{BW2.jpg => FurBlackWhite.jpg} (100%) rename Data/Textures/{Fur3.jpg => FurBrown.jpg} (100%) rename Data/Textures/{WB2.jpg => FurBrownWhite.jpg} (100%) rename Data/Textures/{Chocolate.jpg => FurChocolate.jpg} (100%) rename Data/Textures/{David.jpg => FurDavid.jpg} (100%) rename Data/Textures/{Lynx.jpg => FurLynx.jpg} (100%) rename Data/Textures/{Opal.jpg => FurOpal.jpg} (100%) rename Data/Textures/{Otter.jpg => FurOtter.jpg} (100%) rename Data/Textures/{Sable.jpg => FurSable.jpg} (100%) copy Data/Textures/{Fur.jpg => FurWhite.jpg} (100%) rename Data/Textures/{DarkWolf.jpg => FurWolfDark.jpg} (100%) rename Data/Textures/{Wolf.jpg => FurWolfGrey.jpg} (100%) rename Data/Textures/{LizardWolf.jpg => FurWolfLizard.jpg} (100%) rename Data/Textures/{SnowWolf.jpg => FurWolfSnow.jpg} (100%) rename Dist/{ => Linux}/lugaru.6 (100%) rename Dist/{ => Linux}/lugaru.appdata.xml (100%) rename Dist/{ => Linux}/lugaru.desktop (100%) rename Dist/{ => Linux}/lugaru.png (100%) rename Source/win-res/lugaru.ico => Dist/Windows/Lugaru.ico (100%) create mode 100644 Source/Graphic/Decal.cpp create mode 100644 Source/Graphic/Decal.hpp copy Source/{Math/Random.hpp => Lugaru.rc} (78%) delete mode 100644 Source/MacCompatibility.hpp delete mode 100644 Source/Math/PhysicsMath.hpp delete mode 100644 Source/Math/Quaternions.cpp create mode 100644 Source/Math/XYZ.cpp rename Source/Math/{Quaternions.hpp => XYZ.hpp} (51%) create mode 100644 Source/Objects/PersonType.cpp create mode 100644 Source/Objects/PersonType.hpp create mode 100644 Source/Platform/Platform.hpp rename Source/{MacCompatibility.cpp => Platform/PlatformUnix.cpp} (71%) rename Source/{WinDefs.cpp => Platform/PlatformWindows.cpp} (81%) create mode 100644 Source/Version.hpp.in delete mode 100644 Source/WinDefs.hpp delete mode 100644 Source/win-res/Lugaru.rc delete mode 100644 Source/win-res/resource.hpp -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lugaru.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits