immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,763 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

3763 Commits (670cedd9670726df11a4b414596dad1da9f6319f)

Author SHA1 Message Date
Tomasz Kapuściński a16771425a Updated license headers 2023-08-06 23:15:48 +02:00
Tomasz Kapuściński 4fcd989e72
Merge pull request #1599 from colobot/dev-fix-appimage 
Fix AppImage generation
 2023-07-22 22:20:15 +02:00
tomangelo2 882672c0b5 Another fix for Appimage generator 2023-07-22 21:31:49 +02:00
tomangelo2 b152bd5dea Fix Appimage generation script 2023-07-22 21:23:13 +02:00
Emxx52 59600ae5c7
Merge pull request #1598 from colobot/dev-readme 
Update README files
 2023-07-22 11:03:48 +02:00
Fiftytwo 11f5073a3f Replace outdated links in README-dev.md 2023-07-21 23:14:09 +02:00
Fiftytwo cfa9a00024 Replace outdated links in CONTRIBUTING.md 2023-07-21 22:47:40 +02:00
Fiftytwo 9e1248e459 Rewrite README.md 2023-07-21 22:09:33 +02:00
Marcin Puc 9ccc514a67
Add reference to the Void Linux package (#1539) 2023-07-21 22:01:26 +02:00
Tomasz Kapuściński 63ad09b615 Post-merge fixes 2023-07-04 20:35:52 +02:00
Your Name 1376d8b16d Fix planets getting distorted when changing window aspect ratio. 2023-07-04 20:35:52 +02:00
Tomasz Kapuściński a04dcd8014 Fix windows build failure (#1595) 
* Added version override for libiconv

* Updated vcpkg baseline, forced PhysFS version 3.0.2

* Updated vcpkg git commit
 2023-07-04 20:35:52 +02:00
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 172e1fbff0
Merge pull request #1593 from immibis/fix-squashed-planets 
Fix squashed planets when window isn't 4:3
 2023-07-03 20:45:13 +02:00
Tomasz Kapuściński 461f1e2240
Fix windows build failure (#1595) 
* Added version override for libiconv

* Updated vcpkg baseline, forced PhysFS version 3.0.2

* Updated vcpkg git commit
 2023-06-28 23:52:01 +02:00
Emxx52 7c40c10b7a
Merge pull request #1590 from colobot/dev-fix-1587 
Change the slot for AlienWasp
 2023-06-28 23:50:25 +02:00
Your Name 017a1571f7 Fix planets getting distorted when changing window aspect ratio. 2023-06-28 19:15:51 +02:00
tomangelo2 f672e89201 Better fix for #1587 2023-06-22 23:32:02 +02:00
tomangelo2 9417b916da Add slot for Wasps (fix for #1587) 2023-06-19 00:31:15 +02:00
Emxx52 4f0854068c
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-05-27 00:47:45 +02:00
Emxx52 3171dc4a89
Merge pull request #1582 from lolbot-iichan/dev-scribbler-ui-fix 
UI: Fix scribbler's green button color
 2023-05-26 21:35:26 +02:00
Emxx52 10b89e36f9
Merge pull request #1581 from colobot/1580-wasp-grabbing-behavior-broken 
Fixed wasp not having a valid cargo slot
 2023-05-26 21:12:56 +02:00
Tomasz Kapuściński 080c46daa1 Fixed inverted coordinates 2023-05-15 23:00:50 +02:00
lolbot-iichan b3d19a9e8d
UI: Fix scribbler's green button color 2023-05-15 19:20:56 +03:00
Tomasz Kapuściński 1bb918ce23 Rewritten vertex attribute processing 2023-05-09 02:23:56 +02:00
Tomasz Kapuściński 160a4a4f75 Fixed wasp not having a valid cargo slot 2023-05-07 20:43:43 +02:00
Emxx52 71e3e78644
Merge pull request #1579 from colobot/dev-plus-research 
Add unlocking Phazer research after completing missions chapter 9 and fix missing research icons
 2023-05-07 16:56:18 +02:00
Fiftytwo 6e7dee74cf Update data submodule 2023-05-07 16:00:02 +02:00
Fiftytwo 8f11fc0126 Add unlocking Phazer research in plus and free 2023-05-07 15:33:17 +02:00
Fiftytwo 5f9b14f43d Fix missing done research icons on level load 2023-05-07 08:42:21 +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