Commit Graph

3686 Commits (9c8a8f4cf44232003f1200433ad8d251756ce3ab)

Author SHA1 Message Date
tomangelo2 9c8a8f4cf4 Better fix for #1587 2023-07-04 20:35:52 +02:00
tomangelo2 dfac4209ef Add slot for Wasps (fix for #1587) 2023-07-04 20:35:52 +02:00
Emxx52 793ef3d0a4 Update Russian translation (#1557)
* Update Russian translation (#1470)

* Update Russian translation

Co-authored-by: X64E <X64E@users.noreply.github.com>
Co-authored-by: Anton-V-K <Anton-V-K@users.noreply.github.com>

* Update data submodule

---------

Co-authored-by: zvladru <30793959+zvladru@users.noreply.github.com>
Co-authored-by: X64E <X64E@users.noreply.github.com>
Co-authored-by: Anton-V-K <Anton-V-K@users.noreply.github.com>
2023-07-04 20:35:52 +02:00
lolbot-iichan 0d57ac43bb UI: Fix scribbler's green button color 2023-07-04 20:35:52 +02:00
Tomasz Kapuściński 3baf2bbb10 Fixed wasp not having a valid cargo slot 2023-07-04 20:35:52 +02:00
Fiftytwo 7c95855d4f Update data submodule 2023-07-04 20:35:52 +02:00
Fiftytwo dd2fbd2675 Add unlocking Phazer research in plus and free 2023-07-04 20:35:52 +02:00
Fiftytwo 8eaebb8c84 Fix missing done research icons on level load 2023-07-04 20:35:52 +02:00
Tomasz Kapuściński 080c46daa1 Fixed inverted coordinates 2023-05-15 23:00:50 +02:00
Tomasz Kapuściński 1bb918ce23 Rewritten vertex attribute processing 2023-05-09 02:23:56 +02:00
Tomasz Kapuściński b66ea8bcee Fixed a couple of warnings 2023-04-15 02:45:33 +02:00
Tomasz Kapuściński 37b403c46d Replaced sprintf() with snprintf() 2023-04-15 02:05:12 +02:00
Tomasz Kapuściński 2e7bf2a7a6 Fixed invalid parameter 2023-04-15 01:06:58 +02:00
Tomasz Kapuściński 4b1b20ec5f Checkout json submodule in Mac build 2023-04-15 00:29:07 +02:00
Tomasz Kapuściński d24a6b37a4 Added glm to installed dependencies 2023-04-15 00:16:56 +02:00
Tomasz Kapuściński 4531dc432e Merge branch 'dev' into dev-graphics-overhaul 2023-04-14 23:41:28 +02:00
Tomasz Kapuściński 06bf44da38
Merge pull request #1575 from colobot/1571-optimize-windows-builds-with-vcpkg
Optimize Windows builds with vcpkg
2023-04-14 18:58:20 +02:00
Tomasz Kapuściński 9dd0159585 Added useless comment for testing 2023-04-10 23:22:23 +02:00
Tomasz Kapuściński 158901ff02 Fixed cached path 2023-04-10 22:36:52 +02:00
Tomasz Kapuściński 9a01408eda Added CMakeUserPresets.json to .gitignore 2023-04-10 21:37:55 +02:00
Tomasz Kapuściński 7c0dbd914f Cache vcpkg dependencies 2023-04-10 20:55:39 +02:00
Tomasz Kapuściński b990ee81ff
Merge pull request #1570 from colobot/1569-remove-ubuntu-1804-actions
Removed Ubuntu 18.04 actions
2023-04-08 21:29:41 +02:00
Tomasz Kapuściński bfd9dae533 Removed Ubuntu 18.04 actions 2023-04-08 20:43:26 +02:00
Tomasz Kapuściński cbfcbae7ab
Merge pull request #1560 from lolbot-iichan/dev-fix-multi-team-ant-legs
ENGINE: Fix operator < for COldModelManager::FileInfo
2023-04-08 19:46:20 +02:00
Tomasz Kapuściński 2e95aeac9b
Merge pull request #1501 from colobot/dev-fix-macos-compilation
Fix compilation under MacOS
2023-04-08 19:11:43 +02:00
Tomasz Kapuściński efbd296fc3 Merge branch 'dev' into dev-fix-macos-compilation 2023-04-08 17:55:03 +02:00
Tomasz Kapuściński 9c5d9d8f17
Merge pull request #1568 from colobot/dev-vcpkg-fixes
vcpkg fixes
2023-04-08 17:49:04 +02:00
Tomasz Kapuściński 0b978f7dbc Use newer version of vcpkg to fix broken link 2023-04-03 00:51:27 +02:00
Tomasz Kapuściński 4634461c1d Added vcpkg manifest file 2023-04-03 00:01:30 +02:00
Tomasz Kapuściński 1c9c0929da
Merge pull request #1559 from suve/add-missing-cstdint-includes
Add missing <cstdint> includes
2023-03-11 11:53:05 +01:00
Tomasz Kapuściński 24622e6a75
Merge pull request #1562 from olokos/dev
Fix For MSVC2022 and Background Pause blur
2023-03-11 11:39:59 +01:00
olokos f60c62f05d Graphics - Engine - Fix pause blur for new SDL 2023-02-06 17:53:56 +01:00
olokos ec9607784c Remove redundant " from CMakeLists.txt 2023-02-06 17:22:05 +01:00
Tomasz Kapuściński 5efd8342ec Updated SDL2 and SDL2_image library names 2023-02-06 17:07:02 +01:00
lolbot-iichan 0618174b2b
ENGINE: Fix operator < for COldModelManager::FileInfo
There was a rare case when Old Model Manager's model base object list was not working correctly.

Testcase:
CreateObject pos=10;0 dir=1.5 type=LeggedTrainer selectable=1 team=1
CreateObject pos=-10;0 dir=0.25 type=LeggedTrainer selectable=1 team=2

Expected result (after fix): models are displayed correctly
Actual result (before fix): some legs are missing, instead of them giant surfaces are floating high above the model

The reason was is failing to find the element that was just created and added with `m_models.find(FileInfo(fileName, mirrored, team))`
This happened for objects that had mirrored body parts (at least Ants, Wasps and all Legged units were affected) in case they were assigned to several teams.
Everyone were missing some legs since the `modelManager->AddModelReference("ant6.mod", true, rank, m_object->GetTeam())`
Wasps were also usually missing some wings.
2023-02-05 16:34:55 +03:00
suve d47e265863 Add missing <cstdint> includes
Some parts of the code used the fixed-size type uint32_t,
which is defined in stdint.h / cstdint - without including said
header file. With GCC13, the inter-header dependencies seem
to have changed and the file is no longer included transitively,
requiring an explicit include.
2023-01-19 10:34:55 +01:00
Tomasz Kapuściński 436c316a4a Updated SDL2 and SDL2_image library names 2022-11-26 20:04:44 +01:00
Tomasz Kapuściński 1d8e06c7ba Revert "Fix for SDL on Windows"
This reverts commit 21b6572b5b.
2022-11-26 20:00:44 +01:00
Tomasz Kapuściński 21b6572b5b Fix for SDL on Windows 2022-11-26 17:42:34 +01:00
Tomasz Kapuściński 3b3cdb9961 Fix for config.h? 2022-11-26 16:15:53 +01:00
Tomasz Kapuściński bedd24801c Better fix? 2022-11-26 15:49:39 +01:00
Tomasz Kapuściński 983a9a6e03 Another fix for SDL 2022-11-26 15:32:56 +01:00
Tomasz Kapuściński 2f50470591 Fix for linking to SDL 2022-11-26 14:52:39 +01:00
Tomasz Kapuściński 5feffc70df Updated vcpkg version 2022-11-26 12:31:54 +01:00
Tomasz Kapuściński e3ba33a508 Rewritten CModelMesh to use separate vertex attributes 2022-11-12 18:52:21 +01:00
Emxx52 b7cb26822b
Update build.yml 2022-11-06 04:12:02 +01:00
tomangelo2 0e53336d61 Merge branch 'dev' into dev-fix-macos-compilation 2022-11-05 19:27:52 +01:00
tomangelo 0df78e7fa6
Merge pull request #1529 from colobot/dev-fix-space
undefined
2022-09-15 02:13:19 +02:00
tomangelo2 789c8b2292 Fix compilation with gcc 2022-09-15 01:14:29 +02:00
tomangelo c0669a591b
Update INSTALL-MacOSX.md 2022-09-15 00:12:54 +02:00