[colobot] annotated tag debian/0.1.10-2_bpo9+1 created (now dad5119)
This is an automated email from the git hooks/post-receive script. odyx pushed a change to annotated tag debian/0.1.10-2_bpo9+1 in repository colobot. at dad5119 (tag) tagging 0cb98e8fea6f12a3b30fc102fc20bda41370a64c (commit) replaces debian/0.1.10-2 tagged by Didier Raboud on Wed Aug 30 11:10:52 2017 +0200 - Log - colobot 0.1.10-2~bpo9+1 Debian release -BEGIN PGP SIGNATURE- iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAloFmOsACgkQi8+nHsoW NFWE7QwAkd3wlq1gY6xG8VtfuXV3hbIvEnnLen2CDH3EIgHpMrN957WwdVJxtMOi fTZbny7ifp9uGdQbthYl+W04gy671vaK9B8LuFWvmrpkp9Zr8B33PWId/zkdcBgY 2/pTlX5crvLiL5XSMqxFOxiuoXxsFx6SPlncgslW9ygapZpPap9uJM5KWtYpw5hI P5Qn3qf8vfbHT3XCjxUvh+jo1TVFgBXtU6Z94JlYjETyr4uA2LD9sTvWYROCCpUT +yvOCgz+NmfcAJxBvyFsSHA9F2EZSf0py93o0Ds5w0nE5X0Bd6XxaBycLOEgYET7 M2Jt+eSIOoBmPIZupUbvbMOeEkbs9HER6IZozjH5HeLZHo0/ZHWE0z+3ETd/VXeM zep69OdiVkD24I3waJawDm3Uni4yvcZ59XTLQpsbWJXrWHFAWoWZauKSjZFjKu6c Lb3DNgZwH876tB6ULL/eN/wxyAZ6oA4ZPUmq4ixQnGkprJHpVQqCYhB2zPIg4n6O W2EYX+FS =q+OL -END PGP SIGNATURE- Didier Raboud (2): Update gbp.conf colobot 0.1.10-2~bpo9+1 Debian release --- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] branch debian/stretch-backports created (now 0cb98e8)
This is an automated email from the git hooks/post-receive script. odyx pushed a change to branch debian/stretch-backports in repository colobot. at 0cb98e8 colobot 0.1.10-2~bpo9+1 Debian release This branch includes the following new commits: new 9a91d5b Update gbp.conf new 0cb98e8 colobot 0.1.10-2~bpo9+1 Debian release The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 02/02: colobot 0.1.10-2~bpo9+1 Debian release
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/stretch-backports in repository colobot. commit 0cb98e8fea6f12a3b30fc102fc20bda41370a64c Author: Didier Raboud Date: Wed Aug 30 11:10:52 2017 +0200 colobot 0.1.10-2~bpo9+1 Debian release --- debian/changelog | 6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9980a64..533da7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +colobot (0.1.10-2~bpo9+1) stretch-backports; urgency=medium + + * Rebuild for stretch-backports. + + -- Didier Raboud Wed, 30 Aug 2017 11:10:52 +0200 + colobot (0.1.10-2) unstable; urgency=medium * Migrate 0.1.10 to unstable -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 01/02: Update gbp.conf
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/stretch-backports in repository colobot. commit 9a91d5b8469773d88ef4dec5d69cb504ba032679 Author: Didier Raboud Date: Wed Aug 30 11:10:37 2017 +0200 Update gbp.conf Gbp-Dch: None --- debian/gbp.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/gbp.conf b/debian/gbp.conf index f55ad02..d64e4ff 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,7 +2,7 @@ # the default branch for upstream sources: upstream-branch = upstream/latest # the default branch for the debian patch: -debian-branch = debian/master +debian-branch = debian/squeeze-backports [dch] # include information from meta tags: meta = true -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] tag upstream/0.1.11 created (now b5cc768)
This is an automated email from the git hooks/post-receive script. odyx pushed a change to tag upstream/0.1.11 in repository colobot. at b5cc768 (commit) This tag includes the following new commits: new 36cd5ee Post-release 0.1.10-alpha new 30210d0 Add searchall() and improve search() function new 15b8cf7 Update object variable when concatenating strings new f461465 Fix -Wundefined-var-template warning (#963) new daacd00 INSTALL-MacOSX.md: Add missed xmlstarlet dependency (#967) new 8058a89 Merge branch 'master' into dev new 92a8140 Jenkinsfile: prevent PRs to master new 199210c Merge branch 'master' into dev new bf94bd7 Merge pull request #965 from melex750/dev new a95f736 Fix delete(this.id), closes #925 new 4faabf2 Apply shadow mapping performance counter patch from #923 new 8d9b363 Update data submodule new 5d0e58f Update data submodule new ac27bda Update data submodule new bb35585 Fix object.factory() code type detection, closes #938 new 25c79df Update data submodule new d860a08 Merge long first frame rendering fix from #898 new d63ed86 Added QuickSave/QuickLoad feature #929 new 75d9f85 Display warning if no quicksave slot is found new a29a4f9 Damage Alert Implementation (2th Stage) new 2d2990f Fix moving and resizing editor/debugger window new 8687016 Fix moving and resizing open/save dialog new bef6e9e Make Thumper Squash transportable/small objects. new b5e0f99 Make Recycler Recycle small Building Ruins. new c03dfc1 Add escape codes for string literals new e3c44e9 Add syntax highlighting for escape codes new a4482f1 Decrease radius of squashing items. new 0de347d Fixed goto() behaviour on 32-bit binaries new 959854e 'Make Thumper Great Again' new ee35d35 Correct Small Mistake new 2751db3 Add horizontal FoV to CEngine new 2e8798b Make planets stay in one place in the sky - at least in the X direction. new 8b0ccf6 Fix horizontal scrolling of background images. new f40756b Fix turn(1) doesn't draining energy new dab223e Clamp energy level to standard values for OrgaShooters new bf69b86 Fixed shortcut not changing to normal state new 2a0c2c3 Make shortcut blink in red new 0a83508 Merge pull request #985 from melex750/dev new 9448f67 Merge pull request #1004 from melex750/dev-cbot new ee0f3ff Merge pull request #1022 from immibis/dev new 6b1dd5d Merge pull request #994 from DavivaD/dev-issue-658 new a9e0874 Fix 'this' for object:: functions new 1eee06d Keep mission history after loading a crashsave new d357de1 Save object lifetime and abstime new 387b7b5 Fix non-scoreboard code battles, closes #1023 new 17d47e9 Merge pull request #1040 from melex750/dev new d3b969f Merge pull request #992 from DavivaD/dev-dmgalarm-st2 new 12dd96c Update data submodule new b89b0d2 Update data submodule new 5021a40 Update data submodule new 5f5e523 Fix CEdit background margins, closes #1029 new f87aa15 Update data submodule new 611c353 Update release script new b143aa3 Release 0.1.11-alpha: Merge branch 'dev' new b5cc768 Release 0.1.11-alpha: Bump version The 55 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 47/62: Fix non-scoreboard code battles, closes #1023
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 387b7b539661bc375b93f86166adc28bc87393e6 Author: krzys-h Date: Sat Nov 4 11:23:08 2017 +0100 Fix non-scoreboard code battles, closes #1023 --- src/level/robotmain.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index a92b10b..21daeca 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -5843,6 +5843,7 @@ void CRobotMain::CreateCodeBattleInterface() pw->CreateButton(pos, ddim, 13, EVENT_CODE_BATTLE_SPECTATOR); } +if (!m_scoreboard) return; pos.y += ddim.y; ddim.y = textHeight; int i = 0; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 59/62: Update Vcs-* and Hompage URLs to https variants
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 1be5eb9fac66225abe6c25ed61c20e696f48def2 Author: Didier Raboud Date: Fri Nov 10 11:34:27 2017 +0100 Update Vcs-* and Hompage URLs to https variants --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index c21c97d..b9a312c 100644 --- a/debian/control +++ b/debian/control @@ -30,10 +30,10 @@ Build-Depends-Indep: doxygen, graphviz, vorbis-tools, -Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-games/colobot.git -b debian -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/colobot.git +Vcs-Git: git://anonscm.debian.org/pkg-games/colobot.git -b debian/master +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/colobot.git Standards-Version: 4.1.1 -Homepage: http://colobot.info +Homepage: https://colobot.info Package: colobot Architecture: any -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 57/62: Release 0.1.11-alpha: Bump version
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit b5cc7689d1a8f9e6396454c70e819e10536a154a Author: krzys-h Date: Fri Nov 10 11:01:25 2017 +0100 Release 0.1.11-alpha: Bump version --- CMakeLists.txt | 6 +++--- data | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87f0cfc..2986ce8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,12 +13,12 @@ project(colobot C CXX) set(COLOBOT_VERSION_CODENAME "Gold") set(COLOBOT_VERSION_MAJOR0) set(COLOBOT_VERSION_MINOR1) -set(COLOBOT_VERSION_REVISION 10) +set(COLOBOT_VERSION_REVISION 11) # Used on official releases -#set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha") +set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha") # Used on unreleased, development builds -set(COLOBOT_VERSION_UNRELEASED "+alpha") +#set(COLOBOT_VERSION_UNRELEASED "+alpha") # Append git characteristics to version if(DEFINED COLOBOT_VERSION_UNRELEASED) diff --git a/data b/data index 928d03d..bab2d99 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 928d03d15c1e506d3e3a81513c4a2f8607ce2bf6 +Subproject commit bab2d994d3602f70774257d5b2125b41e6aca926 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 54/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit f87aa15bb2270c4a1f966f33385cf8a13b6d15ff Author: krzys-h Date: Fri Nov 10 09:28:39 2017 +0100 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index c581ef9..928d03d 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit c581ef906c5240b6283d47d01fa10c8c30e7ed32 +Subproject commit 928d03d15c1e506d3e3a81513c4a2f8607ce2bf6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 46/62: Save object lifetime and abstime
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit d357de14385fdf249e9c358fba35c2efaa9ff77e Author: melex750 Date: Tue Oct 24 05:12:19 2017 -0400 Save object lifetime and abstime Fixes #1006 --- src/level/robotmain.cpp | 6 +- src/object/old_object.cpp | 4 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index a92b10b..d55cd17 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -3689,7 +3689,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) // TODO: m_engine->TimeInit(); ?? m_input->ResetKeyStates(); m_time = 0.0f; -m_gameTime = 0.0f; +if (m_sceneReadPath.empty()) m_gameTime = 0.0f; m_gameTimeAbsolute = 0.0f; m_autosaveLast = 0.0f; m_infoUsed = 0; @@ -4542,6 +4542,7 @@ bool CRobotMain::IOWriteScene(std::string filename, std::string filecbot, std::s else line->AddParam("chap", MakeUnique(m_levelChap)); line->AddParam("rank", MakeUnique(m_levelRank)); +line->AddParam("gametime", MakeUnique(GetGameTime())); levelParser.AddLine(std::move(line)); line = MakeUnique("Map"); @@ -4722,6 +4723,9 @@ CObject* CRobotMain::IOReadScene(std::string filename, std::string filecbot) int objCounter = 0; for (auto& line : levelParser.GetLines()) { +if (line->GetCommand() == "Mission") +m_gameTime = line->GetParam("gametime")->AsFloat(0.0f); + if (line->GetCommand() == "Map") m_map->ZoomMap(line->GetParam("zoom")->AsFloat()); diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp index dbe92b3..247b5a1 100644 --- a/src/object/old_object.cpp +++ b/src/object/old_object.cpp @@ -1010,6 +1010,8 @@ void COldObject::Write(CLevelParserLine* line) if ( m_virusTime != 0.0f ) line->AddParam("virusTime", MakeUnique(m_virusTime)); +line->AddParam("lifetime", MakeUnique(m_aTime)); + // Sets the parameters of the command line. CLevelParserParamVec cmdline; for(float value : GetCmdLine()) @@ -1144,6 +1146,8 @@ void COldObject::Read(CLevelParserLine* line) m_bVirusMode = line->GetParam("virusMode")->AsBool(false); m_virusTime = line->GetParam("virusTime")->AsFloat(0.0f); +m_aTime = line->GetParam("lifetime")->AsFloat(0.0f); + if ( m_motion != nullptr ) { m_motion->Read(line); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 61/62: Fix DEB_HOST_ARCH_OS dpkg-architecture variable setting
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 04449c249e8137d49c8661132b57551342739f2b Author: Didier Raboud Date: Fri Nov 10 12:45:21 2017 +0100 Fix DEB_HOST_ARCH_OS dpkg-architecture variable setting --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index b3a3497..c2138b0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f HIPPOMOCKS_BROKEN_ARCHS=arm64 mips mips64el mipsel -DEB_HOST_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH) CBOT_CONFIGURE_SOUNDS=-DMUSIC:BOOL=False ifneq (,$(findstring colobot-common-sounds, $(shell dh_listpackages))) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] branch upstream/latest updated (407d855 -> b5cc768)
This is an automated email from the git hooks/post-receive script. odyx pushed a change to branch upstream/latest in repository colobot. from 407d855 Release 0.1.8-alpha: Bump version adds aa6345a Post-release 0.1.8-alpha adds 81b7bcc Moved system modules from app/ to common/system/ adds 5fea22f Moved performance counters to a separate class adds 2c3e90b Added CBot performance counter adds fef050f Fixed loading apperance scene, closes #802 adds ffd688e Do not render the shadow map when pause blur is active adds 716218a Fixed compile error on Windows adds dbe7fd6 Added performance counter for UI particles adds 210b5c2 Fix memory leak related to performance counters adds c03d8be Import documentation from old dev wiki adds 1546c15 Filled not existed translation, minor translation changes adds 191ca3c Reducing the length of the lines adds 4cb2eb6 Removed fuzzy markers for lines fixed in #805 adds 29f0631 Asynchronous sound/music loading adds 0ecdee0 Merge branch 'dev-async-music-load' (PR #801) adds 48666c4 Fix not calling destructors after save/reload adds 397e312 Fix RestoreState for subclass instance vars adds d0a8a32 Fix RestoreMethode when calling inherited methods adds 860cdb0 Fix calling multi-level inherited methods adds c9c02f5 Fix assigning instance to pointer for inheritance adds c89e6f4 Begin adding unit tests for inheritance adds 6b8e240 Fix implicit downcast with variable initialization adds 8b3c430 Add more unit tests for inheritance adds d83553c Merge pull request #809 from melex750/dev adds fad38cd Add accessing members to function calls adds e48188b Fix failed assert when literal null is returned adds f3bf56d Add unit tests for returned object member access adds a205eac Add missing license headers adds b9d4d57 Syntax sugar: Accessing members of returned objects (#808) adds 6621831 Add support for circular references adds 71aa7e4 Add unit tests for circular reference adds d411c5e Allow circular references from different classes (#814) adds 584d782 Add VS Code files to .gitignore adds 92b1e54 Remove default lambda parameters adds 974b6ef Add -pedantic-errors flag to C++ compilers adds 514829d Normalize dir parameter when copying to clipboard adds e085b4b Enable C++ exceptions in MSVC adds e3b3d7c Enable debug info for MSVC adds 88227a3 Allow multiple objects with exactly the same distance to be returned by `radarall` adds 859cec7 Added comment explaining container choice adds 8dc03f4 Merge pull request #817 from CyborgMaster/radarall-equidistant-objects adds 3146d4e Add method chaining for class constructor calls adds 84c9854 Merge pull request #819 from melex750/dev adds ade8566 Update data submodule adds 6b6eca6 Update data submodule adds 4a14a44 Add implicit cast and null for passing arguments adds 3debfb9 Fix finding in-class methods when searching by ID adds 9ab7f7d Fix access to protected and private variables adds 81aae35 Updated translation files after 4a14a44f3f07ee103161fbec2bcaa4bf5e6e2a84 adds ca548e2 Update CBotFieldExpr::ProtectionError docs adds 89bf0da Merge pull request #834 from melex750/dev adds dc415c3 Remove character limit in CEdit (#836) adds 3472ec6 Revert CParticle::CheckChannel changes adds 73be031 Fix infinite pause when cloning program with errors, closes #837 adds d107605 Add file append mode in CBot (#838) adds a96835e Change CBot file log messages adds bb9d1c8 Remove "this == nullptr" checks in CBOT, fixes #828 adds fee1619 Update data submodule adds ef28b0d Update data submodule adds 81f4436 Update data submodule adds 3c1bf3c Added script for use when releasing new versions adds 70853f2 Add temporary hack for issue #828 adds d435628 Remove unused imports from release.py adds b0e34bb Release 0.1.9-alpha: Merge branch 'dev' adds b8d88c9 Release 0.1.9-alpha: Bump version adds 81c7d05 Post-release 0.1.9-alpha adds c5b5435 Added half-precision floating-point format implementation adds ae3b2b8 Added types and vertex format specification adds 993d9e9 Added rendering with generic vertex formats adds 5aa5d91 Fix compilation errors in half.cpp adds 3c71354 Fix MSVC2015 compilation error adds 9fe85e2 Code simplification in CGL14Device adds e7c41ae Correction in changing wrap mode in SetState adds 1b074bd Fix crash on loading saves with produce()d objects (#765) adds 6e4764b Fix GroundSpot blending
[colobot] 62/62: colobot 0.1.11-1 Debian release
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 1b4aafb42da0e42adb1c4985b97ec75a69f2f76c Author: Didier Raboud Date: Fri Nov 10 12:08:07 2017 +0100 colobot 0.1.11-1 Debian release --- debian/changelog | 12 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9980a64..c9a1145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +colobot (0.1.11-1) unstable; urgency=medium + + * New 0.1.11 upstream release + + * Revert "Add menu file and xpm icon" +This reverts commit a59d1606c3592fad39194c0bc6b49e555acf9f6f. + * Bump S-V to 4.1.1 + * Update Vcs-* and Hompage URLs to https variants + * Fix DEB_HOST_ARCH_OS dpkg-architecture variable setting + + -- Didier Raboud Fri, 10 Nov 2017 12:08:07 +0100 + colobot (0.1.10-2) unstable; urgency=medium * Migrate 0.1.10 to unstable -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] annotated tag debian/0.1.11-1 created (now 977b776)
This is an automated email from the git hooks/post-receive script. odyx pushed a change to annotated tag debian/0.1.11-1 in repository colobot. at 977b776 (tag) tagging 1b4aafb42da0e42adb1c4985b97ec75a69f2f76c (commit) replaces debian/0.1.10-2 tagged by Didier Raboud on Fri Nov 10 12:08:07 2017 +0100 - Log - colobot 0.1.11-1 Debian release -BEGIN PGP SIGNATURE- iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAloFkygACgkQi8+nHsoW NFX1eQwAhoBgxC67yEqAbbRj3/HnSIJ6iaq7cVoDV+SmWgvsG+paF4dYQzLEnFFo Fe9uyfJCYBdGLkXWJyAekTlarnqYB8gparM8dR8dMGozTVDh0JUOH+55qwp/8sm9 WRpEC7nWoYpOw2r0bBhXzExeTPakmIGIfITkeMCpbDOheagYzd5s9s6Eo5pbJQTU KwUad+o9iPvOhzIF8zgulVrc82cle3J6I92gv4Bu/S2HcN/wp9Q8nlecg5Wde+O4 sbcaDYNyMYKTC7I2kuejTRm2o3qa1Ow3eaglOhsjpureAFDZQ/ZNCJouRo/MlU+m sk9m/sZsxzbBk8H098vwRaCiKCZHptEkjMNAyAYdIv8zUQ5zt/HVkasX1DqXBVO8 88gYkevq/JCvhjCiqx9lFFEB1scoIuea+88oAqHsAHe/vAFOfTHe2KVkb04GklMJ XSqdsSk+X1PXRseLHhlYS8kcTwabrvvDg1LjpiiiwYx1iTXynWYwfBUBiDIh0jjk cWejT/Do =LjM0 -END PGP SIGNATURE- Abigail (1): Fix -Wundefined-var-template warning (#963) Andrey (1): INSTALL-MacOSX.md: Add missed xmlstarlet dependency (#967) DavivaD (7): Damage Alert Implementation (2th Stage) Make Thumper Squash transportable/small objects. Make Recycler Recycle small Building Ruins. Decrease radius of squashing items. 'Make Thumper Great Again' Correct Small Mistake Make shortcut blink in red Didier Raboud (7): Revert "Add menu file and xpm icon" Bump Standards-Version to 4.0.1, after having removed the 'menu' entry Bump S-V to 4.1.1 Update Vcs-* and Hompage URLs to https variants Merge tag 'upstream/0.1.11' into debian/master Fix DEB_HOST_ARCH_OS dpkg-architecture variable setting colobot 0.1.11-1 Debian release immibis (3): Add horizontal FoV to CEngine Make planets stay in one place in the sky - at least in the X direction. Fix horizontal scrolling of background images. krzys-h (21): Post-release 0.1.10-alpha Merge branch 'master' into dev Jenkinsfile: prevent PRs to master Merge branch 'master' into dev Fix delete(this.id), closes #925 Apply shadow mapping performance counter patch from #923 Update data submodule Update data submodule Update data submodule Fix object.factory() code type detection, closes #938 Update data submodule Merge long first frame rendering fix from #898 Fix non-scoreboard code battles, closes #1023 Update data submodule Update data submodule Update data submodule Fix CEdit background margins, closes #1029 Update data submodule Update release script Release 0.1.11-alpha: Merge branch 'dev' Release 0.1.11-alpha: Bump version krzys_h (7): Merge pull request #965 from melex750/dev Merge pull request #985 from melex750/dev Merge pull request #1004 from melex750/dev-cbot Merge pull request #1022 from immibis/dev Merge pull request #994 from DavivaD/dev-issue-658 Merge pull request #1040 from melex750/dev Merge pull request #992 from DavivaD/dev-dmgalarm-st2 melex750 (10): Add searchall() and improve search() function Update object variable when concatenating strings Fix moving and resizing editor/debugger window Fix moving and resizing open/save dialog Add escape codes for string literals Add syntax highlighting for escape codes Fixed shortcut not changing to normal state Fix 'this' for object:: functions Keep mission history after loading a crashsave Save object lifetime and abstime tomangelo2 (5): Added QuickSave/QuickLoad feature #929 Display warning if no quicksave slot is found Fixed goto() behaviour on 32-bit binaries Fix turn(1) doesn't draining energy Clamp energy level to standard values for OrgaShooters --- This annotated tag includes the following new commits: new 36cd5ee Post-release 0.1.10-alpha new 30210d0 Add searchall() and improve search() function new 15b8cf7 Update object variable when concatenating strings new f461465 Fix -Wundefined-var-template warning (#963) new daacd00 INSTALL-MacOSX.md: Add missed xmlstarlet dependency (#967) new 8058a89 Merge branch 'master' into dev new 92a8140 Jenkinsfile: prevent PRs to master new 199210c Merge branch 'master' into dev new bf94bd7 Merge pull request #965 from melex750/dev new a95f736 Fix delete(this.id), closes #925 new 4faabf2 Apply shadow mapping performance counter patch from #923 new 8d9b363 Update data submodule new 5d0e58f Update data submodule new ac27bda Update data su
[colobot] 55/62: Update release script
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 611c35306009dec81e530f1e79638ac1be691f29 Author: krzys-h Date: Fri Nov 10 11:01:09 2017 +0100 Update release script --- tools/release.py | 111 ++- 1 file changed, 85 insertions(+), 26 deletions(-) diff --git a/tools/release.py b/tools/release.py old mode 100644 new mode 100755 index 8139272..6ab155a --- a/tools/release.py +++ b/tools/release.py @@ -1,9 +1,10 @@ +#!/usr/bin/env python3 + # Script to use when releasing new versions # Run from main repo directory with data submodule pulled in data/ # -# Note: this has not yet been tested thoughtly, VERIFY EVERYTHING THIS SCRIPT DOES MANUALLY -# # Will automatically: +# * Make sure you don't have any uncommited local changes # * Make sure you don't forget to pull any changes before you start # * Get current version number from CMakeLists.txt # * Merge dev -> master in the data submodule @@ -13,26 +14,48 @@ # * Bump version number in main repo # * Tag release in main repo # * Update dev in main repo to point to the new merge commit +# * Push everything to remote +# * Create release drafts on GitHub # # After finished, verify everything is correct and push the changes import os import re +import sys +import subprocess +import io + +try: + git_root = subprocess.check_output(['git', 'rev-parse', '--show-toplevel']).strip() +except subprocess.CalledProcessError: + print('\033[1;31m[!] Not inside a git repository!\033[0m') + sys.exit(1) +os.chdir(git_root) +while not os.path.isdir('.git'): + # Likely inside a submodule + # TODO: There is a command called `git rev-parse --show-superproject-working-tree` but it's quite new so not always available :/ + os.chdir('..') + +print('\033[1;34m[*] Make sure you don\'t have any uncommited local changes...\033[0m') +if subprocess.check_output(['git', 'status', '--porcelain']): # This also handles data subdirectory automatically + print('\033[1;31m[!] You have uncommited local changes!\033[0m') + os.system('git status') # Show the changes + sys.exit(1) print('\033[1;34m[*] Make sure all remote changes are pulled...\033[0m') -os.system('git checkout dev') -os.system('git pull --ff') -os.system('git checkout master') -os.system('git pull --ff') +subprocess.check_call(['git', 'checkout', 'dev']) +subprocess.check_call(['git', 'pull', '--ff']) +subprocess.check_call(['git', 'checkout', 'master']) +subprocess.check_call(['git', 'pull', '--ff']) os.chdir('data') -os.system('git checkout dev') -os.system('git pull --ff') -os.system('git checkout master') -os.system('git pull --ff') +subprocess.check_call(['git', 'checkout', 'dev']) +subprocess.check_call(['git', 'pull', '--ff']) +subprocess.check_call(['git', 'checkout', 'master']) +subprocess.check_call(['git', 'pull', '--ff']) os.chdir('..') print('\033[1;34m[*] Get version numbers...\033[0m') -os.system('git checkout dev') +subprocess.check_call(['git', 'checkout', 'dev']) major = None minor = None revision = None @@ -40,7 +63,7 @@ codename = None data = open('CMakeLists.txt', 'r').readlines() for i in range(len(data)): - m = re.match(r'^set\(COLOBOT_VERSION_(MAJOR|MINOR|REVISION)( +)([0-9])+\)$', data[i]) + m = re.match(r'^set\(COLOBOT_VERSION_(MAJOR|MINOR|REVISION)( +)([0-9]+)\)$', data[i]) if m: x = int(m.group(3)) if m.group(1) == 'MAJOR': @@ -60,43 +83,79 @@ for i in range(len(data)): codename = m.group(4) data[i] = ('#' if comment else '')+'set(COLOBOT_VERSION_'+m.group(2)+m.group(3)+'"'+m.group(4)+'")\n' -os.system('git checkout master') +subprocess.check_call(['git', 'checkout', 'master']) version = '%d.%d.%d%s' % (major, minor, revision, codename) +version_human = '%s %d.%d.%d' % (codename.strip('-'), major, minor, revision) print('\033[1;32m[+] Building version '+version+'\033[0m') print('\033[1;34m[*] Merge data...\033[0m') os.chdir('data') -os.system('git merge dev --no-ff -m "Release '+version+': Merge branch \'dev\'"') +subprocess.check_call(['git', 'merge', 'dev', '--no-ff', '-m', 'Release '+version+': Merge branch \'dev\'']) print('\033[1;34m[*] Tag data...\033[0m') -os.system('git tag colobot-gold-'+version) +subprocess.check_call(['git', 'tag', 'colobot-gold-'+version]) print('\033[1;34m[*] Update dev on data...\033[0m') -os.system('git checkout dev') -os.system('git merge master --ff') -os.system('git checkout master') +subprocess.check_call(['git', 'checkout', 'dev']) +subprocess.check_call(['git', 'merge', 'master', '--ff']) +subprocess.check_call(['git', 'checkout', 'master']) print('\033[1;34m[*] Merge main...\033[0m') os.chdir('..') -os.system('git merge dev --no-ff -m "Release '+version+': Merge branch \'dev\'"') +subprocess.check_call(['git', 'merge',
[colobot] 44/62: Fix 'this' for object:: functions
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit a9e0874abcfd9f070c6f1288eff0c031d7a31010 Author: melex750 Date: Tue Oct 24 04:46:07 2017 -0400 Fix 'this' for object:: functions Fixes #672 Fixes #1026 --- src/CBot/CBotInstr/CBotExprVar.cpp | 4 src/CBot/CBotInstr/CBotFunction.cpp | 10 ++ src/CBot/CBotInstr/CBotLeftExpr.cpp | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/CBot/CBotInstr/CBotExprVar.cpp b/src/CBot/CBotInstr/CBotExprVar.cpp index ed77d8a..ed20c6f 100644 --- a/src/CBot/CBotInstr/CBotExprVar.cpp +++ b/src/CBot/CBotInstr/CBotExprVar.cpp @@ -76,6 +76,8 @@ CBotInstr* CBotExprVar::Compile(CBotToken*& p, CBotCStack* pStack, bool bCheckRe // This is an element of the current class // ads the equivalent of this. before CBotToken token("this"); +// invisible 'this.' highlights member token on error +token.SetPos(p->GetStart(), p->GetEnd()); inst->SetToken(&token); (static_cast(inst))->m_nIdent = -2;// identificator for this @@ -196,6 +198,8 @@ CBotInstr* CBotExprVar::CompileMethode(CBotToken* &p, CBotCStack* pStack) // this is an element of the current class // adds the equivalent of this. before +// invisible 'this.' highlights member token on error +pthis.SetPos(pp->GetStart(), pp->GetEnd()); inst->SetToken(&pthis); (static_cast(inst))->m_nIdent = -2;// ident for this diff --git a/src/CBot/CBotInstr/CBotFunction.cpp b/src/CBot/CBotInstr/CBotFunction.cpp index c24f986..13b9005 100644 --- a/src/CBot/CBotInstr/CBotFunction.cpp +++ b/src/CBot/CBotInstr/CBotFunction.cpp @@ -464,6 +464,7 @@ void CBotFunction::RestoreState(CBotVar** ppVars, CBotStack* &pj, CBotVar* pInst { CBotVar* pThis = pile->FindVar("this"); pThis->SetInit(CBotVar::InitType::IS_POINTER); +pThis->SetPointer(pInstance); pThis->SetUniqNum(-2); } @@ -672,6 +673,7 @@ int CBotFunction::DoCall(CBotProgram* program, const std::list& l { CBotTypResult type; CBotFunction* pt = nullptr; +CBotProgram*baseProg = pStack->GetProgram(true); pt = FindLocalOrPublic(localFunctionList, nIdent, name, ppVars, type); @@ -695,7 +697,7 @@ int CBotFunction::DoCall(CBotProgram* program, const std::list& l if (pStk3b->GetState() == 0 && !pt->m_MasterClass.empty()) { -CBotVar* pInstance = program->m_thisVar; +CBotVar* pInstance = (baseProg != nullptr) ? baseProg->m_thisVar : nullptr; // make "this" known CBotVar* pThis ; if ( pInstance == nullptr ) @@ -762,8 +764,7 @@ void CBotFunction::RestoreCall(const std::list& localFunctionList CBotFunction* pt = nullptr; CBotStack* pStk1; CBotStack* pStk3; - -// search function to return the ok identifier +CBotProgram*baseProg = pStack->GetProgram(true); pt = FindLocalOrPublic(localFunctionList, nIdent, name, ppVars, type); @@ -792,10 +793,11 @@ void CBotFunction::RestoreCall(const std::list& localFunctionList { if ( !pt->m_MasterClass.empty() ) { -//CBotVar* pInstance = m_pProg->m_thisVar; +CBotVar* pInstance = (baseProg != nullptr) ? baseProg->m_thisVar : nullptr; // make "this" known CBotVar* pThis = pStk1->FindVar("this"); pThis->SetInit(CBotVar::InitType::IS_POINTER); +pThis->SetPointer(pInstance); pThis->SetUniqNum(-2); } } diff --git a/src/CBot/CBotInstr/CBotLeftExpr.cpp b/src/CBot/CBotInstr/CBotLeftExpr.cpp index 4c4400a..3c701eb 100644 --- a/src/CBot/CBotInstr/CBotLeftExpr.cpp +++ b/src/CBot/CBotInstr/CBotLeftExpr.cpp @@ -72,6 +72,8 @@ CBotLeftExpr* CBotLeftExpr::Compile(CBotToken* &p, CBotCStack* pStack) // this is an element of the current class // adds the equivalent of this. before CBotToken pthis("this"); +// invisible 'this.' highlights member token on error +pthis.SetPos(p->GetStart(), p->GetEnd()); inst->SetToken(&pthis); inst->m_nIdent = -2;// indent for this -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 50/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 12dd96c3b2ff940904eb4c3f73c78972c05c9e26 Author: krzys-h Date: Sat Nov 4 11:28:24 2017 +0100 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index 6b8e28c..673ff06 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 6b8e28c5940d0158da84e67f69798674af03dcf1 +Subproject commit 673ff068f13731f96406cca03ef64a2f82b93deb -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 48/62: Merge pull request #1040 from melex750/dev
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 17d47e9b633171683955761ab1fb444d4c65b866 Merge: 387b7b5 d357de1 Author: krzys_h Date: Sat Nov 4 11:24:09 2017 +0100 Merge pull request #1040 from melex750/dev Saved game bug fix src/CBot/CBotInstr/CBotExprVar.cpp | 4 src/CBot/CBotInstr/CBotFunction.cpp | 10 ++ src/CBot/CBotInstr/CBotLeftExpr.cpp | 2 ++ src/level/player_profile.cpp| 2 ++ src/level/robotmain.cpp | 6 +- src/object/old_object.cpp | 4 6 files changed, 23 insertions(+), 5 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 58/62: Bump S-V to 4.1.1
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 29578fe0851ae4690800ac81bebf0fc0aa35648e Author: Didier Raboud Date: Fri Nov 10 11:32:12 2017 +0100 Bump S-V to 4.1.1 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 84fb686..c21c97d 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Build-Depends-Indep: vorbis-tools, Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-games/colobot.git -b debian Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/colobot.git -Standards-Version: 4.0.1 +Standards-Version: 4.1.1 Homepage: http://colobot.info Package: colobot -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 60/62: Merge tag 'upstream/0.1.11' into debian/master
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 49dd30abb2a53d739bb7b929407754ffd0b5bfe5 Merge: 1be5eb9 b5cc768 Author: Didier Raboud Date: Fri Nov 10 11:39:52 2017 +0100 Merge tag 'upstream/0.1.11' into debian/master CMakeLists.txt | 2 +- INSTALL-MacOSX.md| 2 +- Jenkinsfile | 4 + data | 2 +- po/colobot.pot | 37 +-- po/de.po | 134 +- po/fr.po | 94 po/pl.po | 57 ++ po/ru.po | 94 src/CBot/CBotEnums.h | 6 + src/CBot/CBotInstr/CBotExprLitString.cpp | 144 +--- src/CBot/CBotInstr/CBotExprLitString.h | 3 + src/CBot/CBotInstr/CBotExprVar.cpp | 4 + src/CBot/CBotInstr/CBotFunction.cpp | 10 +- src/CBot/CBotInstr/CBotLeftExpr.cpp | 2 + src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 13 ++- src/CBot/CBotToken.cpp | 25 ++--- src/CBot/CBotUtils.cpp | 45 src/CBot/CBotUtils.h | 15 +++ src/app/app.cpp | 3 - src/app/input.cpp| 27 ++--- src/app/pathman.cpp | 2 - src/common/config_file.cpp | 3 - src/common/error.h | 1 + src/common/key.h | 12 +- src/common/logger.cpp| 4 - src/common/restext.cpp | 19 ++-- src/common/settings.cpp | 17 ++- src/common/settings.h| 4 + src/common/singleton.h | 1 + src/graphics/engine/engine.cpp | 22 +++- src/graphics/engine/engine.h | 18 ++- src/graphics/engine/planet.cpp | 12 +- src/level/player_profile.cpp | 2 + src/level/robotmain.cpp | 132 +- src/level/robotmain.h| 2 + src/object/auto/autofactory.cpp | 4 +- src/object/interface/damageable_object.h | 7 ++ src/object/motion/motionvehicle.cpp | 1 + src/object/object_manager.cpp| 4 - src/object/old_object.cpp| 31 +- src/object/old_object.h | 5 + src/object/task/taskgoto.cpp | 7 +- src/object/task/taskrecover.cpp | 2 +- src/object/task/taskterraform.cpp| 111 ++- src/object/task/taskturn.cpp | 14 ++- src/object/task/taskturn.h | 1 + src/script/cbottoken.cpp | 5 +- src/script/script.cpp| 58 +- src/script/scriptfunc.cpp| 183 ++- src/script/scriptfunc.h | 3 +- src/ui/controls/control.h| 3 +- src/ui/controls/edit.cpp | 6 +- src/ui/controls/shortcut.cpp | 21 src/ui/mainshort.cpp | 1 + src/ui/studio.cpp| 66 +++ src/ui/studio.h | 4 + test/unit/CBot/CBot_test.cpp | 114 +++ tools/release.py | 111 ++- 59 files changed, 1327 insertions(+), 409 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 45/62: Keep mission history after loading a crashsave
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 1eee06d9f952ad679931e616332bfd35a837fa4a Author: melex750 Date: Tue Oct 24 04:55:22 2017 -0400 Keep mission history after loading a crashsave Fixes #812 --- src/level/player_profile.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/level/player_profile.cpp b/src/level/player_profile.cpp index bedd76c..21bb3b2 100644 --- a/src/level/player_profile.cpp +++ b/src/level/player_profile.cpp @@ -518,6 +518,8 @@ void CPlayerProfile::LoadScene(std::string dir) CLevelParserLine* line = levelParser.Get("Mission"); cat = GetLevelCategoryFromDir(line->GetParam("base")->AsString()); + if (dir == "../../crashsave") LoadFinishedLevels(cat); + rank = line->GetParam("rank")->AsInt(); if (cat == LevelCategory::CustomLevels) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 52/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 5021a4091e3313bcd6b4d4c9bfd769c11e2f41ef Author: krzys-h Date: Sat Nov 4 11:42:27 2017 +0100 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index f5cbda7..c581ef9 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit f5cbda70ec3772381b06c6a31ac1e7c65ee46b57 +Subproject commit c581ef906c5240b6283d47d01fa10c8c30e7ed32 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 53/62: Fix CEdit background margins, closes #1029
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 5f5e5234fcba4de86a08187bb9baf643c9877400 Author: krzys-h Date: Sat Nov 4 11:56:15 2017 +0100 Fix CEdit background margins, closes #1029 This mismatch happened after changes in 08d87fa9757a05b66325b9ea77123d098143ddbd --- src/ui/controls/edit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/controls/edit.cpp b/src/ui/controls/edit.cpp index 7d08b26..f5e0267 100644 --- a/src/ui/controls/edit.cpp +++ b/src/ui/controls/edit.cpp @@ -47,9 +47,9 @@ namespace Ui { -const float MARGX = (5.0f/640.0f); -const float MARGY = (5.0f/480.0f); -const float MARGYS = (4.0f/480.0f); +const float MARGX = (3.75f/640.0f); +const float MARGY = (3.75f/480.0f); +const float MARGYS = (2.75f/480.0f); const float MARGY1 = (1.0f/480.0f); //! time limit for double-click const float DELAY_DBCLICK = 0.75f; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 51/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit b89b0d2703c6923bed977201ebd7a7e6e5af0a76 Author: krzys-h Date: Sat Nov 4 11:35:40 2017 +0100 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index 673ff06..f5cbda7 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 673ff068f13731f96406cca03ef64a2f82b93deb +Subproject commit f5cbda70ec3772381b06c6a31ac1e7c65ee46b57 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 49/62: Merge pull request #992 from DavivaD/dev-dmgalarm-st2
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit d3b969fb4d01fbc5099d766710237506c219c7fe Merge: 17d47e9 2a0c2c3 Author: krzys_h Date: Sat Nov 4 11:27:14 2017 +0100 Merge pull request #992 from DavivaD/dev-dmgalarm-st2 Damage Alarm Implementation (2th Stage) src/object/interface/damageable_object.h | 7 +++ src/object/old_object.cpp| 27 ++- src/object/old_object.h | 5 + src/ui/controls/control.h| 3 ++- src/ui/controls/shortcut.cpp | 21 + src/ui/mainshort.cpp | 1 + 6 files changed, 62 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 56/62: Release 0.1.11-alpha: Merge branch 'dev'
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit b143aa38acb313bd15dbdb2404aa3fcb6341d7d6 Merge: 92a8140 611c353 Author: krzys-h Date: Fri Nov 10 11:01:24 2017 +0100 Release 0.1.11-alpha: Merge branch 'dev' CMakeLists.txt | 4 +- data | 2 +- po/colobot.pot | 37 +-- po/de.po | 134 +- po/fr.po | 94 po/pl.po | 57 ++ po/ru.po | 94 src/CBot/CBotEnums.h | 6 + src/CBot/CBotInstr/CBotExprLitString.cpp | 144 +--- src/CBot/CBotInstr/CBotExprLitString.h | 3 + src/CBot/CBotInstr/CBotExprVar.cpp | 4 + src/CBot/CBotInstr/CBotFunction.cpp | 10 +- src/CBot/CBotInstr/CBotLeftExpr.cpp | 2 + src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 13 ++- src/CBot/CBotToken.cpp | 25 ++--- src/CBot/CBotUtils.cpp | 45 src/CBot/CBotUtils.h | 15 +++ src/app/app.cpp | 3 - src/app/input.cpp| 27 ++--- src/app/pathman.cpp | 2 - src/common/config_file.cpp | 3 - src/common/error.h | 1 + src/common/key.h | 12 +- src/common/logger.cpp| 4 - src/common/restext.cpp | 19 ++-- src/common/settings.cpp | 17 ++- src/common/settings.h| 4 + src/common/singleton.h | 1 + src/graphics/engine/engine.cpp | 22 +++- src/graphics/engine/engine.h | 18 ++- src/graphics/engine/planet.cpp | 12 +- src/level/player_profile.cpp | 2 + src/level/robotmain.cpp | 132 +- src/level/robotmain.h| 2 + src/object/auto/autofactory.cpp | 4 +- src/object/interface/damageable_object.h | 7 ++ src/object/motion/motionvehicle.cpp | 1 + src/object/object_manager.cpp| 4 - src/object/old_object.cpp| 31 +- src/object/old_object.h | 5 + src/object/task/taskgoto.cpp | 7 +- src/object/task/taskrecover.cpp | 2 +- src/object/task/taskterraform.cpp| 111 ++- src/object/task/taskturn.cpp | 14 ++- src/object/task/taskturn.h | 1 + src/script/cbottoken.cpp | 5 +- src/script/script.cpp| 58 +- src/script/scriptfunc.cpp| 183 ++- src/script/scriptfunc.h | 3 +- src/ui/controls/control.h| 3 +- src/ui/controls/edit.cpp | 6 +- src/ui/controls/shortcut.cpp | 21 src/ui/mainshort.cpp | 1 + src/ui/studio.cpp| 66 +++ src/ui/studio.h | 4 + test/unit/CBot/CBot_test.cpp | 114 +++ tools/release.py | 111 ++- 57 files changed, 1323 insertions(+), 409 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 33/62: Fix horizontal scrolling of background images.
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 8b0ccf6667e0ddaba0fae6ad6f2ddc5a1d6bc680 Author: immibis Date: Sat Aug 5 19:54:13 2017 +1200 Fix horizontal scrolling of background images. --- src/graphics/engine/engine.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index a6d21cd..74c6179 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -4741,8 +4741,9 @@ void CEngine::DrawBackgroundImage() if (a > Math::PI/4.0f) a = Math::PI/4.0f; if (a < -Math::PI/4.0f) a = -Math::PI/4.0f; -u1 = -m_eyeDirH/Math::PI; -u2 = u1+1.0f/Math::PI; +// Note the background covers Math::PI radians, i.e. it repeats twice per rotation! +u1 = (-m_eyeDirH - GetHFovAngle()/2.0f) / Math::PI; +u2 = u1 + (GetHFovAngle() / Math::PI); v1 = (1.0f-h)*(0.5f+a/(2.0f*Math::PI/4.0f))+0.1f; v2 = v1+h; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 37/62: Clamp energy level to standard values for OrgaShooters
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit dab223e6ce27a1df5671476ef63cfce9ae3a9627 Author: tomangelo2 Date: Mon Oct 16 20:29:59 2017 +0200 Clamp energy level to standard values for OrgaShooters Fix issue #1009 --- src/object/motion/motionvehicle.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/object/motion/motionvehicle.cpp b/src/object/motion/motionvehicle.cpp index b585171..14d46dc 100644 --- a/src/object/motion/motionvehicle.cpp +++ b/src/object/motion/motionvehicle.cpp @@ -1783,6 +1783,7 @@ bool CMotionVehicle::EventFrameCanoni(const Event &event) float energy = GetObjectEnergyLevel(m_object); if (energy == 0.0f) return true; +if (energy > 1.0f) energy = 1.0f; //fix issue with cheated cells, see issue #1009 factor = 0.5f+energy*0.5f; if ( bOnBoard ) factor *= 0.8f; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 42/62: Merge pull request #1022 from immibis/dev
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit ee0f3ff5fd692e709fad9b4904fb0cbb51031641 Merge: 9448f67 8b0ccf6 Author: krzys_h Date: Sun Oct 22 18:21:49 2017 +0200 Merge pull request #1022 from immibis/dev Fix horizontal scrolling of planets and background images src/graphics/engine/engine.cpp | 19 +-- src/graphics/engine/engine.h | 12 +--- src/graphics/engine/planet.cpp | 12 ++-- 3 files changed, 36 insertions(+), 7 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 12/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 8d9b36333bf9de2484cc064d6c80f1ecc12e711a Author: krzys-h Date: Sat Jun 3 21:15:55 2017 +0200 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index f4c4364..9549116 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit f4c4364f00afe2a754204dec387cd80124b15c3a +Subproject commit 9549116f99838697e3a64f8ba63fa4f23b763f0f -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 14/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit ac27bdac4af1096b9abaa262483ceac40740bddc Author: krzys-h Date: Sat Jun 3 21:32:28 2017 +0200 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index 4c2718e..b5a16e3 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 4c2718e0ba47e6c9eb914377e46b287d07cfdb5c +Subproject commit b5a16e365c905ee5835a3e5bd8ecb104564c24a2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 28/62: Fixed goto() behaviour on 32-bit binaries
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 0de347d430106ac3bf9df005aedb826076255e44 Author: tomangelo2 Date: Wed Jul 26 14:54:04 2017 +0200 Fixed goto() behaviour on 32-bit binaries Closes issue #844 --- src/object/task/taskgoto.cpp | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 5d6cd47..6584465 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -803,7 +803,8 @@ Error CTaskGoto::Start(Math::Vector goal, float altitude, Error CTaskGoto::IsEnded() { Math::Vectorpos; -float limit, angle = 0.0f, dist, h, level; +float limit, angle = 0.0f, h, level; +volatile float dist; //fix for issue #844 if ( m_engine->GetPause() ) return ERR_CONTINUE; if ( m_error != ERR_OK ) return m_error; @@ -916,7 +917,9 @@ Error CTaskGoto::IsEnded() if ( m_goalMode == TGG_EXPRESS ) { dist = Math::DistanceProjected(m_goal, pos); -if ( dist < 10.0f && dist > m_lastDistance ) +float margin = 10.0f; +if ( m_object->Implements(ObjectInterfaceType::Flying) ) margin = 20.0f; +if ( dist < margin && dist > m_lastDistance ) { return ERR_STOP; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 26/62: Add syntax highlighting for escape codes
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit e3c44e956fadb9322613dee777e64cff5aa3694a Author: melex750 Date: Sat Jul 22 14:30:05 2017 -0400 Add syntax highlighting for escape codes --- src/script/script.cpp | 58 ++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/src/script/script.cpp b/src/script/script.cpp index 8253cae..f9a70e3 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -589,6 +589,56 @@ void CScript::UpdateList(Ui::CList* list) list->SetState(Ui::STATE_ENABLE); } +// Colorize a string literal with escape sequences also colored + +void HighlightString(Ui::CEdit* edit, const std::string& s, int start) +{ +edit->SetFormat(start, start + 1, Gfx::FONT_HIGHLIGHT_STRING); + +auto it = s.cbegin() + 1; + +++start; +while (it != s.cend() && *it != '\"') +{ +if (*(it++) != '\\') // not escape sequence +{ +edit->SetFormat(start, start + 1, Gfx::FONT_HIGHLIGHT_STRING); +++start; +continue; +} + +if (it == s.cend()) break; + +int end = start + 2; + +if (CBot::CharInList(*it, "01234567")) // octal escape sequence +{ +for (int i = 0; ++it != s.cend() && i < 2; i++, end++) +{ +if (!CBot::CharInList(*it, "01234567")) break; +} +} +else if (*it == 'x' || *it == 'u' || *it == 'U') // hex or unicode escape +{ +bool isHexCode = (*it == 'x'); +int maxlen = (*it == 'u') ? 4 : 8; + +for (int i = 0; ++it != s.cend(); i++, end++) +{ +if (!isHexCode && i >= maxlen) break; +if (!CBot::CharInList(*it, "0123456789ABCDEFabcdef")) break; +} +} +else // n, r, t, etc. +++it; + +edit->SetFormat(start, end, Gfx::FONT_HIGHLIGHT_NONE); +start = end; +} + +if (it != s.cend()) +edit->SetFormat(start, start + 1, Gfx::FONT_HIGHLIGHT_STRING); +} // Colorize the text according to syntax. @@ -643,10 +693,16 @@ void CScript::ColorizeScript(Ui::CEdit* edit, int rangeStart, int rangeEnd) { color = Gfx::FONT_HIGHLIGHT_CONST; } -else if (type == CBot::TokenTypString || type == CBot::TokenTypNum) // string literals and numbers +else if (type == CBot::TokenTypNum) // numbers { color = Gfx::FONT_HIGHLIGHT_STRING; } +else if (type == CBot::TokenTypString) // string literals +{ +HighlightString(edit, token, cursor1); +bt = bt->GetNext(); +continue; +} assert(cursor1 < cursor2); edit->SetFormat(cursor1, cursor2, color); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 34/62: Revert "Add menu file and xpm icon"
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit ef4d1b01faa3653909f9470f4e7504c46199cce3 Author: Didier Raboud Date: Sun Aug 6 14:15:18 2017 -0400 Revert "Add menu file and xpm icon" This reverts commit a59d1606c3592fad39194c0bc6b49e555acf9f6f. --- debian/colobot.install | 1 - debian/colobot.menu| 6 -- debian/control | 1 - debian/rules | 6 -- 4 files changed, 14 deletions(-) diff --git a/debian/colobot.install b/debian/colobot.install index d968925..599c019 100644 --- a/debian/colobot.install +++ b/debian/colobot.install @@ -1,4 +1,3 @@ -debian/colobot.xpm usr/share/pixmaps/ usr/games/colobot usr/lib/colobot/libCBot.so usr/share/applications/colobot.desktop diff --git a/debian/colobot.menu b/debian/colobot.menu deleted file mode 100644 index 6b8e812..000 --- a/debian/colobot.menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(colobot):needs="X11" \ - section="Games/Adventure" \ - title="Colobot" \ - longtitle="Colobot - Colonize with bots - Game to learn programming" \ - icon="/usr/share/pixmaps/colobot.xpm" \ - command="/usr/games/colobot" diff --git a/debian/control b/debian/control index 97146dd..e3e2e81 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Build-Depends: cmake, debhelper (>= 10.2.5~), google-mock, - imagemagick, libboost-dev, libboost-filesystem-dev, libboost-regex-dev, diff --git a/debian/rules b/debian/rules index bd9d124..b3a3497 100755 --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,6 @@ override_dh_auto_configure: override_dh_auto_build-arch: dh_auto_build -a - # obj-* is the default builddirectory in debhelper - convert obj-$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)/desktop/32/colobot.png debian/colobot.xpm override_dh_auto_build-indep: dh_auto_build -i -- doc @@ -35,10 +33,6 @@ endif override_dh_auto_test-indep: -override_dh_auto_clean: - dh_auto_clean - rm -f debian/colobot.xpm - # can be removed after stretch have been released override_dh_strip: dh_strip --ddeb-migration='colobot-dbg (<< 0.1.6-3~)' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 36/62: Fix turn(1) doesn't draining energy
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit f40756bc4648c67cc389aef44f1913b72b171ffe Author: tomangelo2 Date: Wed Oct 11 18:50:57 2017 +0200 Fix turn(1) doesn't draining energy Fix using @Melex750 example, thanks! Fix issue #136 --- src/object/task/taskturn.cpp | 14 -- src/object/task/taskturn.h | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/object/task/taskturn.cpp b/src/object/task/taskturn.cpp index d07dfde..69799b8 100644 --- a/src/object/task/taskturn.cpp +++ b/src/object/task/taskturn.cpp @@ -109,7 +109,7 @@ Error CTaskTurn::IsEnded() if ( m_bLeft ) { -if ( angle <= m_startAngle+m_angle ) +if ( angle <= m_finalAngle ) { m_physics->SetMotorSpeedZ(0.0f); //? m_physics->SetCirMotionY(MO_MOTSPEED, 0.0f); @@ -118,10 +118,15 @@ Error CTaskTurn::IsEnded() m_object->SetRotationY(m_finalAngle); return ERR_STOP; } +if ( !m_bDecel && angle <= m_startAngle+m_angle) +{ +m_bDecel = true; +m_physics->SetMotorSpeedZ(-0.5f); +} } else { -if ( angle >= m_startAngle+m_angle ) +if ( angle >= m_finalAngle ) { m_physics->SetMotorSpeedZ(0.0f); //? m_physics->SetCirMotionY(MO_MOTSPEED, 0.0f); @@ -130,6 +135,11 @@ Error CTaskTurn::IsEnded() m_object->SetRotationY(m_finalAngle); return ERR_STOP; } +if ( !m_bDecel && angle >= m_startAngle+m_angle) +{ +m_bDecel = true; +m_physics->SetMotorSpeedZ(0.5f); +} } return ERR_CONTINUE; diff --git a/src/object/task/taskturn.h b/src/object/task/taskturn.h index ddc696c..4232950 100644 --- a/src/object/task/taskturn.h +++ b/src/object/task/taskturn.h @@ -41,4 +41,5 @@ protected: float m_finalAngle = 0.0f; boolm_bLeft = false; boolm_bError = false; +boolm_bDecel = false; }; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 39/62: Make shortcut blink in red
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 2a0c2c38f0760e505df6d8b39c1811a1c03164a4 Author: DavivaD Date: Tue Oct 17 02:35:33 2017 +0200 Make shortcut blink in red --- src/ui/controls/shortcut.cpp | 27 +-- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/ui/controls/shortcut.cpp b/src/ui/controls/shortcut.cpp index 52cbcec..036c10d 100644 --- a/src/ui/controls/shortcut.cpp +++ b/src/ui/controls/shortcut.cpp @@ -109,12 +109,6 @@ void CShortcut::Draw() zoom = 1.0f; mode = Gfx::ENG_RSTATE_NORMAL; } -if ( (m_state & STATE_DAMAGE) && Math::Mod(m_time, 0.7f) >= 0.3f ) -{ -icon = 59; -zoom = 0.8f; -mode = Gfx::ENG_RSTATE_NORMAL; -} if ( m_icon == 128+6 || m_icon == 128+7 || m_icon == 58 ) // pause or film? { icon = -1; // no bottom @@ -215,6 +209,27 @@ void CShortcut::Draw() DrawIcon(m_pos, m_dim, uv1, uv2); } +if ( (m_state & STATE_DAMAGE) && Math::Mod(m_time, 0.7f) >= 0.3f ) +{ + Math::Point uv1, uv2; + float dp; + + m_engine->SetTexture("textures/interface/button2.png"); + m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_BLACK); + + uv1.x = 159.0f/256.0f; + uv1.y = 240.0f/256.0f; + uv2.x = 145.0f/256.0f; + uv2.y = 256.0f/256.0f; + + dp = 0.5f/256.0f; + uv1.x += dp; + uv1.y += dp; + uv2.x -= dp; + uv2.y -= dp; + + DrawIcon(m_pos, m_dim, uv1, uv2); +} } // Draw the vertex array. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 43/62: Merge pull request #994 from DavivaD/dev-issue-658
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 6b1dd5dd8b2f3d581125ec1a188772213ad6b5e7 Merge: ee0f3ff ee35d35 Author: krzys_h Date: Sun Oct 22 18:22:06 2017 +0200 Merge pull request #994 from DavivaD/dev-issue-658 Thumper & Recycler Enhancements. src/object/task/taskrecover.cpp | 2 +- src/object/task/taskterraform.cpp | 111 -- 2 files changed, 109 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 38/62: Fixed shortcut not changing to normal state
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit bf69b86233206e6f458686bc9f929e5baf708607 Author: melex750 Date: Tue Oct 17 02:33:05 2017 +0200 Fixed shortcut not changing to normal state --- src/object/old_object.cpp| 17 - src/object/old_object.h | 1 + src/ui/controls/shortcut.cpp | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp index cc0deff..602e509 100644 --- a/src/object/old_object.cpp +++ b/src/object/old_object.cpp @@ -390,7 +390,12 @@ bool COldObject::DamageObject(DamageType type, float force, CObject* killer) SetShield(shield); // Sending info about taking damage -SetDamaging(true); +if (!m_damaging) +{ +SetDamaging(true); +m_main->UpdateShortcuts(); +} +m_damageTime = m_time; } else { @@ -429,10 +434,6 @@ bool COldObject::DamageObject(DamageType type, float force, CObject* killer) { m_engine->GetPyroManager()->Create(Gfx::PT_SHOTT, this, loss); } - -/*if ( m_time < 2.0f && m_damaging == true ) SetDamaging(false); -m_time = 0.0f;*/ // TODO: Make DamageAlarm Icon Dissapear after 2 seconds - return false; } @@ -2157,6 +2158,12 @@ bool COldObject::EventFrame(const Event &event) SetShield(GetShield() + event.rTime*(1.0f/GetShieldFullRegenTime())); } +if (m_damaging && m_time - m_damageTime > 2.0f) +{ +SetDamaging(false); +m_main->UpdateShortcuts(); +} + return true; } diff --git a/src/object/old_object.h b/src/object/old_object.h index da9df20..48b71ee 100644 --- a/src/object/old_object.h +++ b/src/object/old_object.h @@ -360,6 +360,7 @@ protected: boolm_bCheckToken; // object with audited tokens boolm_underground; // object active but undetectable boolm_damaging; +float m_damageTime; DeathType m_dying; boolm_bFlat; boolm_bTrainer; // drive vehicle (without remote) diff --git a/src/ui/controls/shortcut.cpp b/src/ui/controls/shortcut.cpp index fca8586..52cbcec 100644 --- a/src/ui/controls/shortcut.cpp +++ b/src/ui/controls/shortcut.cpp @@ -109,7 +109,7 @@ void CShortcut::Draw() zoom = 1.0f; mode = Gfx::ENG_RSTATE_NORMAL; } -if ( m_state & STATE_DAMAGE ) +if ( (m_state & STATE_DAMAGE) && Math::Mod(m_time, 0.7f) >= 0.3f ) { icon = 59; zoom = 0.8f; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 41/62: Merge pull request #1004 from melex750/dev-cbot
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 9448f6712f5aee5009abbf7cbf7a1213b693b474 Merge: 0a83508 e3c44e9 Author: krzys_h Date: Sun Oct 22 18:20:50 2017 +0200 Merge pull request #1004 from melex750/dev-cbot Escape codes for strings in CBOT po/colobot.pot | 18 po/de.po | 18 po/fr.po | 18 po/pl.po | 18 po/ru.po | 18 src/CBot/CBotEnums.h | 6 ++ src/CBot/CBotInstr/CBotExprLitString.cpp | 144 --- src/CBot/CBotInstr/CBotExprLitString.h | 3 + src/CBot/CBotToken.cpp | 25 ++ src/CBot/CBotUtils.cpp | 45 ++ src/CBot/CBotUtils.h | 15 src/common/restext.cpp | 6 ++ src/script/script.cpp| 58 - test/unit/CBot/CBot_test.cpp | 114 14 files changed, 474 insertions(+), 32 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 22/62: Fix moving and resizing open/save dialog
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 86870167a6aeb639e0e32d298bac7e4284752a49 Author: melex750 Date: Mon Jun 26 14:19:53 2017 -0400 Fix moving and resizing open/save dialog * Fixed buffer overflow when resizing * Stop hard drive thrashing when moving/resizing --- src/ui/studio.cpp | 27 --- src/ui/studio.h | 2 ++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index d98dc25..b06b6f5 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -579,6 +579,8 @@ void CStudio::StartEditScript(CScript *script, std::string name, Program* progra pw = static_cast(m_interface->SearchControl(EVENT_WINDOW6)); if (pw != nullptr) pw->ClearState(STATE_VISIBLE | STATE_ENABLE); +m_dialogPos = m_settings->GetIOPos(); +m_dialogDim = m_settings->GetIODim(); m_windowPos = m_settings->GetWindowPos(); m_windowDim = m_settings->GetWindowDim(); m_bEditMaximized = m_settings->GetWindowMax(); @@ -930,6 +932,8 @@ bool CStudio::StopEditScript(bool closeWithErrors) m_main->SetEditLock(false, true); m_camera->SetType(m_editCamera); +m_settings->SetIOPos(m_dialogPos); +m_settings->SetIODim(m_dialogDim); m_settings->SetWindowPos(m_windowPos); m_settings->SetWindowDim(m_windowDim); m_settings->SetWindowMax(m_bEditMaximized); @@ -1272,8 +1276,8 @@ void CStudio::AdjustDialog() pw = static_cast< CWindow* >(m_interface->SearchControl(EVENT_WINDOW9)); if ( pw == nullptr ) return; -wpos = pw->GetPos(); -wdim = pw->GetDim(); +m_dialogPos = wpos = pw->GetPos(); +m_dialogDim = wdim = pw->GetDim(); pw->SetPos(wpos); // to move the buttons on the titlebar if ( m_dialog == SD_OPEN || @@ -1323,10 +1327,9 @@ void CStudio::AdjustDialog() pe->SetPos(ppos); pe->SetDim(ddim); -nch = static_cast< int >((ddim.x*640.0f-22.0f)/8.0f); -name = pe->GetText(100); +nch = static_cast< int >((ddim.x*640.0f-22.0f)/5.75f); +name = pe->GetText(nch); // truncates the text according to max pe->SetMaxChar(nch); -name[nch] = 0; // truncates the text according to max pe->SetText(name); } @@ -1384,19 +1387,10 @@ void CStudio::AdjustDialog() bool CStudio::EventDialog(const Event &event) { -CWindow*pw; -Math::Point wpos, wdim; - -pw = static_cast< CWindow* >(m_interface->SearchControl(EVENT_WINDOW9)); -if ( pw == nullptr ) return false; - if ( event.type == EVENT_WINDOW9 ) // window is moved? { -wpos = pw->GetPos(); -wdim = pw->GetDim(); -m_settings->SetIOPos(wpos); -m_settings->SetIODim(wdim); AdjustDialog(); +return true; } if ( m_dialog == SD_OPEN || @@ -1441,6 +1435,9 @@ bool CStudio::EventDialog(const Event &event) return true; } +CWindow* pw = static_cast< CWindow* >(m_interface->SearchControl(EVENT_WINDOW9)); +if ( pw == nullptr ) return false; + if ( event.type == EVENT_DIALOG_CANCEL || (event.type == EVENT_KEY_DOWN && event.GetData()->key == KEY(ESCAPE)) || event.type == pw->GetEventTypeClose() ) diff --git a/src/ui/studio.h b/src/ui/studio.h index 7ce580c..9efddc0 100644 --- a/src/ui/studio.h +++ b/src/ui/studio.h @@ -110,6 +110,8 @@ protected: Math::Point m_editFinalDim; Math::Point m_windowPos; Math::Point m_windowDim; +Math::Point m_dialogPos; +Math::Point m_dialogDim; floatm_time; floatm_fixInfoTextTime; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 15/62: Fix object.factory() code type detection, closes #938
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit bb35585194d11c70acdb2666b20b32a1e8a9d6dd Author: krzys-h Date: Sat Jun 3 21:43:10 2017 +0200 Fix object.factory() code type detection, closes #938 --- src/object/auto/autofactory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index 7dfc280..45fd357 100644 --- a/src/object/auto/autofactory.cpp +++ b/src/object/auto/autofactory.cpp @@ -405,12 +405,12 @@ bool CAutoFactory::EventProcess(const Event &event) { Program* program = dynamic_cast(vehicle)->AddProgram(); -if (boost::regex_search(m_program, boost::regex("^[A-Za-z0-9_]+$"))) // Public function name? +if (boost::regex_match(m_program, boost::regex("[A-Za-z0-9_]+"))) // Public function name? { std::string code = "extern void object::Start_"+m_program+"()\n{\n\t\n\t//Automatically generated by object.factory()\n\t"+m_program+"();\n\t\n}\n"; program->script->SendScript(code.c_str()); } -else if (boost::regex_search(m_program, boost::regex("\\.txt$"))) // File name (with .txt extension)? +else if (boost::regex_match(m_program, boost::regex(".*\\.txt"))) // File name (with .txt extension)? { program->script->ReadScript(m_program.c_str()); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 31/62: Add horizontal FoV to CEngine
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 2751db324536a8f1bca8519a628ac1d39d7f1911 Author: immibis Date: Sat Aug 5 19:45:08 2017 +1200 Add horizontal FoV to CEngine --- src/graphics/engine/engine.cpp | 14 ++ src/graphics/engine/engine.h | 12 +--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index a145838..a6d21cd 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -2631,6 +2631,10 @@ void CEngine::SetFocus(float focus) float farPlane = m_deepView[0] * m_clippingDistance; float aspect = static_cast(m_size.x) / static_cast(m_size.y); + +// Compute H-FoV from V-FoV and aspect ratio. +m_hfov = 2.0f * atan(aspect * tan(focus / 2.0f)); + Math::LoadProjectionMatrix(m_matProj, m_focus, aspect, 0.5f, farPlane); } @@ -2639,6 +2643,16 @@ float CEngine::GetFocus() return m_focus; } +float CEngine::GetVFovAngle() +{ +return m_focus; +} + +float CEngine::GetHFovAngle() +{ +return m_hfov; +} + void CEngine::SetShadowColor(float value) { m_shadowColor = value; diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h index 429bca1..655bc02 100644 --- a/src/graphics/engine/engine.h +++ b/src/graphics/engine/engine.h @@ -921,12 +921,16 @@ public: voidSetTerrainVision(float vision); //@{ -//! Management of camera angle -/** +//! Management of camera vertical field-of-view angle. +/** This is specified in radians. +Horizontal FoV is calculated based on vertical FoV and aspect ratio. 0.75 = normal 1.50 = wide-angle */ voidSetFocus(float focus); +//! Deprecated alias for GetVFovAngle float GetFocus(); +float GetVFovAngle(); +float GetHFovAngle(); //@} //@{ @@ -1318,8 +1322,10 @@ protected: Math::Matrixm_matProj; //! View matrix for 3D scene Math::Matrixm_matView; -//! Camera angle for 3D scene +//! Camera vertical field-of-view angle for 3D scene. A.k.a. m_vfov float m_focus; +//! Horizontal field-of-view angle, calculated from vertical FOV and aspect ratio +float m_hfov; //! Projection matrix for rendering shadow maps Math::Matrixm_shadowProjMat; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 35/62: Bump Standards-Version to 4.0.1, after having removed the 'menu' entry
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit d086fedd315a80ffb371ca3367b202f37c411c30 Author: Didier Raboud Date: Sun Aug 6 14:22:34 2017 -0400 Bump Standards-Version to 4.0.1, after having removed the 'menu' entry --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e3e2e81..84fb686 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Build-Depends-Indep: vorbis-tools, Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-games/colobot.git -b debian Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/colobot.git -Standards-Version: 4.0.0 +Standards-Version: 4.0.1 Homepage: http://colobot.info Package: colobot -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 20/62: Damage Alert Implementation (2th Stage)
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit a29a4f93ac26c12e0ad4191f501cad9e261c08d7 Author: DavivaD Date: Tue Jun 20 23:35:33 2017 +0200 Damage Alert Implementation (2th Stage) --- src/object/interface/damageable_object.h | 7 +++ src/object/old_object.cpp| 18 ++ src/object/old_object.h | 4 src/ui/controls/control.h| 3 ++- src/ui/controls/shortcut.cpp | 6 ++ src/ui/mainshort.cpp | 1 + 6 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/object/interface/damageable_object.h b/src/object/interface/damageable_object.h index 0813a28..a8f3afb 100644 --- a/src/object/interface/damageable_object.h +++ b/src/object/interface/damageable_object.h @@ -59,4 +59,11 @@ public: //! Damage the object, with the given force. Returns true if the object has been fully destroyed (assuming the object is destroyable, of course). If force == infinity, destroy immediately (this is the default value) /** NOTE: You should never assume that after this function exits, the object is destroyed, unless it returns true. Even if you specify force = infinity, if may still sometimes decide not to destroy the object. */ virtual bool DamageObject(DamageType type, float force = std::numeric_limits::infinity(), CObject* killer = nullptr) = 0; + + +//! Set the status that means the object is currently taking damage +virtual voidSetDamaging(bool damaging) = 0; +//! Is object currently taking damage? +virtual boolIsDamaging() = 0; + }; diff --git a/src/object/old_object.cpp b/src/object/old_object.cpp index dbe92b3..cc0deff 100644 --- a/src/object/old_object.cpp +++ b/src/object/old_object.cpp @@ -137,6 +137,7 @@ COldObject::COldObject(int id) m_bVirusMode = false; m_virusTime = 0.0f; m_lastVirusParticle = 0.0f; +m_damaging = false; m_dying = DeathType::Alive; m_bFlat = false; m_gunGoalV = 0.0f; @@ -387,6 +388,9 @@ bool COldObject::DamageObject(DamageType type, float force, CObject* killer) float shield = GetShield(); shield -= loss; SetShield(shield); + +// Sending info about taking damage +SetDamaging(true); } else { @@ -394,6 +398,7 @@ bool COldObject::DamageObject(DamageType type, float force, CObject* killer) { // Dead immediately SetShield(0.0f); +SetDamaging(false); } } dead = (GetShield() <= 0.0f); @@ -425,6 +430,9 @@ bool COldObject::DamageObject(DamageType type, float force, CObject* killer) m_engine->GetPyroManager()->Create(Gfx::PT_SHOTT, this, loss); } +/*if ( m_time < 2.0f && m_damaging == true ) SetDamaging(false); +m_time = 0.0f;*/ // TODO: Make DamageAlarm Icon Dissapear after 2 seconds + return false; } @@ -440,6 +448,7 @@ void COldObject::DestroyObject(DestructionType type, CObject* killer) if (Implements(ObjectInterfaceType::Shielded)) { SetShield(0.0f); +SetDamaging(false); } Gfx::PyroType pyroType = Gfx::PT_NULL; @@ -2652,6 +2661,15 @@ float COldObject::GetMagnifyDamage() return m_magnifyDamage; } +void COldObject::SetDamaging(bool damaging) +{ +m_damaging = damaging; +} + +bool COldObject::IsDamaging() +{ +return m_damaging; +} void COldObject::SetDying(DeathType deathType) { diff --git a/src/object/old_object.h b/src/object/old_object.h index 697e05d..da9df20 100644 --- a/src/object/old_object.h +++ b/src/object/old_object.h @@ -237,6 +237,9 @@ public: voidSetMagnifyDamage(float factor) override; float GetMagnifyDamage() override; +voidSetDamaging(bool damaging); +boolIsDamaging() override; + voidSetDying(DeathType deathType) override; DeathType GetDying() override; boolIsDying() override; @@ -356,6 +359,7 @@ protected: boolm_bSelectable; // selectable object boolm_bCheckToken; // object with audited tokens boolm_underground; // object active but undetectable +boolm_damaging; DeathType m_dying; boolm_bFlat; boolm_bTrainer; // drive vehicle (without remote) diff --git a/src/ui/controls/control.h b/src/ui/controls/control.h index 1a19375..b3fb396 100644 --- a/src/ui/controls/control.h +++ b/src/ui/controls/control.h @@ -57,7 +57,8 @@ enum ControlState STATE_FRAME = (1<<13), // framework highlighting STATE_WARNING = (1<<14), // framework hatched yellow / black STATE_VALUE = (1<<15), // displays the value -STATE_RUN = (1<<16) // running program +STATE_RUN = (1<<16), // running pr
[colobot] 27/62: Decrease radius of squashing items.
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit a4482f1a7cb493646e2ba78def500a42156fd3a1 Author: DavivaD Date: Mon Jul 24 23:20:21 2017 +0200 Decrease radius of squashing items. --- src/object/task/taskterraform.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 06dc72c..380d26f 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -363,7 +363,7 @@ bool CTaskTerraform::Terraform() type = pObj->GetType(); if ( type == OBJECT_NULL ) continue; -if ( type == OBJECT_TEEN34 || +if ( type == OBJECT_TEEN34 || type == OBJECT_POWER|| type == OBJECT_ATOMIC || type == OBJECT_STONE|| @@ -387,8 +387,8 @@ bool CTaskTerraform::Terraform() type == OBJECT_RUINradar ) // small/transportable objects? { dist = Math::Distance(m_terraPos, pObj->GetPosition()); -if ( dist > 20.0f ) continue; - +if ( dist > 5.0f ) continue; + if (type == OBJECT_BULLET || type == OBJECT_NEST ) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 19/62: Display warning if no quicksave slot is found
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 75d9f8573bc5f264f337e4a51d2479f50c9c4fc8 Author: tomangelo2 Date: Sun Jun 11 23:29:50 2017 +0200 Display warning if no quicksave slot is found --- po/colobot.pot | 3 +++ po/de.po| 7 --- po/fr.po| 7 --- po/pl.po| 3 +++ po/ru.po| 7 --- src/common/error.h | 1 + src/common/restext.cpp | 1 + src/level/robotmain.cpp | 1 + 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index bbcbe8b..509a3c7 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -1527,6 +1527,9 @@ msgstr "" msgid "Inappropriate bot" msgstr "" +msgid "Quicksave slot not found" +msgstr "" + msgid "Building completed" msgstr "" diff --git a/po/de.po b/po/de.po index 9c1fbef..5e2f4a5 100644 --- a/po/de.po +++ b/po/de.po @@ -1211,6 +1211,10 @@ msgstr "" msgid "Quick save\\Immediately save game" msgstr "" +#, fuzzy +msgid "Quicksave slot not found" +msgstr "Das Objekt existiert nicht" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Beenden\\Colobot: Gold Edition schließen" @@ -1939,9 +1943,6 @@ msgstr "epsitec.com" #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Anzahl Ziergegenstände\\Anzahl Gegenstände ohne Funktion" -#~ msgid "Object not found" -#~ msgstr "Das Objekt existiert nicht" - #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Planeten und Sterne\\Kreisende Planeten und Sterne" diff --git a/po/fr.po b/po/fr.po index 16e1546..01ca9de 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1208,6 +1208,10 @@ msgstr "" msgid "Quick save\\Immediately save game" msgstr "" +#, fuzzy +msgid "Quicksave slot not found" +msgstr "Objet n'existe pas" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Quitter\\Quitter Colobot : Édition Gold" @@ -1941,9 +1945,6 @@ msgstr "epsitec.com" #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Nb d'objets décoratifs\\Qualité d'objets non indispensables" -#~ msgid "Object not found" -#~ msgstr "Objet n'existe pas" - #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Planètes et étoiles\\Motifs mobiles dans le ciel" diff --git a/po/pl.po b/po/pl.po index 9d531ed..07a6328 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1194,6 +1194,9 @@ msgstr "Szybkie wczytywanie\\Natychmiastowo wczytuje zapisaną grę" msgid "Quick save\\Immediately save game" msgstr "Szybki zapis\\Natychmiastowo zapisuje grę" +msgid "Quicksave slot not found" +msgstr "Nie odnaleziono slotu szybkiego zapisu" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Wyjdź\\Kończy grę Colobot: Gold Edition" diff --git a/po/ru.po b/po/ru.po index fa1686d..fdcf909 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1220,6 +1220,10 @@ msgstr "" msgid "Quick save\\Immediately save game" msgstr "" +#, fuzzy +msgid "Quicksave slot not found" +msgstr "Объект не найден" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Выход\\Выйти из Colobot: Gold Edition" @@ -1951,9 +1955,6 @@ msgstr "epsitec.com" #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Количество декораций\\Количество декоративных объектов" -#~ msgid "Object not found" -#~ msgstr "Объект не найден" - #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Планеты и звезды\\Астрономические объекты в небе" diff --git a/src/common/error.h b/src/common/error.h index 7522c01..0ef8121 100644 --- a/src/common/error.h +++ b/src/common/error.h @@ -112,6 +112,7 @@ enum Error ERR_PROHIBITEDTOKEN = 801, //!< instruction prohibited ERR_AIM_IMPOSSIBLE= 900, //!< cannot aim at specified angle(s) ERR_WRONG_BOT = 910, //!< inappropriate bot +ERR_NO_QUICK_SLOT = 920, //!< quicksave slot not found INFO_FIRST= 1,//! < first information INFO_BUILD= 10001,//! < construction builded diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 5a91541..3d16603 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -641,6 +641,7 @@ void InitializeRestext() stringsErr[ERR_DELETEBUILDING] = TR("Building destroyed"); stringsErr[ERR_ENEMY_OBJECT]= TR("Unable to control enemy objects"); stringsErr[ERR_WRONG_BOT] = TR("Inappropriate bot"); +stringsErr[ERR_NO_QUICK_SLOT] = TR("Quicksave slot not found"); stringsErr[INFO_BUILD] = TR("Building completed"); stringsErr[INFO_CONVERT]= TR("Titanium available"); diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 43801d8..a92b10b 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -5575,6 +5575,7 @@ void CRobotMain::QuickLoad() std::string dir = m_playerProfile->GetSaveFile
[colobot] 40/62: Merge pull request #985 from melex750/dev
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 0a83508547e1e409c1591ee2cd9b62a49d009e1c Merge: dab223e 8687016 Author: krzys_h Date: Sun Oct 22 18:20:35 2017 +0200 Merge pull request #985 from melex750/dev Bug fix for CStudio src/common/settings.cpp | 15 +++ src/common/settings.h | 4 +++ src/ui/studio.cpp | 66 - src/ui/studio.h | 4 +++ 4 files changed, 66 insertions(+), 23 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 32/62: Make planets stay in one place in the sky - at least in the X direction.
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 2e8798b33d3b1671249d8653487300f9d1bf21bd Author: immibis Date: Sat Aug 5 19:45:36 2017 +1200 Make planets stay in one place in the sky - at least in the X direction. --- src/graphics/engine/planet.cpp | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/graphics/engine/planet.cpp b/src/graphics/engine/planet.cpp index 1aad335..44a3ef8 100644 --- a/src/graphics/engine/planet.cpp +++ b/src/graphics/engine/planet.cpp @@ -115,8 +115,16 @@ void CPlanet::Draw() Math::Point p1, p2; -float a = eyeDirH + planet.angle.x; -p1.x = Math::Mod(a, Math::PI*2.0f)-0.5f; +// Determine the 2D coordinates of the centre of the planet. + +// Not sure why this is + when you'd expect -. Perhaps one of the angles is inverted. +// Compute the camera-relative angles. (0, 0) is straight ahead (the dead centre of the screen). + +// Why -1.0f? Simply because the old formula included that, and we need it to +// be consistent for the outer space cutscenes to work. +float a = planet.angle.x + eyeDirH - 1.0f; +a = Math::Mod(a+Math::PI, Math::PI*2.0f)-Math::PI; // normalize to -pi <= a < pi +p1.x = a/m_engine->GetHFovAngle() + 0.5f; a = eyeDirV + planet.angle.y; p1.y = 0.4f+(Math::Mod(a+Math::PI, Math::PI*2.0f)-Math::PI)*(2.0f/Math::PI); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 23/62: Make Thumper Squash transportable/small objects.
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit bef6e9ecebe723e40ef67fb5b3ad41e5b2d92c3e Author: DavivaD Date: Fri Jul 21 20:36:31 2017 +0200 Make Thumper Squash transportable/small objects. --- src/object/task/taskterraform.cpp | 41 --- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index f71b985..06dc72c 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -363,12 +363,47 @@ bool CTaskTerraform::Terraform() type = pObj->GetType(); if ( type == OBJECT_NULL ) continue; -if ( type == OBJECT_TEEN34 ) // stone? +if ( type == OBJECT_TEEN34 || + type == OBJECT_POWER|| + type == OBJECT_ATOMIC || + type == OBJECT_STONE|| + type == OBJECT_URANIUM || + type == OBJECT_METAL|| + type == OBJECT_BULLET || + type == OBJECT_BBOX || + type == OBJECT_KEYa || + type == OBJECT_KEYb || + type == OBJECT_KEYc || + type == OBJECT_KEYd || + type == OBJECT_TNT || + type == OBJECT_NEST || + type == OBJECT_BOMB || + type == OBJECT_RUINmobilew1 || + type == OBJECT_RUINmobilew2 || + type == OBJECT_RUINmobilet1 || + type == OBJECT_RUINmobilet2 || + type == OBJECT_RUINdoor || + type == OBJECT_RUINsupport || + type == OBJECT_RUINradar ) // small/transportable objects? { dist = Math::Distance(m_terraPos, pObj->GetPosition()); if ( dist > 20.0f ) continue; - -m_engine->GetPyroManager()->Create(Gfx::PT_FRAGT, pObj); + +if (type == OBJECT_BULLET || +type == OBJECT_NEST ) +{ +m_engine->GetPyroManager()->Create(Gfx::PT_FRAGO, pObj); +} +else if (type == OBJECT_TNT || + type == OBJECT_BOMB) +{ +m_engine->GetPyroManager()->Create(Gfx::PT_EXPLOT, pObj); + dynamic_cast(m_object)->DamageObject(DamageType::Explosive, 0.9f); +} +else +{ +m_engine->GetPyroManager()->Create(Gfx::PT_FRAGT, pObj); +} } else { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 25/62: Add escape codes for string literals
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit c03dfc12848682fd0083f19706239381c659d991 Author: melex750 Date: Sat Jul 22 14:29:05 2017 -0400 Add escape codes for string literals --- po/colobot.pot | 18 po/de.po | 18 po/fr.po | 18 po/pl.po | 18 po/ru.po | 18 src/CBot/CBotEnums.h | 6 ++ src/CBot/CBotInstr/CBotExprLitString.cpp | 144 --- src/CBot/CBotInstr/CBotExprLitString.h | 3 + src/CBot/CBotToken.cpp | 25 ++ src/CBot/CBotUtils.cpp | 45 ++ src/CBot/CBotUtils.h | 15 src/common/restext.cpp | 6 ++ test/unit/CBot/CBot_test.cpp | 114 13 files changed, 417 insertions(+), 31 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index 509a3c7..419b88e 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -1770,6 +1770,24 @@ msgstr "" msgid "This parameter needs a default value" msgstr "" +msgid "Missing end quote" +msgstr "" + +msgid "Unknown escape sequence" +msgstr "" + +msgid "Octal value out of range" +msgstr "" + +msgid "Missing hex digits after escape sequence" +msgstr "" + +msgid "Hex value out of range" +msgstr "" + +msgid "Invalid universal character name" +msgstr "" + msgid "Dividing by zero" msgstr "" diff --git a/po/de.po b/po/de.po index 5e2f4a5..1c839a0 100644 --- a/po/de.po +++ b/po/de.po @@ -680,6 +680,9 @@ msgstr "Anweisungen über das ausgewählte Objekt" msgid "Help balloons\\Explain the function of the buttons" msgstr "Hilfeblasen\\Hilfeblasen" +msgid "Hex value out of range" +msgstr "" + #, fuzzy msgid "Higher speed\\Doubles speed" msgstr "Geschwindigkeit 2.0x\\Spielgeschwindigkeit doppelt so schnell" @@ -759,6 +762,9 @@ msgstr "Anweisungen\\Anweisungen für die Mission oder Übung" msgid "Internal error - tell the developers" msgstr "Interner Fehler - Benachrichtige bitte die Entwickler" +msgid "Invalid universal character name" +msgstr "" + msgid "Invert\\Invert values on this axis" msgstr "Invertieren\\Die Werte dieser Achse invertieren" @@ -869,6 +875,12 @@ msgstr "Verkleinern" msgid "Mipmap level\\Mipmap level" msgstr "Mipmap-Level\\Mipmap-Level" +msgid "Missing end quote" +msgstr "" + +msgid "Missing hex digits after escape sequence" +msgstr "" + msgid "Mission name" msgstr "Name der Mission" @@ -1031,6 +1043,9 @@ msgstr "OK\\Programm kompilieren" msgid "Object too close" msgstr "Gegenstand zu nahe" +msgid "Octal value out of range" +msgstr "" + msgid "One step" msgstr "Ein Schritt" @@ -1632,6 +1647,9 @@ msgstr "Das Objekt existiert nicht" msgid "Unknown command" msgstr "Befehl unbekannt" +msgid "Unknown escape sequence" +msgstr "" + msgid "Unknown function" msgstr "Unbekannte Funktion" diff --git a/po/fr.po b/po/fr.po index 01ca9de..a287717 100644 --- a/po/fr.po +++ b/po/fr.po @@ -677,6 +677,9 @@ msgstr "Instructions sur la sélection" msgid "Help balloons\\Explain the function of the buttons" msgstr "Bulles d'aide\\Bulles explicatives" +msgid "Hex value out of range" +msgstr "" + #, fuzzy msgid "Higher speed\\Doubles speed" msgstr "Vitesse 2.0x\\Deux fois plus rapide" @@ -756,6 +759,9 @@ msgstr "Instructions mission\\Marche à suivre" msgid "Internal error - tell the developers" msgstr "Erreur interne - contacter les développeurs" +msgid "Invalid universal character name" +msgstr "" + msgid "Invert\\Invert values on this axis" msgstr "Inversion\\Inverse les valeurs sur cet axe" @@ -866,6 +872,12 @@ msgstr "Taille réduite" msgid "Mipmap level\\Mipmap level" msgstr "Niveau de MIP mapping\\Niveau de MIP mapping" +msgid "Missing end quote" +msgstr "" + +msgid "Missing hex digits after escape sequence" +msgstr "" + msgid "Mission name" msgstr "Nom de la mission" @@ -1028,6 +1040,9 @@ msgstr "D'accord\\Compiler le programme" msgid "Object too close" msgstr "Objet trop proche" +msgid "Octal value out of range" +msgstr "" + msgid "One step" msgstr "Un pas" @@ -1629,6 +1644,9 @@ msgstr "Objet n'existe pas" msgid "Unknown command" msgstr "Commande inconnue" +msgid "Unknown escape sequence" +msgstr "" + msgid "Unknown function" msgstr "Routine inconnue" diff --git a/po/pl.po b/po/pl.po index 07a6328..bb28851 100644 --- a/po/pl.po +++ b/po/pl.po @@ -678,6 +678,9 @@ msgstr "Pomoc na temat zaznaczonego obiektu" msgid "Help balloons\\Explain the function of the buttons" msgstr "Dymki pomocy\\Wyjaśnia funkcje przycisków" +msgid "Hex value out of range" +msgstr "" + msgid "Higher speed\\Doubles speed" msgstr "Zwiększ prędkość\\Podwaja prędkość" @@ -756,6 +759,9 @@ msgstr "Rozkazy\\Pokazuje rozkazy dotyczące bieżącej misji" msgid "
[colobot] 30/62: Correct Small Mistake
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit ee35d35db3e6ffafa88041414a7964a8f6601d5b Author: DavivaD Date: Thu Jul 27 02:02:46 2017 +0200 Correct Small Mistake --- src/object/task/taskterraform.cpp | 5 - 1 file changed, 5 deletions(-) diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index a7ea3e4..f46c68d 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -461,11 +461,6 @@ bool CTaskTerraform::Terraform() if ( dist > 15.0f ) continue; dynamic_cast(pObj)->DamageObject(DamageType::Explosive, 0.2f); } -else if (type == OBJECT_STATION) // PowerStation? -{ -if ( dist > 15.0f ) continue; -m_engine->GetPyroManager()->Create(Gfx::PT_EXPLOT, pObj); -} else // Other? { if ( dist > 5.0f ) continue; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 24/62: Make Recycler Recycle small Building Ruins.
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit b5e0f9966f18935bf16ae1705f0e17e4f6734eb8 Author: DavivaD Date: Fri Jul 21 20:37:18 2017 +0200 Make Recycler Recycle small Building Ruins. --- src/object/task/taskrecover.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 834811a..ab5bc52 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -376,5 +376,5 @@ bool CTaskRecover::Abort() CObject* CTaskRecover::SearchRuin() { -return CObjectManager::GetInstancePointer()->FindNearest(nullptr, m_recoverPos, {OBJECT_RUINmobilew1, OBJECT_RUINmobilew2, OBJECT_RUINmobilet1, OBJECT_RUINmobilet2, OBJECT_RUINmobiler1, OBJECT_RUINmobiler2}, 40.0f/g_unit); +return CObjectManager::GetInstancePointer()->FindNearest(nullptr, m_recoverPos, {OBJECT_RUINmobilew1, OBJECT_RUINmobilew2, OBJECT_RUINmobilet1, OBJECT_RUINmobilet2, OBJECT_RUINmobiler1, OBJECT_RUINmobiler2, OBJECT_RUINdoor, OBJECT_RUINsupport, OBJECT_RUINradar}, 40.0f/g_unit); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 18/62: Added QuickSave/QuickLoad feature #929
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit d63ed865f48f9fa8695af731f0f3a46e4fa1b259 Author: tomangelo2 Date: Sun Jun 11 17:50:21 2017 +0200 Added QuickSave/QuickLoad feature #929 Also rearranged a bit speed control buttons to make some space for it F5 - QuickSave F6 - lower speed (current/2) F7 - reset speed F8 - higher speed (current*2) F9 - QuickLoad --- po/colobot.pot | 16 +++ po/de.po| 109 ++-- po/fr.po| 69 -- po/pl.po| 36 +++- po/ru.po| 69 -- src/app/input.cpp | 24 +-- src/common/key.h| 12 +++--- src/common/restext.cpp | 12 +++--- src/level/robotmain.cpp | 50 ++ src/level/robotmain.h | 2 + 10 files changed, 229 insertions(+), 170 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index 4aee2bc..bbcbe8b 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -516,25 +516,19 @@ msgstr "" msgid "Origin of last message\\Shows where the last message was sent from" msgstr "" -msgid "Speed 0.5x\\Half speed" +msgid "Lower speed\\Decrease speed by half" msgstr "" -msgid "Speed 1.0x\\Normal speed" +msgid "Standard speed\\Reset speed to normal" msgstr "" -msgid "Speed 1.5x\\1.5 times faster" +msgid "Higher speed\\Doubles speed" msgstr "" -msgid "Speed 2.0x\\Double speed" +msgid "Quick save\\Immediately save game" msgstr "" -msgid "Speed 3.0x\\Triple speed" -msgstr "" - -msgid "Speed 4.0x\\Quadruple speed" -msgstr "" - -msgid "Speed 6.0x\\Sextuple speed" +msgid "Quick load\\Immediately load game" msgstr "" msgid "Pause\\Pause the game without opening menu" diff --git a/po/de.po b/po/de.po index 0227795..9c1fbef 100644 --- a/po/de.po +++ b/po/de.po @@ -100,9 +100,7 @@ msgid "Already carrying something" msgstr "Trägt schon etwas" msgid "Alternative camera mode\\Move sideways instead of rotating (in free camera)" -msgstr "" -"Alternativer Kameramodus\\Seitwärts bewegen statt rotieren (bei freier " -"Kamera)" +msgstr "Alternativer Kameramodus\\Seitwärts bewegen statt rotieren (bei freier Kamera)" msgid "Ambiguous call to overloaded function" msgstr "" @@ -144,14 +142,10 @@ msgid "Automatic indent\\When program editing" msgstr "Automatisches Einrücken\\Beim Bearbeiten der Programme" msgid "Autosave interval\\How often your game will autosave" -msgstr "" -"Auto-Speichern Zeitintervall\\Wie oft das Spiel automatisch abgespeichert " -"wird" +msgstr "Auto-Speichern Zeitintervall\\Wie oft das Spiel automatisch abgespeichert wird" msgid "Autosave slots\\How many autosave slots you'll have" -msgstr "" -"Auto-Speicherplätze\\Wie viele Plätze zum automatischen Speichern zur " -"Verfügung stehen" +msgstr "Auto-Speicherplätze\\Wie viele Plätze zum automatischen Speichern zur Verfügung stehen" msgid "Autosave\\Enables autosave" msgstr "Auto-Speichern\\Aktiviert die automatische Speicherung" @@ -316,9 +310,7 @@ msgid "Camera back\\Moves the camera backward" msgstr "Kamera weiter\\Bewegung der Kamera rückwärts" msgid "Camera border scrolling\\Scrolling when the mouse touches right or left border" -msgstr "" -"Kamerabewegung am Bildschirmrand\\Die Kamera dreht wenn die Maus den rechten " -"oder linken Rand erreicht" +msgstr "Kamerabewegung am Bildschirmrand\\Die Kamera dreht wenn die Maus den rechten oder linken Rand erreicht" msgid "Camera closer\\Moves the camera forward" msgstr "Kamera näher\\Bewegung der Kamera vorwärts" @@ -688,6 +680,10 @@ msgstr "Anweisungen über das ausgewählte Objekt" msgid "Help balloons\\Explain the function of the buttons" msgstr "Hilfeblasen\\Hilfeblasen" +#, fuzzy +msgid "Higher speed\\Doubles speed" +msgstr "Geschwindigkeit 2.0x\\Spielgeschwindigkeit doppelt so schnell" + msgid "Highest\\Highest graphic quality (lowest frame rate)" msgstr "Max.\\Beste Qualität (niedriges Framerate)" @@ -838,6 +834,23 @@ msgstr "Lade Objekte" msgid "Loading terrain" msgstr "Lade Gelände" +# msgid "Speed 0.5x\\Half speed" +# msgstr "" +# msgid "Speed 1.0x\\Normal speed" +# msgstr "" +# msgid "Speed 1.5x\\1.5 times faster" +# msgstr "" +# msgid "Speed 2.0x\\Double speed" +# msgstr "" +# msgid "Speed 3.0x\\Triple speed" +# msgstr "" +# msgid "Speed 4.0x\\Quadruple speed" +# msgstr "" +# msgid "Speed 6.0x\\Sextuple speed" +# msgstr "" +msgid "Lower speed\\Decrease speed by half" +msgstr "" + msgid "Lowest\\Minimum graphic quality (highest frame rate)" msgstr "Min.\\Minimale Qualität (großes Framerate)" @@ -1064,9 +1077,7 @@ msgid "Pause blur\\Blur the background on the pause screen" msgstr "Pausen-Unschärfe\\Während der Pause den Hintergrund unscharf zeichnen" msgid "Pause in background\\Pause the game when the window is unfocused" -msgstr "" -"Pausieren im Hin
[colobot] 16/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 25c79df65f665909721985af074aad97cb5471f2 Author: krzys-h Date: Sat Jun 3 21:53:48 2017 +0200 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index b5a16e3..6b8e28c 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit b5a16e365c905ee5835a3e5bd8ecb104564c24a2 +Subproject commit 6b8e28c5940d0158da84e67f69798674af03dcf1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 21/62: Fix moving and resizing editor/debugger window
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 2d2990ff91eb3e5539f2f05c6abf36875482d661 Author: melex750 Date: Mon Jun 26 14:11:47 2017 -0400 Fix moving and resizing editor/debugger window * Stop hard drive thrashing when moving/resizing * Also fixed #691. --- src/common/settings.cpp | 15 +++ src/common/settings.h | 4 src/ui/studio.cpp | 39 +++ src/ui/studio.h | 2 ++ 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 8ebd55c..cf7dcc7 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -121,6 +121,8 @@ void CSettings::SaveSettings() GetConfigFile().SetFloatProperty("Edit", "WindowPosY", m_windowPos.y); GetConfigFile().SetFloatProperty("Edit", "WindowDimX", m_windowDim.x); GetConfigFile().SetFloatProperty("Edit", "WindowDimY", m_windowDim.y); +GetConfigFile().SetBoolProperty ("Edit", "WindowMaximized", m_windowMax); + GetConfigFile().SetBoolProperty("Edit", "IOPublic", m_IOPublic); GetConfigFile().SetFloatProperty("Edit", "IOPosX", m_IOPos.x); GetConfigFile().SetFloatProperty("Edit", "IOPosY", m_IOPos.y); @@ -281,6 +283,7 @@ void CSettings::LoadSettings() GetConfigFile().GetFloatProperty("Edit", "WindowPosY", m_windowPos.y); GetConfigFile().GetFloatProperty("Edit", "WindowDimX", m_windowDim.x); GetConfigFile().GetFloatProperty("Edit", "WindowDimY", m_windowDim.y); +GetConfigFile().GetBoolProperty ("Edit", "WindowMaximized", m_windowMax); GetConfigFile().GetBoolProperty ("Edit", "IOPublic", m_IOPublic); GetConfigFile().GetFloatProperty("Edit", "IOPosX", m_IOPos.x); @@ -393,6 +396,18 @@ Math::Point CSettings::GetWindowDim() return m_windowDim; } +void CSettings::SetWindowMax(bool max) +{ +m_windowMax = max; +GetConfigFile().SetBoolProperty("Edit", "WindowMaximized", m_windowMax); +GetConfigFile().Save(); +} + +bool CSettings::GetWindowMax() +{ +return m_windowMax; +} + void CSettings::SetIOPublic(bool mode) { m_IOPublic = mode; diff --git a/src/common/settings.h b/src/common/settings.h index 4e9b762..9291684 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -70,6 +70,9 @@ public: voidSetWindowDim(Math::Point dim); Math::Point GetWindowDim(); + +voidSetWindowMax(bool max); +boolGetWindowMax(); //@} //! Managing windows open/save @@ -98,6 +101,7 @@ protected: float m_fontSize; Math::Point m_windowPos; Math::Point m_windowDim; +boolm_windowMax; boolm_IOPublic; Math::Point m_IOPos; diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index e3545cb..d98dc25 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -249,16 +249,16 @@ bool CStudio::EventProcess(const Event &event) { m_editActualPos = m_editFinalPos = pw->GetPos(); m_editActualDim = m_editFinalDim = pw->GetDim(); -m_settings->SetWindowPos(m_editActualPos); -m_settings->SetWindowDim(m_editActualDim); +m_windowPos = m_editActualPos; +m_windowDim = m_editActualDim; AdjustEditScript(); } if ( event.type == pw->GetEventTypeReduce() ) { if ( m_bEditMinimized ) { -m_editFinalPos = m_settings->GetWindowPos(); -m_editFinalDim = m_settings->GetWindowDim(); +m_editFinalPos = m_windowPos; +m_editFinalDim = m_windowDim; m_bEditMinimized = false; m_bEditMaximized = false; } @@ -283,8 +283,8 @@ bool CStudio::EventProcess(const Event &event) { if ( m_bEditMaximized ) { -m_editFinalPos = m_settings->GetWindowPos(); -m_editFinalDim = m_settings->GetWindowDim(); +m_editFinalPos = m_windowPos; +m_editFinalDim = m_windowDim; m_bEditMinimized = false; m_bEditMaximized = false; } @@ -579,8 +579,25 @@ void CStudio::StartEditScript(CScript *script, std::string name, Program* progra pw = static_cast(m_interface->SearchControl(EVENT_WINDOW6)); if (pw != nullptr) pw->ClearState(STATE_VISIBLE | STATE_ENABLE); -pos = m_editFinalPos = m_editActualPos = m_settings->GetWindowPos(); -dim = m_editFinalDim = m_editActualDim = m_settings->GetWindowDim(); +m_windowPos = m_settings->GetWindowPos(); +m_windowDim = m_settings->GetWindowDim(); +m_bEditMaximized = m_settings->GetWindowMax(); + +if ( m_bEditMaximized ) +{ +m_editFinalPos.x = 0.00f; +m_editFinalPos.y = 0.00f; +m_editFinalDim.x = 1.00f; +m_editFinalDim.y = 1.00f; +} +else +{ +m_editFinalPos = m_windowPos; +m_editFinalDim = m_window
[colobot] 17/62: Merge long first frame rendering fix from #898
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit d860a08d21d916bf5a98bdd03e60b0bc9ffc08b6 Author: krzys-h Date: Sun Jun 4 13:10:50 2017 +0200 Merge long first frame rendering fix from #898 Also did some changes to make sure the "F1 to open SatCom" appears immediately (not after 0.1s), and that mission timer won't start ticking in the first simulation frame (mainly for code battle initial pause) --- src/graphics/engine/engine.h | 6 ++-- src/level/robotmain.cpp | 71 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h index 834de1e..429bca1 100644 --- a/src/graphics/engine/engine.h +++ b/src/graphics/engine/engine.h @@ -869,6 +869,9 @@ public: //! Specifies the location and direction of view void SetViewParams(const Math::Vector &eyePt, const Math::Vector &lookatPt, const Math::Vector &upVec); +//! Updates the textures used for drawing ground spot +voidUpdateGroundSpotTextures(); + //! Loads texture, creating it if not already present Texture LoadTexture(const std::string& name); //! Loads texture from existing image @@ -1197,9 +1200,6 @@ protected: //! Draws the user interface over the scene voidDrawInterface(); -//! Updates the textures used for drawing ground spot -voidUpdateGroundSpotTextures(); - //! Draws old-style shadow spots voidDrawShadowSpots(); //! Draws the gradient background diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 5f932cb..6c8cb09 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -2304,37 +2304,7 @@ void CRobotMain::InitEye() //! Advances the entire scene bool CRobotMain::EventFrame(const Event &event) { -// TODO: For some reason we're getting one big event with event.rTime > 0.1f after loading before the movie starts? -if (!m_immediatSatCom && !m_beginSatCom && !m_movieLock && - m_gameTime > 0.1f && m_phase == PHASE_SIMUL) -{ -m_displayText->DisplayError(INFO_BEGINSATCOM, Math::Vector(0.0f,0.0f,0.0f)); -m_beginSatCom = true; // message appears -} - m_time += event.rTime; -if (!m_movieLock && !m_pause->IsPauseType(PAUSE_ENGINE)) -{ -m_gameTime += event.rTime; -m_gameTimeAbsolute += m_app->GetRealRelTime() / 1e9f; -} - -if (!m_movieLock && !m_pause->IsPauseType(PAUSE_ENGINE) && m_missionTimerStarted) -m_missionTimer += event.rTime; - -if (!m_pause->IsPauseType(PAUSE_ENGINE) && m_autosave && m_gameTimeAbsolute >= m_autosaveLast+(m_autosaveInterval*60) && m_phase == PHASE_SIMUL) -{ -if (m_levelCategory == LevelCategory::Missions|| -m_levelCategory == LevelCategory::FreeGame|| -m_levelCategory == LevelCategory::CustomLevels ) -{ -if (!IOIsBusy() && m_missionType != MISSION_CODE_BATTLE) -{ -m_autosaveLast = m_gameTimeAbsolute; -Autosave(); -} -} -} m_water->EventProcess(event); m_cloud->EventProcess(event); @@ -2419,6 +2389,40 @@ bool CRobotMain::EventFrame(const Event &event) if (toto != nullptr) dynamic_cast(toto)->EventProcess(event); +// NOTE: m_movieLock is set only after the first update of CAutoBase finishes + +if (m_phase == PHASE_SIMUL) +{ +if (!m_immediatSatCom && !m_beginSatCom && !m_movieLock) +{ +m_displayText->DisplayError(INFO_BEGINSATCOM, Math::Vector(0.0f, 0.0f, 0.0f)); +m_beginSatCom = true; // message appears +} + +if (!m_pause->IsPauseType(PAUSE_ENGINE) && !m_movieLock) +{ +m_gameTime += event.rTime; +m_gameTimeAbsolute += m_app->GetRealRelTime() / 1e9f; + +if (m_missionTimerStarted) +m_missionTimer += event.rTime; + +if (m_autosave && m_gameTimeAbsolute >= m_autosaveLast + (m_autosaveInterval * 60)) +{ +if (m_levelCategory == LevelCategory::Missions || +m_levelCategory == LevelCategory::FreeGame || +m_levelCategory == LevelCategory::CustomLevels) +{ +if (!IOIsBusy() && m_missionType != MISSION_CODE_BATTLE) +{ +m_autosaveLast = m_gameTimeAbsolute; +Autosave(); +} +} +} +} +} + HiliteFrame(event.rTime); // Moves the film indicator. @@ -3645,12 +3649,13 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) throw CLevelParserException("Unknown command: '" + line->GetCommand() + "' in " + line->GetLevelFilename() +
[colobot] 29/62: 'Make Thumper Great Again'
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 959854ec599c21d6ca339918c86a5d66280e4aef Author: DavivaD Date: Wed Jul 26 23:05:53 2017 +0200 'Make Thumper Great Again' --- src/object/task/taskterraform.cpp | 85 --- 1 file changed, 80 insertions(+), 5 deletions(-) diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index 380d26f..a7ea3e4 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -378,30 +378,97 @@ bool CTaskTerraform::Terraform() type == OBJECT_TNT || type == OBJECT_NEST || type == OBJECT_BOMB || + type == OBJECT_PLANT0 || + type == OBJECT_PLANT1 || + type == OBJECT_PLANT2 || + type == OBJECT_PLANT3 || + type == OBJECT_PLANT4 || + type == OBJECT_PLANT5 || + type == OBJECT_PLANT6 || + type == OBJECT_PLANT7 || + type == OBJECT_PLANT15 || + type == OBJECT_PLANT16 || + type == OBJECT_PLANT17 || + type == OBJECT_PLANT18 || + type == OBJECT_PLANT19 || + type == OBJECT_MUSHROOM1|| + type == OBJECT_MUSHROOM2|| + type == OBJECT_FACTORY || + type == OBJECT_STATION || + type == OBJECT_CONVERT || + type == OBJECT_REPAIR || + type == OBJECT_DESTROYER|| + type == OBJECT_ENERGY || + type == OBJECT_LABO || + type == OBJECT_PARA || + type == OBJECT_START|| + type == OBJECT_END || + type == OBJECT_EGG || type == OBJECT_RUINmobilew1 || type == OBJECT_RUINmobilew2 || type == OBJECT_RUINmobilet1 || type == OBJECT_RUINmobilet2 || type == OBJECT_RUINdoor || type == OBJECT_RUINsupport || - type == OBJECT_RUINradar ) // small/transportable objects? + type == OBJECT_RUINradar|| + type == OBJECT_BARRIER0 || + type == OBJECT_APOLLO4 ) // almost everything? { dist = Math::Distance(m_terraPos, pObj->GetPosition()); -if ( dist > 5.0f ) continue; if (type == OBJECT_BULLET || -type == OBJECT_NEST ) +type == OBJECT_NEST || +type == OBJECT_EGG) // Alien Organic? { +if ( dist > 5.0f ) continue; m_engine->GetPyroManager()->Create(Gfx::PT_FRAGO, pObj); } else if (type == OBJECT_TNT || - type == OBJECT_BOMB) + type == OBJECT_BOMB) // Explosives? { +if ( dist > 5.0f ) continue; m_engine->GetPyroManager()->Create(Gfx::PT_EXPLOT, pObj); dynamic_cast(m_object)->DamageObject(DamageType::Explosive, 0.9f); } -else +else if (type == OBJECT_PLANT0|| + type == OBJECT_PLANT1|| + type == OBJECT_PLANT2|| + type == OBJECT_PLANT3|| + type == OBJECT_PLANT4|| + type == OBJECT_PLANT5|| + type == OBJECT_PLANT6|| + type == OBJECT_PLANT7|| + type == OBJECT_PLANT15 || + type == OBJECT_PLANT16 || + type == OBJECT_PLANT17 || + type == OBJECT_PLANT18 || + type == OBJECT_PLANT19 || + type == OBJECT_MUSHROOM1 || + type == OBJECT_MUSHROOM2) // Plants? { +if ( dist > 7.5f ) continue; +m_engine->GetPyroManager()->Create(Gfx::PT_EGG, pObj); +} +else if (type == OBJECT_FACTORY || + type == OBJECT_STATION || + type == OBJECT_CONVERT || + type == OBJECT_REPAIR|| + type == OBJECT_DESTROYER || + type == OBJECT_ENERGY|| + type == OBJECT_LABO || + type == OBJECT_PARA) // Buildings? +{ +if ( dist > 15.0f ) continue; + dynamic_cast(pObj)->DamageObject(DamageType::Explosive, 0.2f); +} +else if (type == OBJECT_STATION) // PowerStation? +{ +if ( dist > 15.0f ) continue; +m_engine->GetPyroManager()->Create(Gfx::PT_EXPLOT, pObj); +
[colobot] 08/62: Merge branch 'master' into dev
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 199210c2ad46a1df7b051998ec6123a90df8202c Merge: 8058a89 92a8140 Author: krzys-h Date: Mon May 29 21:13:17 2017 +0200 Merge branch 'master' into dev See 92a8140b778675a769440dc206b11b8012734bff Jenkinsfile | 4 data| 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 11/62: Apply shadow mapping performance counter patch from #923
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 4faabf2185c78858205302233fc5aeb50252f0b8 Author: krzys-h Date: Sat Jun 3 21:11:18 2017 +0200 Apply shadow mapping performance counter patch from #923 --- src/graphics/engine/engine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 0c80c30..a145838 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -3738,6 +3738,7 @@ void CEngine::RenderShadowMap() m_shadowMapping = false; m_offscreenShadowRendering = false; m_qualityShadows = false; +CProfiler::StopPerformanceCounter(PCNT_RENDER_SHADOW_MAP); return; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 05/62: INSTALL-MacOSX.md: Add missed xmlstarlet dependency (#967)
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit daacd0036f112e29299a463f055906803fe3da57 Author: Andrey Date: Mon May 29 21:50:13 2017 +0300 INSTALL-MacOSX.md: Add missed xmlstarlet dependency (#967) --- INSTALL-MacOSX.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL-MacOSX.md b/INSTALL-MacOSX.md index 5d2b45c..001241f 100644 --- a/INSTALL-MacOSX.md +++ b/INSTALL-MacOSX.md @@ -8,7 +8,7 @@ After installing Developer Command Line Tools, you should have basic tools like ``` And then: ```bash - brew install cmake sdl2 sdl2_image sdl2_ttf boost glew physfs flac libsndfile libvorbis vorbis-tools gettext libicns librsvg wget + brew install cmake sdl2 sdl2_image sdl2_ttf boost glew physfs flac libsndfile libvorbis vorbis-tools gettext libicns librsvg wget xmlstarlet ``` Gettext is installed in separate directory without adding the files to system path, so in order to get it working normally, you should call also: ```bash -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 03/62: Update object variable when concatenating strings
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 15b8cf7f782e94220f41b837208478051122e78a Author: melex750 Date: Thu May 25 02:09:44 2017 -0400 Update object variable when concatenating strings --- src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/CBot/CBotInstr/CBotTwoOpExpr.cpp b/src/CBot/CBotInstr/CBotTwoOpExpr.cpp index 4132103..54db597 100644 --- a/src/CBot/CBotInstr/CBotTwoOpExpr.cpp +++ b/src/CBot/CBotInstr/CBotTwoOpExpr.cpp @@ -405,9 +405,20 @@ bool CBotTwoOpExpr::Execute(CBotStack* &pStack) // creates a variable for the result CBotVar*result = CBotVar::Create("", TypeRes); +// get left and right operands +CBotVar*left = pStk1->GetVar(); +CBotVar*right = pStk2->GetVar(); + // creates a variable to perform the calculation in the appropriate type if ( TypeRes != CBotTypString ) // keep string conversion +{ TypeRes = std::max(type1.GetType(), type2.GetType()); +} +else +{ +left->Update(nullptr); +right->Update(nullptr); +} if ( GetTokenType() == ID_ADD && type1.Eq(CBotTypString) ) { @@ -422,8 +433,6 @@ bool CBotTwoOpExpr::Execute(CBotStack* &pStack) CBotError err = CBotNoErr; // is a operation according to request -CBotVar*left = pStk1->GetVar(); -CBotVar*right = pStk2->GetVar(); switch (GetTokenType()) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 09/62: Merge pull request #965 from melex750/dev
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit bf94bd713053a3b1dc588a8f30166fef7e104ea3 Merge: 199210c 15b8cf7 Author: krzys_h Date: Sat Jun 3 18:56:29 2017 +0200 Merge pull request #965 from melex750/dev Improved search() and searchall() src/CBot/CBotInstr/CBotTwoOpExpr.cpp | 13 ++- src/script/cbottoken.cpp | 5 +- src/script/scriptfunc.cpp| 177 +-- src/script/scriptfunc.h | 3 +- 4 files changed, 142 insertions(+), 56 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 06/62: Merge branch 'master' into dev
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 8058a89cdef7c1385c014c945e6f53104ac5e922 Merge: f461465 daacd00 Author: krzys-h Date: Mon May 29 20:53:46 2017 +0200 Merge branch 'master' into dev I messed up and merged #967 into master by mistake, but since it's only a change to README I won't bother reverting it INSTALL-MacOSX.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 13/62: Update data submodule
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 5d0e58fcb3218bea109bd8cffea227f2db87a717 Author: krzys-h Date: Sat Jun 3 21:19:34 2017 +0200 Update data submodule --- data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data b/data index 9549116..4c2718e 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 9549116f99838697e3a64f8ba63fa4f23b763f0f +Subproject commit 4c2718e0ba47e6c9eb914377e46b287d07cfdb5c -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 10/62: Fix delete(this.id), closes #925
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit a95f736cbea6f1efec41357532baa887fa4cd6aa Author: krzys-h Date: Sat Jun 3 20:05:54 2017 +0200 Fix delete(this.id), closes #925 --- src/script/scriptfunc.cpp | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index 092ceca..8a77490 100644 --- a/src/script/scriptfunc.cpp +++ b/src/script/scriptfunc.cpp @@ -695,7 +695,11 @@ bool CScriptFunctions::rDelete(CBotVar* var, CBotVar* result, int& exception, vo CObjectManager::GetInstancePointer()->DeleteObject(obj); } } -return true; + +// Returning "false" here makes sure the program doesn't try to keep executing if the robot just destroyed itself +// using delete(this.id) +// See issue #925 +return false; } CBotTypResult compileSearch(CBotVar* &var, void* user, CBotTypResult returnValue) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 04/62: Fix -Wundefined-var-template warning (#963)
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit f4614658cf06d641e4e5cbb51bd1f7224e5cadc3 Author: Abigail Date: Mon May 29 19:46:11 2017 +0100 Fix -Wundefined-var-template warning (#963) This avoids specializing CSingleton::m_instance for each type, and instead just defines it once in the header. This is allowed by the standard, multiple definitions are merged in the same way that inline functions are. --- src/app/app.cpp| 3 --- src/app/input.cpp | 3 --- src/app/pathman.cpp| 2 -- src/common/config_file.cpp | 3 --- src/common/logger.cpp | 4 src/common/settings.cpp| 2 -- src/common/singleton.h | 1 + src/graphics/engine/engine.cpp | 2 -- src/level/robotmain.cpp| 3 --- src/object/object_manager.cpp | 4 10 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/app/app.cpp b/src/app/app.cpp index f019ccc..c780e20 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -61,9 +61,6 @@ #include #include - -template<> CApplication* CSingleton::m_instance = nullptr; - char CApplication::m_languageLocale[] = { 0 }; diff --git a/src/app/input.cpp b/src/app/input.cpp index 87cedf3..142a455 100644 --- a/src/app/input.cpp +++ b/src/app/input.cpp @@ -32,9 +32,6 @@ #include #include - -template<> CInput* CSingleton::m_instance = nullptr; - CInput::CInput() : m_keyPresses() { diff --git a/src/app/pathman.cpp b/src/app/pathman.cpp index a384828..c5f7e50 100644 --- a/src/app/pathman.cpp +++ b/src/app/pathman.cpp @@ -37,8 +37,6 @@ #include #include -template<> CPathManager* CSingleton::m_instance = nullptr; - CPathManager::CPathManager(CSystemUtils* systemUtils) : m_systemUtils(systemUtils) { diff --git a/src/common/config_file.cpp b/src/common/config_file.cpp index 6148eae..94496ca 100644 --- a/src/common/config_file.cpp +++ b/src/common/config_file.cpp @@ -34,9 +34,6 @@ #include #include - -template<> CConfigFile* CSingleton::m_instance = nullptr; - namespace bp = boost::property_tree; CConfigFile::CConfigFile() diff --git a/src/common/logger.cpp b/src/common/logger.cpp index b5e5b9c..ed9bdb5 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -22,10 +22,6 @@ #include - -template<> CLogger* CSingleton::m_instance = nullptr; - - CLogger::CLogger() { #if DEV_BUILD diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 4519b07..8ebd55c 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -32,8 +32,6 @@ #include "sound/sound.h" -template<> CSettings* CSingleton::m_instance = nullptr; - CSettings::CSettings() { m_tooltips = true; diff --git a/src/common/singleton.h b/src/common/singleton.h index 005f524..254fc23 100644 --- a/src/common/singleton.h +++ b/src/common/singleton.h @@ -73,3 +73,4 @@ private: CSingleton(const CSingleton &) = delete; }; +template T* CSingleton::m_instance = nullptr; diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 943491b..0c80c30 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -64,8 +64,6 @@ #include #include -template<> Gfx::CEngine* CSingleton::m_instance = nullptr; - // Graphics module namespace namespace Gfx { diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 6159652..5f932cb 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -125,9 +125,6 @@ const Gfx::Color COLOR_REF_ALIEN = Gfx::Color(135.0f/256.0f, 170.0f/256.0f, 13. const Gfx::Color COLOR_REF_GREEN = Gfx::Color(135.0f/256.0f, 170.0f/256.0f, 13.0f/256.0f); // green const Gfx::Color COLOR_REF_WATER = Gfx::Color( 25.0f/256.0f, 255.0f/256.0f, 240.0f/256.0f); // cyan - -template<> CRobotMain* CSingleton::m_instance = nullptr; - //! Constructor of robot application CRobotMain::CRobotMain() { diff --git a/src/object/object_manager.cpp b/src/object/object_manager.cpp index a33a89f..e8323a5 100644 --- a/src/object/object_manager.cpp +++ b/src/object/object_manager.cpp @@ -36,10 +36,6 @@ #include - -template<> CObjectManager* CSingleton::m_instance = nullptr; - - CObjectManager::CObjectManager(Gfx::CEngine* engine, Gfx::CTerrain* terrain, Gfx::COldModelManager* oldModelManager, -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] 02/62: Add searchall() and improve search() function
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 30210d0de7f6df1f808d7aa9dedce1290e3ada5f Author: melex750 Date: Thu May 25 02:01:42 2017 -0400 Add searchall() and improve search() function --- src/script/cbottoken.cpp | 5 +- src/script/scriptfunc.cpp | 177 -- src/script/scriptfunc.h | 3 +- 3 files changed, 131 insertions(+), 54 deletions(-) diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp index 5d24673..4dd5c8e 100644 --- a/src/script/cbottoken.cpp +++ b/src/script/cbottoken.cpp @@ -271,6 +271,7 @@ std::string GetHelpFilename(const char *token) if ( strcmp(token, "factory" ) == 0 ) helpfile = "cbot/factory"; if ( strcmp(token, "destroy" ) == 0 ) helpfile = "cbot/destroy"; if ( strcmp(token, "search") == 0 ) helpfile = "cbot/search"; +if ( strcmp(token, "searchall" ) == 0 ) helpfile = "cbot/searchall"; if ( strcmp(token, "radar" ) == 0 ) helpfile = "cbot/radar"; if ( strcmp(token, "radarall" ) == 0 ) helpfile = "cbot/radarall"; if ( strcmp(token, "direction" ) == 0 ) helpfile = "cbot/direct"; @@ -421,6 +422,7 @@ bool IsFunction(const char *token) if ( strcmp(token, "takeoff" ) == 0 ) return true; if ( strcmp(token, "destroy" ) == 0 ) return true; if ( strcmp(token, "search" ) == 0 ) return true; +if ( strcmp(token, "searchall") == 0 ) return true; if ( strcmp(token, "radar") == 0 ) return true; if ( strcmp(token, "radarall" ) == 0 ) return true; if ( strcmp(token, "detect" ) == 0 ) return true; @@ -522,7 +524,8 @@ const char* GetHelpText(const char *token) if ( strcmp(token, "research" ) == 0 ) return "object.research ( type );"; if ( strcmp(token, "takeoff" ) == 0 ) return "object.takeoff ( );"; if ( strcmp(token, "destroy" ) == 0 ) return "object.destroy ( );"; -if ( strcmp(token, "search") == 0 ) return "search ( cat, pos );"; +if ( strcmp(token, "search") == 0 ) return "search ( cat, pos, min, max, sens, filter );"; +if ( strcmp(token, "searchall" ) == 0 ) return "searchall ( cat, pos, min, max, sens, filter );"; if ( strcmp(token, "radar" ) == 0 ) return "radar ( cat, angle, focus, min, max, sens, filter );"; if ( strcmp(token, "radarall" ) == 0 ) return "radarall ( cat, angle, focus, min, max, sens, filter );"; if ( strcmp(token, "detect") == 0 ) return "detect ( cat );"; diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index 5fc9756..092ceca 100644 --- a/src/script/scriptfunc.cpp +++ b/src/script/scriptfunc.cpp @@ -79,9 +79,9 @@ CBotTypResult CScriptFunctions::cClassOneFloat(CBotVar* thisclass, CBotVar* &var return cOneFloat(var, nullptr); } -// Compiling a procedure with a "dot". +// Compile a parameter of type "point". -CBotTypResult CScriptFunctions::cPoint(CBotVar* &var, void* user) +CBotTypResult cPoint(CBotVar* &var, void* user) { if ( var == nullptr ) return CBotTypResult(CBotErrLowParam); @@ -698,63 +698,106 @@ bool CScriptFunctions::rDelete(CBotVar* var, CBotVar* result, int& exception, vo return true; } - - -// Compilation of the instruction "search(type, pos)". - -CBotTypResult CScriptFunctions::cSearch(CBotVar* &var, void* user) +CBotTypResult compileSearch(CBotVar* &var, void* user, CBotTypResult returnValue) { -CBotVar*array; -CBotTypResult ret; - if ( var == nullptr ) return CBotTypResult(CBotErrLowParam); if ( var->GetType() == CBotTypArrayPointer ) { -array = var->GetItemList(); -if ( array == nullptr ) return CBotTypResult(CBotTypPointer); -if ( array->GetType() > CBotTypDouble ) return CBotTypResult(CBotErrBadNum); +CBotTypResult type = var->GetTypResult().GetTypElem(); +if ( type.GetType() > CBotTypDouble ) return CBotTypResult(CBotErrBadParam); // type } -else if ( var->GetType() > CBotTypDouble ) return CBotTypResult(CBotErrBadNum); +else if ( var->GetType() > CBotTypDouble ) return CBotTypResult(CBotErrBadNum); // type var = var->GetNext(); -if ( var != nullptr ) -{ -ret = cPoint(var, user); -if ( ret.GetType() != 0 ) return ret; -if ( var != nullptr ) return CBotTypResult(CBotErrOverParam); -} -return CBotTypResult(CBotTypPointer, "object"); +if ( var == nullptr ) return returnValue; + +CBotTypResult ret = cPoint(var, user); // pos +if ( ret.GetType() != 0 ) return ret; + +if ( var == nullptr ) return returnValue; +if ( var->GetType() > CBotTypDouble ) return CBotTypResult(CBotErrBadNum); // min +var = var->GetNext(); +if ( var == nullptr ) return returnValue; +if ( var->GetType() > CBotTypDouble ) re
[colobot] 07/62: Jenkinsfile: prevent PRs to master
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 92a8140b778675a769440dc206b11b8012734bff Author: krzys-h Date: Mon May 29 21:09:50 2017 +0200 Jenkinsfile: prevent PRs to master I just merged a PR to master by mistake. Whoops! Let's not let that happen again. --- Jenkinsfile | 4 data| 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2d1b76c..6058618 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,10 @@ if (env.BRANCH_NAME.startsWith('PR-')) { properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '30', artifactNumToKeepStr: '20']]]) } +if (env.CHANGE_TARGET == 'master') { +error("This pull request targets the wrong branch. Please reopen the pull request targetting the dev branch.") +} + node('master') { stage('Pull changes') { checkout scm diff --git a/data b/data index 3cf809d..f4c4364 16 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit 3cf809d6a36d3834a97c8cede250b15ec4473539 +Subproject commit f4c4364f00afe2a754204dec387cd80124b15c3a -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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
[colobot] branch debian/master updated (324c228 -> 1b4aafb)
This is an automated email from the git hooks/post-receive script. odyx pushed a change to branch debian/master in repository colobot. from 324c228 colobot 0.1.10-2 Debian release new ef4d1b0 Revert "Add menu file and xpm icon" new d086fed Bump Standards-Version to 4.0.1, after having removed the 'menu' entry new 29578fe Bump S-V to 4.1.1 new 1be5eb9 Update Vcs-* and Hompage URLs to https variants new 36cd5ee Post-release 0.1.10-alpha new f461465 Fix -Wundefined-var-template warning (#963) new daacd00 INSTALL-MacOSX.md: Add missed xmlstarlet dependency (#967) new 8058a89 Merge branch 'master' into dev new 92a8140 Jenkinsfile: prevent PRs to master new 199210c Merge branch 'master' into dev new 30210d0 Add searchall() and improve search() function new 15b8cf7 Update object variable when concatenating strings new bf94bd7 Merge pull request #965 from melex750/dev new a95f736 Fix delete(this.id), closes #925 new 4faabf2 Apply shadow mapping performance counter patch from #923 new 8d9b363 Update data submodule new 5d0e58f Update data submodule new ac27bda Update data submodule new bb35585 Fix object.factory() code type detection, closes #938 new 25c79df Update data submodule new d860a08 Merge long first frame rendering fix from #898 new d63ed86 Added QuickSave/QuickLoad feature #929 new 75d9f85 Display warning if no quicksave slot is found new 0de347d Fixed goto() behaviour on 32-bit binaries new f40756b Fix turn(1) doesn't draining energy new dab223e Clamp energy level to standard values for OrgaShooters new 2d2990f Fix moving and resizing editor/debugger window new 8687016 Fix moving and resizing open/save dialog new 0a83508 Merge pull request #985 from melex750/dev new c03dfc1 Add escape codes for string literals new e3c44e9 Add syntax highlighting for escape codes new 9448f67 Merge pull request #1004 from melex750/dev-cbot new 2751db3 Add horizontal FoV to CEngine new 2e8798b Make planets stay in one place in the sky - at least in the X direction. new 8b0ccf6 Fix horizontal scrolling of background images. new ee0f3ff Merge pull request #1022 from immibis/dev new bef6e9e Make Thumper Squash transportable/small objects. new b5e0f99 Make Recycler Recycle small Building Ruins. new a4482f1 Decrease radius of squashing items. new 959854e 'Make Thumper Great Again' new ee35d35 Correct Small Mistake new 6b1dd5d Merge pull request #994 from DavivaD/dev-issue-658 new 387b7b5 Fix non-scoreboard code battles, closes #1023 new a9e0874 Fix 'this' for object:: functions new 1eee06d Keep mission history after loading a crashsave new d357de1 Save object lifetime and abstime new 17d47e9 Merge pull request #1040 from melex750/dev new a29a4f9 Damage Alert Implementation (2th Stage) new bf69b86 Fixed shortcut not changing to normal state new 2a0c2c3 Make shortcut blink in red new d3b969f Merge pull request #992 from DavivaD/dev-dmgalarm-st2 new 12dd96c Update data submodule new b89b0d2 Update data submodule new 5021a40 Update data submodule new 5f5e523 Fix CEdit background margins, closes #1029 new f87aa15 Update data submodule new 611c353 Update release script new b143aa3 Release 0.1.11-alpha: Merge branch 'dev' new b5cc768 Release 0.1.11-alpha: Bump version new 49dd30a Merge tag 'upstream/0.1.11' into debian/master new 04449c2 Fix DEB_HOST_ARCH_OS dpkg-architecture variable setting new 1b4aafb colobot 0.1.11-1 Debian release The 62 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: CMakeLists.txt | 2 +- INSTALL-MacOSX.md| 2 +- Jenkinsfile | 4 + data | 2 +- debian/changelog | 12 ++ debian/colobot.install | 1 - debian/colobot.menu | 6 - debian/control | 9 +- debian/rules | 8 +- po/colobot.pot | 37 +-- po/de.po | 134 +- po/fr.po | 94 po/pl.po | 57 ++ po/ru.po
[colobot] 01/62: Post-release 0.1.10-alpha
This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot. commit 36cd5eeea9927a97770fdd22cb27d7db77a8cf3b Author: krzys-h Date: Wed May 24 14:34:19 2017 +0200 Post-release 0.1.10-alpha --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 42a6ac8..87f0cfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,9 @@ set(COLOBOT_VERSION_MINOR1) set(COLOBOT_VERSION_REVISION 10) # Used on official releases -set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha") +#set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha") # Used on unreleased, development builds -#set(COLOBOT_VERSION_UNRELEASED "+alpha") +set(COLOBOT_VERSION_UNRELEASED "+alpha") # Append git characteristics to version if(DEFINED COLOBOT_VERSION_UNRELEASED) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.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