immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: immibis:fix-squashed-planets
Branches Tags
immibis:colobot2
immibis:dev
immibis:fix-squashed-planets
immibis:pyro-refactor
immibis:fix-quicksave-sim-speed-crash
immibis:1164-fix
immibis:modernize-cmake-1
immibis:coolant-mod
immibis:blender-script
immibis:cbot-cleanup
immibis:1008-fix
immibis:dev-buzzingcars
immibis:master
immibis:blupimania2
immibis:buzzingcars
immibis:dev-new-models
immibis:dev-time-step
immibis:dev-mp
immibis:dev-ui
immibis:colobot-gold-0.1.10-alpha
immibis:colobot-gold-0.1.9-alpha
immibis:colobot-gold-0.1.8-alpha
immibis:colobot-gold-0.1.7b-alpha
immibis:colobot-gold-0.1.7-alpha
immibis:colobot-gold-0.1.6-alpha
immibis:colobot-gold-0.1.5-alpha
immibis:colobot-gold-0.1.4-alpha
immibis:colobot-gold-0.1.3-alpha
immibis:colobot-gold-0.1.2-alpha
immibis:colobot-gold-0.1.1-alpha
immibis:colobot-gold-0.1.0-alpha
immibis:colobot-gold-pre_alpha
immibis:colobot-dev-1st_compile
immibis:colobot-original
...
pull from: immibis:colobot2
Branches Tags
immibis:colobot2
immibis:dev
immibis:fix-squashed-planets
immibis:pyro-refactor
immibis:fix-quicksave-sim-speed-crash
immibis:1164-fix
immibis:modernize-cmake-1
immibis:coolant-mod
immibis:blender-script
immibis:cbot-cleanup
immibis:1008-fix
immibis:dev-buzzingcars
immibis:master
immibis:blupimania2
immibis:buzzingcars
immibis:dev-new-models
immibis:dev-time-step
immibis:dev-mp
immibis:dev-ui
immibis:colobot-gold-0.1.10-alpha
immibis:colobot-gold-0.1.9-alpha
immibis:colobot-gold-0.1.8-alpha
immibis:colobot-gold-0.1.7b-alpha
immibis:colobot-gold-0.1.7-alpha
immibis:colobot-gold-0.1.6-alpha
immibis:colobot-gold-0.1.5-alpha
immibis:colobot-gold-0.1.4-alpha
immibis:colobot-gold-0.1.3-alpha
immibis:colobot-gold-0.1.2-alpha
immibis:colobot-gold-0.1.1-alpha
immibis:colobot-gold-0.1.0-alpha
immibis:colobot-gold-pre_alpha
immibis:colobot-dev-1st_compile
immibis:colobot-original

273 Commits
fix-squash ... colobot2

Author SHA1 Message Date
immibis b98edec8f8 Fix some save file corruption (type 0 objects) caused by children of deleted objects not getting properly deleted. 2023-11-20 11:52:37 +01:00
immibis d22b32477e Career: Save the rest of the level as well as just the spaceship. Also put all career save files in __career__ folder. 2023-11-18 19:45:52 +01:00
immibis 884129a676 1000 seems very low 2023-11-18 19:45:06 +01:00
immibis 0fa486b9f0 Add a career mode. The contents of the spaceship are saved on liftoff and restored when loading a level. At the beginning, all levels are unlocked. 2023-11-18 19:06:52 +01:00
immibis 4251873f49 Very similar thing with DrawFront flag 2023-11-18 14:53:58 +01:00
immibis 74ab7afb23 Compute object team on demand - partially. But there's more to team colour, and it was already broken before, so there's no way to see if this did anything. 2023-11-18 14:11:52 +01:00
immibis ab3c22dce3 Compute camera ghost mode on demand - simplifies code as each object doesn't propagate ghost mode to its render objects. 2023-11-18 14:01:02 +01:00
immibis 72ca4f2d7c Each graphics object retains a reference to its associated game object. This will be useful soon. 2023-11-18 13:40:25 +01:00
immibis 3a8f75bd02 string_view is not a drop-in replacement for char[] 
Fixes crash on startup - when logging FULL_NAME with %s - on Linux.
 2023-10-11 06:04:18 +02:00
immibis 32fed5af73 Fix build - static library used in shared library must have position-independent code 2023-10-11 05:16:06 +02:00
Emxx52 f07b7a1b60
Merge pull request #1612 from colobot/dev-fix-links 
Update doc links in README
 2023-08-28 23:59:33 +02:00
Fiftytwo 0a95289f9f Update doc links in README 2023-08-28 23:31:44 +02:00
Ceeee 7d75b9cc14
Update German translation (#1607) 2023-08-24 23:32:11 +02:00
tomangelo 909a2b2d2e
Update checkout and upload-artifact actions to node16 (#1610) 
* Updated checkout actions

* Updated upload-artifact actions

* Remove now unnecessary gcc-9 step
 2023-08-24 23:25:32 +02:00
Emxx52 7d22b607cc
Merge pull request #1609 from colobot/1608-strutilsremovecomments-breaks-some-levels 
Fix RemoveComments()
 2023-08-24 20:33:02 +02:00
Tomasz Kapuściński 2f80292176 Fix RemoveComments() 2023-08-24 18:45:16 +02:00
Emxx52 53b3062bee
Merge pull request #1606 from colobot/1605-improve-level-loading-time 
Improve level loading time
 2023-08-23 20:19:17 +02:00
Tomasz Kapuściński 8e128ff08c Added StrUtils::RemoveComments() and used it instead of std::regex in parsing level commands 2023-08-23 16:56:15 +02:00
Emxx52 3c4b9f6d01
Merge pull request #1604 from colobot/dev-graphics-overhaul 
Graphics overhaul
 2023-08-23 02:06:58 +02:00
Tomasz Kapuściński 9d5f88f07c Merge branch 'dev' into dev-graphics-overhaul 2023-08-22 23:51:12 +02:00
Tomasz Kapuściński b9c8d36d8b Fixed links 2023-08-22 23:29:08 +02:00
Tomasz Kapuściński ff340fda92 Moved docimg to docs/images 2023-08-22 22:52:55 +02:00
Tomasz Kapuściński c0d568241b Moved some documentation files to docs directory 2023-08-22 22:42:40 +02:00
Tomasz Kapuściński d879fa5fc9 Cleanup in unit tests 2023-08-22 22:19:46 +02:00
Tomasz Kapuściński 510fe6804a Extracted CBot tools 2023-08-22 22:01:24 +02:00
Tomasz Kapuściński 2b84da8a77 Removed model converter 2023-08-22 21:50:18 +02:00
Tomasz Kapuściński 670cedd967 Renamed directory tools to scripts 2023-08-22 21:45:11 +02:00
Tomasz Kapuściński 5a52c66b1f Renamed target colobot_ut to Colobot-UnitTests 2023-08-22 21:39:55 +02:00
Tomasz Kapuściński 434bd0bd3a Renamed src to colobot-base and colobotbase target to Colobot-Base 2023-08-22 21:19:03 +02:00
Emxx52 5f854da5fc
Merge pull request #1602 from colobot/dev-upgrade-physfs 
Replace deprecated PHYSFS functions with their modern counterparts
 2023-08-22 21:01:10 +02:00
tomangelo2 86c2b2f0dc Replace deprecated PHYSFS functions with their modern counterparts 2023-08-17 23:38:02 +02:00
Tomasz Kapuściński 7fe75e20ad Fixed wrong text selection color 2023-08-15 20:32:33 +02:00
Tomasz Kapuściński 261eaa78e4 A fix for Windows stupidity 2023-08-15 19:22:10 +02:00
Tomasz Kapuściński 4d11040dba Split string encoding functionality to Windows and generic implementations 2023-08-15 18:57:34 +02:00
Tomasz Kapuściński 97ea5cc895 Added missing include 2023-08-15 14:34:51 +02:00
Tomasz Kapuściński fe36b0fe29 Build CBot as static library instead 2023-08-15 14:11:05 +02:00
Tomasz Kapuściński 8fab817118 Ensure position-independent code generation 2023-08-15 13:48:02 +02:00
Tomasz Kapuściński 8601066761 Fix for compilation error 2023-08-15 13:41:39 +02:00
Tomasz Kapuściński 9586474fa8 Removed remaining dependency on boost 2023-08-15 12:47:27 +02:00
Tomasz Kapuściński 5b79a4eb38 Extracted StrUtils to a separate target and replaced remaining boost code 2023-08-15 12:25:14 +02:00
Tomasz Kapuściński 1034c2e45c Rewritten config to use JSON instead of INI 2023-08-15 12:02:51 +02:00
Tomasz Kapuściński fde2b901bd Rewritten loading of font config file 2023-08-15 11:16:51 +02:00
Tomasz Kapuściński 3e06584956 Removed unused boost includes 2023-08-15 02:55:33 +02:00
Tomasz Kapuściński 0ab9ae4b6e Replaced boost::adaptor::reverse with reverse iterators 
Changes based on f0f6f61cab
 2023-08-15 02:51:28 +02:00
Tomasz Kapuściński b296ee4d47 Added StrUtils::Split() and replaced boost::split() 2023-08-15 02:41:40 +02:00
Tomasz Kapuściński dccacd6352 Rewritten UnicodeStringToUtf8() and increased buffer size 2023-08-14 22:26:00 +02:00
Tomasz Kapuściński b3c6e667f5 Rewritten UTF-8 implementation using standard library 2023-08-14 21:46:05 +02:00
Tomasz Kapuściński a48f13fb35 Fix for missing setlocale() 2023-08-14 00:11:15 +02:00
Tomasz Kapuściński 7db69f5d53 Changed include 2023-08-13 23:46:00 +02:00
Tomasz Kapuściński ae5e5b3874 Added missing includes 2023-08-13 23:31:12 +02:00
Tomasz Kapuściński b5b3f81840 Added ToLower() and ToUpper() 2023-08-13 23:22:22 +02:00
Tomasz Kapuściński fd81641cf7 Updated CI pipeline build for MacOS 2023-08-13 22:36:13 +02:00
Tomasz Kapuściński 840ded7e61 Renamed colobot to colobot-app 2023-08-13 21:20:37 +02:00
Tomasz Kapuściński 4c7e7280dd Added missing build preset 2023-08-13 20:44:51 +02:00
Tomasz Kapuściński af1abfe41e Updated CI pipeline build for Linux 2023-08-13 20:22:52 +02:00
Tomasz Kapuściński 8e950e5145 Updated CI pipeline build for Windows 2023-08-13 19:51:57 +02:00
Tomasz Kapuściński e807e7c984 Added missing include 2023-08-13 18:48:30 +02:00
Tomasz Kapuściński d9d401e636 Removed extra semicolon 2023-08-13 17:56:16 +02:00
Tomasz Kapuściński 9a14d0c837 Added missing include 2023-08-13 17:40:40 +02:00
Tomasz Kapuściński ee9f9d875d Replaced remaining MakeUnique 2023-08-13 17:39:12 +02:00
Tomasz Kapuściński b12e5ad7cd Replaced boost::replace_all with StrUtils::Replace 
Also fixed a bug in it and added tests for it.
Changes based on f0f6f61cab
 2023-08-09 21:43:15 +02:00
Tomasz Kapuściński ecb789d059 Replaced boost::trim functions with new Trim functions 
Changes based on f0f6f61cab
 2023-08-09 20:11:08 +02:00
Tomasz Kapuściński 32fb105bca Replaced boost::algorithm::join with standard algorithms 
Changes based on f0f6f61cab
 2023-08-09 19:52:44 +02:00
Tomasz Kapuściński 7d3e3c91e8 Replaced boost::tokenizer with std::istringstream 
Changes based on f0f6f61cab
 2023-08-09 19:40:54 +02:00
Tomasz Kapuściński 1b69589302 Replaced boost::lexical_cast with other implementations 
Changes based on f0f6f61cab
 2023-08-09 19:32:59 +02:00
Tomasz Kapuściński f7a33bbeb0 Replaced boost::optional and boost::regex with STL implementations 
Changes based on f0f6f61cab
 2023-08-09 17:58:48 +02:00
Tomasz Kapuściński 0ef77132a0 Replaced boost::filesystem with std::filesystem 
Changes based on f0f6f61cab
 2023-08-09 17:04:09 +02:00
Tomasz Kapuściński 550193e570 Added Version::DEVELOPMENT_BUILD to check for development build 2023-08-09 16:40:18 +02:00
Tomasz Kapuściński beb29333d5 Replaced boost::bimap with std::map 
Code extracted from f0f6f61cab
 2023-08-09 16:25:18 +02:00
Tomasz Kapuściński f9714c35f7 Replaced version macrodefinitions with constexpr variables 2023-08-09 15:59:12 +02:00
Tomasz Kapuściński 26598c4247 Rewritten project version specification 2023-08-09 15:27:23 +02:00
Tomasz Kapuściński 1ee0790785 Extracted Colobot executable target to a separate directory 2023-08-09 14:42:24 +02:00
Tomasz Kapuściński 6f05280ccb Extracted CBot library to a separate directory 2023-08-09 13:47:55 +02:00
Tomasz Kapuściński 63b6bcf38d Improved shadow quality 
* Default shadow texture is 2048
* Worse shadows use single region
* Always use object shadowing
 2023-08-09 12:41:01 +02:00
Tomasz Kapuściński 83b9ded0dc Merge branch 'dev' into dev-graphics-overhaul 2023-08-08 01:01:57 +02:00
Tomasz Kapuściński 84ac0d3ba8 Post-release 0.2.1-alpha 2023-08-08 00:43:51 +02:00
Tomasz Kapuściński acc3c5ae5e Release 0.2.1-alpha: Bump version 2023-08-07 22:47:21 +02:00
tomangelo ec0e735a3f
Merge pull request #1600 from colobot/dev-update-license-headers 
Updated license headers
 2023-08-06 23:51:44 +02:00
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
tomangelo2 f672e89201 Better fix for #1587 2023-06-22 23:32:02 +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 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
Tomasz Kapuściński 3805851255 Made recolor a separate material attribute and added more color types 2022-07-09 12:23:50 +02:00
Tomasz Kapuściński a88d9cdd39 Implemented shader-side recoloring in HSV and added more material tags 2022-06-18 22:18:25 +02:00
Tomasz Kapuściński 7d31b1e55d Added missing include 2022-05-08 18:31:48 +02:00
Tomasz Kapuściński 56e0c915b5 Cleanup in texture structures and enums, added wrap mode to TextureCreateParams and fixed wrap mode in foreground texture (lens flare effect) 2022-05-08 18:23:37 +02:00
Tomasz Kapuściński a25ce2d5df Rewritten particle rendering, now uses its own vertex type for optimization 2022-05-08 16:22:20 +02:00
Tomasz Kapuściński cac34e259b Cleanup to reduce includes of device.h header file 2022-05-02 20:59:44 +02:00
Tomasz Kapuściński 2a529ae07f More cleanup 2022-05-02 19:22:50 +02:00
Tomasz Kapuściński a1e4e4b97c Minor cleanup 2022-05-02 19:10:26 +02:00
Tomasz Kapuściński 3b4c2f3049 Cleanup in OpenGL implementation 
* Changed main directory to opengl33
* Put all remaining renderer classes into separate files
* Added missing license headers
 2022-05-02 11:08:33 +02:00
Tomasz Kapuściński f2cc131ff7 Merge branch 'dev' into dev-graphics-overhaul 
# Conflicts:
#	.github/workflows/build.yml
 2022-05-02 09:24:05 +02:00
Tomasz Kapuściński daa9419557 Merge branch 'dev' into dev-graphics-overhaul 
# Conflicts:
#	src/level/player_profile.cpp
#	src/object/task/taskgoto.cpp
#	src/object/task/taskgoto.h
#	src/ui/mainui.cpp
 2022-04-23 11:48:09 +02:00
Tomasz Kapuściński 0882b69ec8 Switch to gcc-9 for Ubuntu 18.04 builds for proper support of C++17 with filesystem 2022-04-23 11:34:15 +02:00
Tomasz Kapuściński 013d3cccf4 Changed team recolor to replace material albedo color instead of multiply by it for design convenience 2022-04-23 10:53:25 +02:00
Tomasz Kapuściński 8f710a24c8 Added proper conversion from sRGB to linear space and added a temporary fix for Blender bug with vertex colors in sRGB 2022-04-23 10:50:53 +02:00
Tomasz Kapuściński 7135a6660b Replaced error messages with Logger 2022-04-23 10:48:35 +02:00
Tomasz Kapuściński 7664594b8e Added constructor and conversion between linear space and sRGB 2022-04-23 10:46:38 +02:00
Tomasz Kapuściński 640cde1653 Various improvements and fixes 
* Added strength parameter for ambient occlusion
* Added proper support for material and emissive textures
* Added team-based recoloring, uses "team" tag
* Changed shadow ranges to make close-up shadows much better
* Fixed background coloring
* Added proper defaulting for glTF values
* Fixed parsing of emissive values
* Added normalization of normals in vertex shaders of object and terrain renderers
 2022-04-07 01:11:23 +02:00
Tomasz Kapuściński 4b1b1763df Removed extensions from model filenames to let the game load alternatives when available 2022-03-12 23:34:46 +01:00
Tomasz Kapuściński 829c5fb42f Added support for glTF 2.0 model format 2022-03-12 23:31:32 +01:00
Tomasz Kapuściński fd3c2af358 A proper fix? 2022-03-11 23:33:21 +01:00
Tomasz Kapuściński 5c2c52ad31 Fix for missing <filesystem>? 2022-03-11 23:16:50 +01:00
Tomasz Kapuściński aa3efd5841 Simplified model I/O, uses filename extensions to figure out format 2022-03-11 22:40:50 +01:00
Tomasz Kapuściński 920a4c3fc8 Split model I/O to separate files based on model format and removed new binary format 2022-03-11 21:06:40 +01:00
Tomasz Kapuściński d57370578f Disabled convert_model tool 2022-03-11 20:48:55 +01:00
Tomasz Kapuściński 4a16ee76a1 Partially refactored model and mesh structures 2022-03-11 19:49:03 +01:00
Tomasz Kapuściński 7af32caec2 Changed path type from std::string to std::filesystem::path in CInputStream, CInputStreamBuffer, COutputStream and COutputStreamBuffer 2022-03-11 17:46:24 +01:00
Tomasz Kapuściński 2d9db9c90a Refactored lighting in terrain renderer and rewritten drawing terrain to include all PBR properties 2022-03-09 20:47:44 +01:00
Tomasz Kapuściński d7a22bf74c Removed explicit from Color constructor 2022-03-09 17:08:51 +01:00
Tomasz Kapuściński 1a7346b845 A couple of fixes for rendering states 2022-03-09 16:59:23 +01:00
Tomasz Kapuściński 8c40b7c753 Force buffer orphaning to fix initial buffer binding 2022-03-09 16:56:03 +01:00
Tomasz Kapuściński dffb988798 Added checkout submodule for docs 2022-02-26 22:32:00 +01:00
Tomasz Kapuściński d09c5da493 Checkout json submodule 2022-02-26 21:47:22 +01:00
Tomasz Kapuściński c011e49112 Another fix 2022-02-26 21:42:09 +01:00
Tomasz Kapuściński 628567701a Added nlohmann json as submodule 2022-02-26 21:12:40 +01:00
Tomasz Kapuściński 38990e283b Another fix 2022-02-26 20:04:13 +01:00
Tomasz Kapuściński fa5e229015 Fixed forward declaration of enums 2022-02-26 19:44:49 +01:00
Tomasz Kapuściński 05163c09a1 Fix for dependencies 2022-02-26 19:04:04 +01:00
Tomasz Kapuściński 8533be8d5c Replaced MakeUnique and MakeUniqueArray with std::make_unique 2022-02-26 18:48:51 +01:00
Tomasz Kapuściński 89551c83cf Merge branch 'dev' into dev-graphics-overhaul 
# Conflicts:
#	src/graphics/engine/text.cpp
#	src/graphics/engine/text.h
#	src/script/scriptfunc.cpp
 2022-02-26 04:43:56 +01:00
Tomasz Kapuściński 3001927576 Removed engine.h from includes in header files, replaced by forward declarations and includes in source files 2022-02-26 03:53:39 +01:00
Tomasz Kapuściński baa616050a Some refactors to reduce extensive recompilation cascades 
Renamed AlphaMode::OPAQUE to AlphaMode::NONE due to clash with preprocessor define
Moved Gfx::EngineTriangle to a separate file
 2022-02-26 02:39:13 +01:00
Tomasz Kapuściński e839f0dec7 Extended Material structure with PBR material attributes and added some of them to object renderer 
Moved PBR lighting calculations to a separate shader source file
Removed some unused stuff
 2022-02-26 01:16:36 +01:00
Tomasz Kapuściński 3168bf4350 Small cleanup 2022-02-25 21:07:01 +01:00
Tomasz Kapuściński 6447304531 Added nlohmann-json library to dependencies 2022-02-25 20:41:45 +01:00
Tomasz Kapuściński c378009128 Feature-breaking refactors 
* Partially filled Material structure, currently only base attributes
* Removed recoloring of textures and team variants
* Removed one base object tier in engine structures
* Removed EngineRenderState
* Rewritten some code to better coding style
 2022-02-13 00:03:46 +01:00
Tomasz Kapuściński 0d612b9928 Optimized text rendering 2022-02-05 21:07:25 +01:00
Tomasz Kapuściński aacc2d0596 Moved non-CRenderer-specific functionality back to CDevice and refactored some of the state change methods 
Rewritten control rendering code to use improved way of sending geometry to GPU memory
 2022-02-05 19:07:46 +01:00
Tomasz Kapuściński 074706e7ec Removed Vertex and VertexCol structures 2022-02-04 01:22:27 +01:00
Tomasz Kapuściński 1631b9587f Removed all DrawPrimitive*() methods from CDevice 2022-02-04 01:06:37 +01:00
Tomasz Kapuściński 750a470b9a Minor color refactors, added DrawPrimitives, rewritten remaining effect rendering 2022-02-04 01:00:18 +01:00
Tomasz Kapuściński 37bdc8665f Removed remaining rendering code from CGL33Device and fixed some issues 2022-02-03 20:53:53 +01:00
Tomasz Kapuściński cbf661f69f Disabled tests for light manager as it needs future refactoring 2022-02-03 19:35:30 +01:00
Tomasz Kapuściński d16144eee4 Added missing include and removed debugging calls 2022-02-03 18:55:46 +01:00
Tomasz Kapuściński 1a190b7f6f Partial refactor of UI rendering to improve performance and fix transparency issues 
Disabled rendering via CDevice
 2022-02-03 18:40:58 +01:00
Tomasz Kapuściński 0908e10ff6 Removed material, lighting, fog and shadowing code from CDevice 2022-02-02 19:09:38 +01:00
Tomasz Kapuściński 7d9badb542 Added UV transform and rewritten animated texture mapping code to use it 2022-02-02 18:13:21 +01:00
Tomasz Kapuściński 3bd4fee844 Merge branch 'dev' into dev-graphics-overhaul 
# Conflicts:
#	src/graphics/engine/camera.cpp
#	src/object/auto/autonuclearplant.cpp
#	src/object/auto/autopowerplant.cpp
#	src/object/interface/powered_object.h
#	src/object/motion/motionvehicle.cpp
#	src/object/old_object.cpp
#	src/object/old_object.h
#	src/object/task/taskmanip.cpp
#	src/object/task/taskmanip.h
#	src/object/task/tasktake.cpp
 2022-02-02 18:11:06 +01:00
Tomasz Kapuściński 741d5c75ba Refactored shadow framebuffer creation and binding 2022-01-24 23:16:22 +01:00
Tomasz Kapuściński 2ff722eee6 Refactored or removed some of the unused CDevice features 2022-01-24 22:29:39 +01:00
Tomasz Kapuściński 39b6621463 Renamed transparency to ghost mode 2022-01-24 21:57:56 +01:00
Tomasz Kapuściński 9a07c1d858 Refactored background, cloud and planet rendering, fixed shadow settings 2022-01-24 21:50:45 +01:00
Tomasz Kapuściński e76c00c7f4 Fixed the Z coordinate not working in particle renderer 2022-01-22 01:50:10 +01:00
Tomasz Kapuściński cba70fc912 Added DrawPrimitive() to CObjectRenderer and used it for rendering water 2022-01-22 00:57:00 +01:00
Tomasz Kapuściński 048393f448 Added CParticleRenderer and reimplemented particle rendering code to use it 2022-01-20 21:38:58 +01:00
Tomasz Kapuściński 710f448477 Partially fixed rendering of models in front of the interface (e.g. profile screen) 2022-01-19 23:14:03 +01:00
Tomasz Kapuściński 367dab9c5a Cleanup in vertex structures 2022-01-19 22:22:59 +01:00
Tomasz Kapuściński c280924c0e Removed Gfx::VertexTex2 2022-01-19 21:33:53 +01:00
Tomasz Kapuściński 5dacb82b22 Partial refactor of model I/O 
* Mostly removed legacy Gfx::Material usage
* Bake legacy diffuse color to vertex color
* Removed code that writes to old model formats
 2022-01-19 19:46:39 +01:00
Tomasz Kapuściński a54a59146d Corrected transparency mode 2022-01-19 17:14:27 +01:00
Tomasz Kapuściński a1ea633a3e Refactored EngineTextureMapping into enum class 2022-01-18 20:14:07 +01:00
Tomasz Kapuściński 68a222e03a Refactored EngineShadowType to enum class 2022-01-18 19:42:19 +01:00
Tomasz Kapuściński 67bd982969 Refactored EngineTriangleType into enum class 2022-01-18 19:29:36 +01:00
Tomasz Kapuściński d9073de251 Removed unnecessary tests and include 2022-01-05 21:08:28 +01:00
Tomasz Kapuściński 754684bfe9 Refactored MatrixVectorMultiply(), added TransformDivide() for cases where perspective divide is needed 2022-01-05 19:22:57 +01:00
Tomasz Kapuściński 9c37f6cbd5 Fully refactored Math::Matrix, removed matrix.h and moved remaining functions to other files 2022-01-05 19:12:35 +01:00
Tomasz Kapuściński 208f142cd2 Made Math::Matrix an alias to glm::mat4, partial refactors 2022-01-05 00:35:41 +01:00
Tomasz Kapuściński e5d8e2b428 Fixed compilation error 2022-01-04 21:45:10 +01:00
Tomasz Kapuściński 0bba168f94 Removed vector.h, refactored redundant functions and moved remaining ones to func.h 2022-01-04 20:43:36 +01:00
Tomasz Kapuściński db3b1d74d1 Refactored unnecessary Normalize, DotProduct, CrossProduct and Clamp functions 2022-01-04 02:10:36 +01:00
Tomasz Kapuściński 50fe905455 Removed Math::Vector alias and refactored remaining uses of it 2022-01-04 01:39:55 +01:00
Tomasz Kapuściński d5e8cfd4ba Refactored Math::Vector to glm::vec3 in object task classes 2022-01-04 01:18:46 +01:00
Tomasz Kapuściński ffe1815ec9 Refactored Math::Vector to glm::vec3 in object motion classes 2022-01-04 01:05:24 +01:00
Tomasz Kapuściński 2690d04f64 Refactored Math::Vector to glm::vec3 in object interface and object subclass classes 2022-01-04 00:52:07 +01:00
Tomasz Kapuściński 3707daf678 Refactored Math::Vector in object implementations 2022-01-04 00:16:59 +01:00
Tomasz Kapuściński 076dce6981 Refactored Math::Vector in CScriptFunctions 2022-01-04 00:11:20 +01:00
Tomasz Kapuściński d6d74f200b Refactored Math::Vector in convert_model tool 2022-01-04 00:03:57 +01:00
Tomasz Kapuściński 1a7ffa693b Refactored Math::Vector in remaining UI classes 2022-01-04 00:01:54 +01:00
Tomasz Kapuściński dbe127569b Refactored Math::Vector in control classes 2022-01-03 23:55:50 +01:00
Tomasz Kapuściński da2471567d Refactored Math::Vector in sound implementation 2022-01-03 23:53:22 +01:00
Tomasz Kapuściński 55f5d25c95 Refactored Math::Vector to glm::vec3 in remaining auto classes 2022-01-03 23:48:38 +01:00
Tomasz Kapuściński 4634564f17 Refactored Math::Vector to glm::vec3 in various auto classes 2022-01-03 23:32:30 +01:00
Tomasz Kapuściński 300a2d8569 Refactored Math::Vector to glm::vec3 in CrashSphere, CObjectFactory, old_object.h, old_object_interface.h 2022-01-03 22:51:36 +01:00
Tomasz Kapuściński b4bfb8b242 Refactored Math::Vector in CLevelParserParam, CObjectCondition and CScoreboard 2021-12-29 02:19:22 +01:00
Tomasz Kapuściński 6277e10b3f Refactored Math::Vector in CParticle, CPlanet, CPyro, CTerrain, CText, CWater, ModelInput and few structures 2021-12-29 01:55:48 +01:00
Tomasz Kapuściński 47ad390f1d Refactored Math::Vector in CCamera, CLightManager, CLightning, CMainMovie, glutil.h and geometry.h 2021-12-29 00:08:02 +01:00
Tomasz Kapuściński d25d6124a9 Changed Math::Vector into alias to glm::vec3 2021-12-28 23:01:30 +01:00
Tomasz Kapuściński 70151279f6 Removed Math::Point and minor refactor 2021-12-24 20:44:54 +01:00
Tomasz Kapuściński 431416d75e Refactored Math::Point in CEngine 2021-12-24 20:25:38 +01:00
Tomasz Kapuściński 77c6f8e54f Refactored Math::Point in CRobotMain, CObjectFactory, CBaseBuilding, CAutoInfo, CScript, CDebugMenu, CDisplayText and CObjectInterface 2021-12-24 20:08:04 +01:00
Tomasz Kapuściński dc99e19ed9 Refactored Math::Point in CPhysics, CDisplayInfo, CFileDialog, CMainDialog, CMainMap, CMainShort and CStudio 2021-12-24 19:02:25 +01:00
Tomasz Kapuściński c659e060c1 Refactored Math::Point in task classes 2021-12-24 18:39:45 +01:00
Tomasz Kapuściński f8f3a64612 Refactored Math::Point in motion classes 2021-12-24 18:32:42 +01:00
Tomasz Kapuściński 7bf37a3999 Refactored Math::Point in screen classes 2021-12-24 03:53:36 +01:00
Tomasz Kapuściński 3fabdad1fe Refactored Math::Point in CSettings, CParticle, CPyro, CInterface, CMainUserInterface and CScreen 2021-12-24 03:45:59 +01:00
Tomasz Kapuściński a806bb2657 Refactored Math::Point in auto classes 2021-12-24 03:26:25 +01:00
Tomasz Kapuściński 91c19bff55 Refactored Math::Point in control classes 2021-12-24 03:18:10 +01:00
Tomasz Kapuściński 9691974b1a Refactored Math::Point in CLighting, CParticle, CParticleGenerator and CText 2021-12-24 02:36:54 +01:00
Tomasz Kapuściński 07d3d79e8d Refactored Math::Point in CPlanet, CTerrain, CWater and CLevelParserParam 2021-12-24 02:04:15 +01:00
Tomasz Kapuściński 498f15cc92 Refactored Math::Point in CApplication, CInput, CCamera, CCloud and Event 2021-12-24 01:38:54 +01:00
Tomasz Kapuściński b36ec266f0 Refactored Math::Point from vertex types 2021-12-24 00:57:04 +01:00
Tomasz Kapuściński c0d067d24b Changed Math::Point into alias to glm::vec2, minor refactors 2021-12-24 00:11:12 +01:00
Tomasz Kapuściński 12c0f41477 Removed unused null renderer files 
Null renderer will be rewritten entirely anyway, no need to keep these files in their current form.
 2021-12-23 23:40:34 +01:00
Tomasz Kapuściński f7c66741c6 Removed Math::IntPoint 2021-12-23 23:38:26 +01:00
Tomasz Kapuściński 60deb0328a Refactored Math::IntPoint in CInput and CImage 2021-12-23 23:36:30 +01:00
Tomasz Kapuściński 0ef4579da8 Refactored Math::IntPoint in CApplication and various classes 2021-12-23 23:26:08 +01:00
Tomasz Kapuściński 55c692e8bb Refactored Math::IntPoint in CEngine and CParticle 2021-12-23 23:08:56 +01:00
Tomasz Kapuściński 835f84584e Refactored Math::IntPoint in CTerrain 2021-12-23 22:47:44 +01:00
Tomasz Kapuściński bd2ad39f6a Refactored Math::IntPoint in CText 2021-12-23 22:47:15 +01:00
Tomasz Kapuściński 48d2b4a618 Refactored Math::IntPoint in core graphics classes 2021-12-23 22:35:28 +01:00
Tomasz Kapuściński cd6ea1a4c5 Changed Math::IntPoint into alias to glm::ivec2 2021-12-23 22:09:58 +01:00
Tomasz Kapuściński 98ad26da3d Changed glm::identity to explicit construction 2021-12-15 00:20:56 +01:00
Tomasz Kapuściński 36ac6d9956 Another fix 2021-12-15 00:09:47 +01:00
Tomasz Kapuściński 1eb17b2fa1 Added includes to fix compilation errors for older versions of glm 2021-12-14 23:56:24 +01:00
Tomasz Kapuściński 33744de372 Add target alias for older versions of glm 2021-12-14 23:42:14 +01:00
Tomasz Kapuściński d651b36eb2 Corrected includes 2021-12-14 23:09:20 +01:00
Tomasz Kapuściński 7e0db31cc1 Merge branch 'dev' into dev-graphics-overhaul 2021-12-14 22:27:43 +01:00
Tomasz Kapuściński c389156499 Added commands for controling triplanar mapping 2021-12-14 21:58:23 +01:00
Tomasz Kapuściński 0207669d61 Added optional triplanar mapping mode for the secondary texture 2021-12-14 21:54:19 +01:00
Tomasz Kapuściński b158318e83 Possibly a fix for most transparency issues 2021-12-14 21:51:29 +01:00
Tomasz Kapuściński 11bfcc6d53 Fix resetting bound textures 2021-12-14 21:50:26 +01:00
Tomasz Kapuściński 2583f6fe36 Removed UIRenderer's DrawPrimitive() via CDevice 2021-12-12 21:17:39 +01:00
Tomasz Kapuściński d1489a1fb1 Removed ShadeModel 2021-12-05 13:01:12 +01:00
Tomasz Kapuściński 0568fcdb81 Refactored FillMode to enum class 2021-12-05 12:53:31 +01:00
Tomasz Kapuściński 39c837d323 Refactored PrimitiveType to enum class 2021-12-05 12:26:34 +01:00
Tomasz Kapuściński 7a555e19c4 Fix in convert_model tool 2021-12-04 16:04:53 +01:00
Tomasz Kapuściński 26c0d85c66 Updated cache key 2021-12-04 16:02:17 +01:00
Tomasz Kapuściński 613efd7599 Added missing glm library to CI 2021-12-04 15:31:16 +01:00
Tomasz Kapuściński 9139239f9f Merge branch 'dev' into dev-graphics-overhaul 
# Conflicts:
#	src/app/app.cpp
#	src/graphics/opengl/gl14device.cpp
#	src/graphics/opengl/gl14device.h
#	src/graphics/opengl/gl21device.cpp
#	src/graphics/opengl/gl21device.h
 2021-12-01 17:27:54 +01:00
Tomasz Kapuściński 57502d2f54 Added object renderer (WIP) 
Rewritten shadow rendering logic
Split some shaders into smaller parts
Shadow renderer now has its own framebuffer object
 2021-12-01 17:05:20 +01:00
Tomasz Kapuściński ce71f25901 Removed unused shader files 2021-10-25 21:42:19 +02:00
Tomasz Kapuściński fea6b87139 Added fog to terrain renderer and renamed variables 2021-10-17 16:27:29 +02:00
Tomasz Kapuściński 4157604458 Added shadow renderer and removed rendering modes 2021-10-17 16:05:20 +02:00
Tomasz Kapuściński 79d4cd9060 Updated TerrainRenderer 
* Engine will now use it to render terrain
* Added directional light source
* Added dynamic shadows
* Moved visibility computation to CEngine
* Removed uniform buffers
 2021-09-19 20:08:31 +02:00
Tomasz Kapuściński 30d688c1ec Added and implemented terrain renderer 2021-09-05 16:32:19 +02:00
Tomasz Kapuściński 58c75ce61a Added implicit conversion between Math::Matrix and glm::mat4 2021-09-05 16:32:18 +02:00
Tomasz Kapuściński 100be95113 Added CVertexBuffer and reimplemented vertex buffer management 2021-09-05 16:32:18 +02:00
Tomasz Kapuściński 5c037837f5 Added Vertex3D 2021-09-05 16:32:17 +02:00
Tomasz Kapuściński 12e696bf1c Added color and moved uniform data to uniform buffer block 2021-09-05 16:32:17 +02:00
Tomasz Kapuściński 55513703b2 Removed unused static buffer types 2021-09-05 16:32:16 +02:00
Tomasz Kapuściński f2eafd563e Removed interface rendering mode 2021-09-05 16:32:16 +02:00
Tomasz Kapuściński 16200bbeac Removed all dependency on interface rendering mode 2021-09-05 16:32:16 +02:00
Tomasz Kapuściński 465fe59dfb Added Renderers 
Added UI Renderer
Added OpenGL 3.3 UI Renderer
Reimplemented most of UI drawing functionality to use UI Renderer
TODO: fix OpenGL errors
 2021-09-05 16:32:15 +02:00
Tomasz Kapuściński 704e3f2f0d Improved code for loading and linking shaders 2021-09-05 16:32:15 +02:00
Tomasz Kapuściński fe02cf3e4b Added Vertex2D 2021-09-05 16:32:14 +02:00
Tomasz Kapuściński 5e7fb5010f Temporarily removed CNullDevice 2021-09-05 16:32:14 +02:00
Tomasz Kapuściński b322ce064b Added dependency on glm 
# Conflicts:
#	src/CMakeLists.txt
 2021-09-05 16:31:57 +02:00
Tomasz Kapuściński ec21faf15c Removed gl14 and gl21 devices 2021-09-05 16:25:38 +02:00
763 changed files with 21246 additions and 25368 deletions
Show Stats Expand all files Collapse all files

81
.github/workflows/build.yml vendored
View File

@ -14,32 +14,30 @@ jobs:
fail-fast: false
steps:
- name: Install Colobot dependencies
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet libmpg123-dev
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet libglm-dev libmpg123-dev
if: matrix.container == ''
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Checkout the Google Test submodule
run: git submodule update --init -- lib/googletest
- name: Checkout the nlohmann json submodule
run: git submodule update --init -- lib/json
- name: Create build directory
run: cmake -E make_directory build
- name: Run CMake (for Linux)
working-directory: build
run: cmake -DCMAKE_INSTALL_PREFIX=/install -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=1 -DDESKTOP=1 ..
run: cmake --preset Linux-CI
if: matrix.target_os == 'linux'
- name: Build
working-directory: build
run: make -j `nproc`
run: cmake --build --preset Linux-CI
- name: Install
working-directory: build
run: DESTDIR=. make install
run: cmake --build --preset Linux-CI --target install
- name: Patch library path
working-directory: build
run: patchelf --set-rpath '.' install/colobot
if: matrix.target_os == 'linux'
- name: Upload build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{matrix.target_os}}-debug
path: build/install
path: install
if: matrix.host_os == 'ubuntu-20.04'
- name: Create AppImage
working-directory: build
@ -51,16 +49,16 @@ jobs:
# Create AppImage
NO_STRIP=1 ./squashfs-root/AppRun -e colobot --output appimage --appdir colobot.AppDir -d desktop/colobot.desktop -i ../desktop/colobot.svg
chmod +x Colobot-*-x86_64.AppImage
chmod +x Colobot-x86_64.AppImage
# Prepare folder for zip
mkdir -p appimage
cp -rp install/data appimage/data
cp -rp install/lang appimage/lang
cp -p Colobot-*-x86_64.AppImage appimage/colobot
cp -rp ../install/data appimage/data
cp -rp ../install/lang appimage/lang
cp -p Colobot-x86_64.AppImage appimage/colobot
if: matrix.target_os == 'linux'
- name: Upload AppImage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{matrix.target_os}}-debug-AppImage
path: build/appimage
@ -68,10 +66,10 @@ jobs:
- name: Run tests
# TODO: Maybe run Windows tests using wine as well?
working-directory: build
run: ./colobot_ut --gtest_output=xml:gtestresults.xml
run: ./Colobot-UnitTests --gtest_output=xml:gtestresults.xml
if: matrix.target_os == 'linux'
- name: Upload test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Test results (${{ matrix.target_os }}, ${{ matrix.host_os }})
path: build/gtestresults.xml
@ -87,27 +85,27 @@ jobs:
fail-fast: false
steps:
- name: Install Colobot dependencies
run: brew install cmake sdl2 sdl2_image sdl2_ttf boost glew physfs flac libsndfile libvorbis vorbis-tools gettext libicns librsvg wget xmlstarlet
run: brew install cmake sdl2 sdl2_image sdl2_ttf glew physfs flac libsndfile libvorbis vorbis-tools gettext libicns librsvg wget xmlstarlet glm
if: matrix.container == ''
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Checkout the Google Test submodule
run: git submodule update --init -- lib/googletest
- name: Checkout the nlohmann json submodule
run: git submodule update --init -- lib/json
- name: Create build directory
run: cmake -E make_directory build
- name: Run CMake (for Mac)
working-directory: build
run: cmake -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDEV_BUILD=1 -DPORTABLE=1 -DTESTS=1 -DDESKTOP=1 -DOPENAL_LIBRARY=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenAL.framework/OpenAL.tbd ..
run: cmake --preset MacOS-CI
if: matrix.target_os == 'macos'
- name: Build
working-directory: build
run: make -j `nproc`
run: cmake --build --preset MacOS-CI
- name: Run tests
# TODO: Maybe run Windows tests using wine as well?
working-directory: build
run: ./colobot_ut --gtest_output=xml:gtestresults.xml
run: ./Colobot-UnitTests --gtest_output=xml:gtestresults.xml
if: matrix.target_os == 'macos'
- name: Upload test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Test results (${{ matrix.target_os }}, ${{ matrix.host_os }})
path: build/gtestresults.xml
@ -122,9 +120,11 @@ jobs:
- arch: x86
vcpkg_triplet: 'x86-windows-static'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Checkout the Google Test submodule
run: git submodule update --init -- lib/googletest
- name: Checkout the nlohmann json submodule
run: git submodule update --init -- lib/json
- name: Install Ninja
uses: seanmiddleditch/gha-setup-ninja@master
- name: Setup VS Environment
@ -135,7 +135,7 @@ jobs:
uses: lukka/run-vcpkg@v7
with:
setupOnly: true
vcpkgGitCommitId: '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b'
vcpkgGitCommitId: 'f6a5d4e8eb7476b8d7fc12a56dff300c1c986131'
vcpkgTriplet: ${{ matrix.vcpkg_triplet }}
# SHA-256 hash of the vcpkg.json file, recalculated automatically when it changes
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}
@ -167,27 +167,24 @@ jobs:
- name: Create build directory
run: cmake -E make_directory build
- name: Run CMake (for Windows)
working-directory: build
run: cmake -G "Ninja" -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }} -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}\scripts\buildsystems\vcpkg.cmake -DUSE_STATIC_RUNTIME=1 -DCBOT_STATIC=1 -DBOOST_STATIC=1 -DGLEW_STATIC=1 -DSNDFILE_STATIC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\build\install -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=1 -DDESKTOP=1 ..
run: cmake --preset Windows-CI -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }} -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}\scripts\buildsystems\vcpkg.cmake
- name: Build
working-directory: build
run: |
$nproc = (Get-CIMInstance -Class 'CIM_Processor').NumberOfLogicalProcessors
cmake --build . -j $nproc
cmake --build --preset Windows-CI -j $nproc
shell: pwsh
- name: Install
working-directory: build
run: cmake --install .
run: cmake --build --preset Windows-CI --target install
- name: Upload build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: windows-msvc-debug-${{ matrix.arch }}
path: build/install
path: install
- name: Run tests
working-directory: build
run: ./colobot_ut --gtest_output=xml:gtestresults.xml
run: ./Colobot-UnitTests --gtest_output=xml:gtestresults.xml
- name: Upload test results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: 'Test results (windows, MSVC, ${{ matrix.arch }})'
path: build/gtestresults.xml
@ -195,10 +192,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Colobot dependencies
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet doxygen graphviz libmpg123-dev
- uses: actions/checkout@v2
run: sudo apt-get update && sudo apt-get install -y --no-install-recommends build-essential cmake libsdl2-dev libsdl2-image-dev libsdl2-ttf-dev libsndfile1-dev libvorbis-dev libogg-dev libpng-dev libglew-dev libopenal-dev libphysfs-dev gettext git po4a vorbis-tools librsvg2-bin xmlstarlet doxygen graphviz libglm-dev libmpg123-dev
- uses: actions/checkout@v3
- name: Create build directory
run: cmake -E make_directory build
- name: Checkout the nlohmann json submodule
run: git submodule update --init -- lib/json
- name: Run CMake
working-directory: build
run: cmake ..
@ -206,7 +205,7 @@ jobs:
working-directory: build
run: make doc
- name: Upload docs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: doc
path: build/doc

1
.gitignore vendored
View File

@ -17,7 +17,6 @@ CMakeDoxygenDefaults.cmake
/Doxyfile
# Ignore targets
/colobot
/src/CBot/libCBot.so
# Ignore local data

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
path = lib/googletest
url = https://github.com/google/googletest.git
ignore = all
[submodule "lib/json"]
path = lib/json
url = https://github.com/nlohmann/json

175
CBot/CMakeLists.txt Normal file
View File

@ -0,0 +1,175 @@
if(CBOT_STATIC)
add_library(CBot STATIC)
else()
add_library(CBot SHARED)
install(TARGETS CBot
LIBRARY DESTINATION ${COLOBOT_INSTALL_LIB_DIR}
ARCHIVE DESTINATION ${COLOBOT_INSTALL_LIB_DIR}
RUNTIME DESTINATION ${COLOBOT_INSTALL_BIN_DIR})
endif()
target_sources(CBot PRIVATE
src/CBot/CBot.h
src/CBot/CBotCStack.cpp
src/CBot/CBotCStack.h
src/CBot/CBotClass.cpp
src/CBot/CBotClass.h
src/CBot/CBotDebug.cpp
src/CBot/CBotDebug.h
src/CBot/CBotDefParam.cpp
src/CBot/CBotDefParam.h
src/CBot/CBotDefines.h
src/CBot/CBotEnums.h
src/CBot/CBotExternalCall.cpp
src/CBot/CBotExternalCall.h
src/CBot/CBotFileUtils.cpp
src/CBot/CBotFileUtils.h
src/CBot/CBotInstr/CBotBlock.cpp
src/CBot/CBotInstr/CBotBlock.h
src/CBot/CBotInstr/CBotBoolExpr.cpp
src/CBot/CBotInstr/CBotBoolExpr.h
src/CBot/CBotInstr/CBotBreak.cpp
src/CBot/CBotInstr/CBotBreak.h
src/CBot/CBotInstr/CBotCase.cpp
src/CBot/CBotInstr/CBotCase.h
src/CBot/CBotInstr/CBotCatch.cpp
src/CBot/CBotInstr/CBotCatch.h
src/CBot/CBotInstr/CBotCondition.cpp
src/CBot/CBotInstr/CBotCondition.h
src/CBot/CBotInstr/CBotDefArray.cpp
src/CBot/CBotInstr/CBotDefArray.h
src/CBot/CBotInstr/CBotDefBoolean.cpp
src/CBot/CBotInstr/CBotDefBoolean.h
src/CBot/CBotInstr/CBotDefClass.cpp
src/CBot/CBotInstr/CBotDefClass.h
src/CBot/CBotInstr/CBotDefFloat.cpp
src/CBot/CBotInstr/CBotDefFloat.h
src/CBot/CBotInstr/CBotDefInt.cpp
src/CBot/CBotInstr/CBotDefInt.h
src/CBot/CBotInstr/CBotDefString.cpp
src/CBot/CBotInstr/CBotDefString.h
src/CBot/CBotInstr/CBotDo.cpp
src/CBot/CBotInstr/CBotDo.h
src/CBot/CBotInstr/CBotEmpty.cpp
src/CBot/CBotInstr/CBotEmpty.h
src/CBot/CBotInstr/CBotExprLitBool.cpp
src/CBot/CBotInstr/CBotExprLitBool.h
src/CBot/CBotInstr/CBotExprLitChar.cpp
src/CBot/CBotInstr/CBotExprLitChar.h
src/CBot/CBotInstr/CBotExprLitNan.cpp
src/CBot/CBotInstr/CBotExprLitNan.h
src/CBot/CBotInstr/CBotExprLitNull.cpp
src/CBot/CBotInstr/CBotExprLitNull.h
src/CBot/CBotInstr/CBotExprLitNum.cpp
src/CBot/CBotInstr/CBotExprLitNum.h
src/CBot/CBotInstr/CBotExprLitString.cpp
src/CBot/CBotInstr/CBotExprLitString.h
src/CBot/CBotInstr/CBotExprRetVar.cpp
src/CBot/CBotInstr/CBotExprRetVar.h
src/CBot/CBotInstr/CBotExprUnaire.cpp
src/CBot/CBotInstr/CBotExprUnaire.h
src/CBot/CBotInstr/CBotExprVar.cpp
src/CBot/CBotInstr/CBotExprVar.h
src/CBot/CBotInstr/CBotExpression.cpp
src/CBot/CBotInstr/CBotExpression.h
src/CBot/CBotInstr/CBotFieldExpr.cpp
src/CBot/CBotInstr/CBotFieldExpr.h
src/CBot/CBotInstr/CBotFor.cpp
src/CBot/CBotInstr/CBotFor.h
src/CBot/CBotInstr/CBotFunction.cpp
src/CBot/CBotInstr/CBotFunction.h
src/CBot/CBotInstr/CBotIf.cpp
src/CBot/CBotInstr/CBotIf.h
src/CBot/CBotInstr/CBotIndexExpr.cpp
src/CBot/CBotInstr/CBotIndexExpr.h
src/CBot/CBotInstr/CBotInstr.cpp
src/CBot/CBotInstr/CBotInstr.h
src/CBot/CBotInstr/CBotInstrCall.cpp
src/CBot/CBotInstr/CBotInstrCall.h
src/CBot/CBotInstr/CBotInstrMethode.cpp
src/CBot/CBotInstr/CBotInstrMethode.h
src/CBot/CBotInstr/CBotInstrUtils.cpp
src/CBot/CBotInstr/CBotInstrUtils.h
src/CBot/CBotInstr/CBotLeftExpr.cpp
src/CBot/CBotInstr/CBotLeftExpr.h
src/CBot/CBotInstr/CBotLeftExprVar.cpp
src/CBot/CBotInstr/CBotLeftExprVar.h
src/CBot/CBotInstr/CBotListArray.cpp
src/CBot/CBotInstr/CBotListArray.h
src/CBot/CBotInstr/CBotListExpression.cpp
src/CBot/CBotInstr/CBotListExpression.h
src/CBot/CBotInstr/CBotListInstr.cpp
src/CBot/CBotInstr/CBotListInstr.h
src/CBot/CBotInstr/CBotLogicExpr.cpp
src/CBot/CBotInstr/CBotLogicExpr.h
src/CBot/CBotInstr/CBotNew.cpp
src/CBot/CBotInstr/CBotNew.h
src/CBot/CBotInstr/CBotParExpr.cpp
src/CBot/CBotInstr/CBotParExpr.h
src/CBot/CBotInstr/CBotPostIncExpr.cpp
src/CBot/CBotInstr/CBotPostIncExpr.h
src/CBot/CBotInstr/CBotPreIncExpr.cpp
src/CBot/CBotInstr/CBotPreIncExpr.h
src/CBot/CBotInstr/CBotRepeat.cpp
src/CBot/CBotInstr/CBotRepeat.h
src/CBot/CBotInstr/CBotReturn.cpp
src/CBot/CBotInstr/CBotReturn.h
src/CBot/CBotInstr/CBotSwitch.cpp
src/CBot/CBotInstr/CBotSwitch.h
src/CBot/CBotInstr/CBotThrow.cpp
src/CBot/CBotInstr/CBotThrow.h
src/CBot/CBotInstr/CBotTry.cpp
src/CBot/CBotInstr/CBotTry.h
src/CBot/CBotInstr/CBotTwoOpExpr.cpp
src/CBot/CBotInstr/CBotTwoOpExpr.h
src/CBot/CBotInstr/CBotWhile.cpp
src/CBot/CBotInstr/CBotWhile.h
src/CBot/CBotProgram.cpp
src/CBot/CBotProgram.h
src/CBot/CBotStack.cpp
src/CBot/CBotStack.h
src/CBot/CBotToken.cpp
src/CBot/CBotToken.h
src/CBot/CBotTypResult.cpp
src/CBot/CBotTypResult.h
src/CBot/CBotUtils.cpp
src/CBot/CBotUtils.h
src/CBot/CBotVar/CBotVar.cpp
src/CBot/CBotVar/CBotVar.h
src/CBot/CBotVar/CBotVarValue.h
src/CBot/CBotVar/CBotVarArray.cpp
src/CBot/CBotVar/CBotVarArray.h
src/CBot/CBotVar/CBotVarBoolean.cpp
src/CBot/CBotVar/CBotVarBoolean.h
src/CBot/CBotVar/CBotVarByte.h
src/CBot/CBotVar/CBotVarChar.h
src/CBot/CBotVar/CBotVarClass.cpp
src/CBot/CBotVar/CBotVarClass.h
src/CBot/CBotVar/CBotVarDouble.h
src/CBot/CBotVar/CBotVarFloat.cpp
src/CBot/CBotVar/CBotVarFloat.h
src/CBot/CBotVar/CBotVarInt.cpp
src/CBot/CBotVar/CBotVarInt.h
src/CBot/CBotVar/CBotVarLong.h
src/CBot/CBotVar/CBotVarPointer.cpp
src/CBot/CBotVar/CBotVarPointer.h
src/CBot/CBotVar/CBotVarShort.h
src/CBot/CBotVar/CBotVarString.cpp
src/CBot/CBotVar/CBotVarString.h
src/CBot/stdlib/Compilation.cpp
src/CBot/stdlib/Compilation.h
src/CBot/stdlib/FileFunctions.cpp
src/CBot/stdlib/MathFunctions.cpp
src/CBot/stdlib/StringFunctions.cpp
src/CBot/stdlib/stdlib.h
src/CBot/stdlib/stdlib_public.h
)
target_include_directories(CBot PUBLIC src)
target_link_libraries(CBot PRIVATE
Colobot-Common
)
if(COLOBOT_LINT_BUILD)
add_fake_header_sources("src/CBot" CBot)
endif()

5
src/CBot/README.txt → CBot/README.txt
View File

@ -1,9 +1,10 @@
/**
* \dir src/CBot
* \dir CBot
* \brief CBot library
*/
/**
* \namespace CBot
* \brief CBot engine
*/
*/

2
src/CBot/CBot.h → CBot/src/CBot/CBot.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotCStack.cpp → CBot/src/CBot/CBotCStack.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotCStack.h → CBot/src/CBot/CBotCStack.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotClass.cpp → CBot/src/CBot/CBotClass.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotClass.h → CBot/src/CBot/CBotClass.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

32
src/CBot/CBotDebug.cpp → CBot/src/CBot/CBotDebug.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify
@ -23,11 +23,11 @@
#include "CBot/CBotInstr/CBotFunction.h"
#include "CBot/CBotInstr/CBotInstrCall.h"
#include <array>
#include <functional>
#include <sstream>
#include <iostream>
#include <iomanip>
#include <boost/algorithm/string/replace.hpp>
namespace CBot
{
@ -53,22 +53,34 @@ void CBotDebug::DumpCompiledProgram(CBotProgram* program)
instructions[ptr] = instructionsNextId++;
}
char buffer[20];
sprintf(buffer, "instr%d", instructions[ptr]);
return std::string(buffer);
std::array<char, 20> buffer;
snprintf(buffer.data(), buffer.size(), "instr%d", instructions[ptr]);
return std::string(buffer.data());
};
std::function<void(CBotInstr*)> DumpInstr = [&](CBotInstr* instr)
{
if (finished.find(instr) != finished.end()) return;
finished.insert(instr);
std::string label = "<b>"+instr->GetDebugName()+"</b>\n";
auto replaceAll = [](std::string& text, const std::string& from, const std::string& to)
{
std::size_t pos = 0;
while ((pos = text.find(from, pos)) != std::string::npos)
{
text.replace(pos, from.length(), to);
pos += to.length();
}
};
std::string data = instr->GetDebugData();
boost::algorithm::replace_all(data, "&", "&amp;");
boost::algorithm::replace_all(data, "<", "&lt;");
boost::algorithm::replace_all(data, ">", "&gt;");
replaceAll(data, "&", "&amp;");
replaceAll(data, "<", "&lt;");
replaceAll(data, ">", "&gt;");
std::string label = "<b>"+instr->GetDebugName()+"</b>\n";
label += data;
boost::algorithm::replace_all(label, "\n", "<br/>");
replaceAll(label, "\n", "<br/>");
std::string additional = "";
if (instr->GetDebugName() == "CBotFunction")

2
src/CBot/CBotDebug.h → CBot/src/CBot/CBotDebug.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotDefParam.cpp → CBot/src/CBot/CBotDefParam.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotDefParam.h → CBot/src/CBot/CBotDefParam.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotDefines.h → CBot/src/CBot/CBotDefines.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotEnums.h → CBot/src/CBot/CBotEnums.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotExternalCall.cpp → CBot/src/CBot/CBotExternalCall.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotExternalCall.h → CBot/src/CBot/CBotExternalCall.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotFileUtils.cpp → CBot/src/CBot/CBotFileUtils.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotFileUtils.h → CBot/src/CBot/CBotFileUtils.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotBlock.cpp → CBot/src/CBot/CBotInstr/CBotBlock.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotBlock.h → CBot/src/CBot/CBotInstr/CBotBlock.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotBoolExpr.cpp → CBot/src/CBot/CBotInstr/CBotBoolExpr.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotBoolExpr.h → CBot/src/CBot/CBotInstr/CBotBoolExpr.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotBreak.cpp → CBot/src/CBot/CBotInstr/CBotBreak.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotBreak.h → CBot/src/CBot/CBotInstr/CBotBreak.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotCase.cpp → CBot/src/CBot/CBotInstr/CBotCase.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotCase.h → CBot/src/CBot/CBotInstr/CBotCase.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotCatch.cpp → CBot/src/CBot/CBotInstr/CBotCatch.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotCatch.h → CBot/src/CBot/CBotInstr/CBotCatch.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotCondition.cpp → CBot/src/CBot/CBotInstr/CBotCondition.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotCondition.h → CBot/src/CBot/CBotInstr/CBotCondition.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefArray.cpp → CBot/src/CBot/CBotInstr/CBotDefArray.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefArray.h → CBot/src/CBot/CBotInstr/CBotDefArray.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefBoolean.cpp → CBot/src/CBot/CBotInstr/CBotDefBoolean.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefBoolean.h → CBot/src/CBot/CBotInstr/CBotDefBoolean.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefClass.cpp → CBot/src/CBot/CBotInstr/CBotDefClass.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefClass.h → CBot/src/CBot/CBotInstr/CBotDefClass.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefFloat.cpp → CBot/src/CBot/CBotInstr/CBotDefFloat.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefFloat.h → CBot/src/CBot/CBotInstr/CBotDefFloat.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefInt.cpp → CBot/src/CBot/CBotInstr/CBotDefInt.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefInt.h → CBot/src/CBot/CBotInstr/CBotDefInt.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefString.cpp → CBot/src/CBot/CBotInstr/CBotDefString.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDefString.h → CBot/src/CBot/CBotInstr/CBotDefString.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDo.cpp → CBot/src/CBot/CBotInstr/CBotDo.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotDo.h → CBot/src/CBot/CBotInstr/CBotDo.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotEmpty.cpp → CBot/src/CBot/CBotInstr/CBotEmpty.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotEmpty.h → CBot/src/CBot/CBotInstr/CBotEmpty.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitBool.cpp → CBot/src/CBot/CBotInstr/CBotExprLitBool.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitBool.h → CBot/src/CBot/CBotInstr/CBotExprLitBool.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitChar.cpp → CBot/src/CBot/CBotInstr/CBotExprLitChar.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitChar.h → CBot/src/CBot/CBotInstr/CBotExprLitChar.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitNan.cpp → CBot/src/CBot/CBotInstr/CBotExprLitNan.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitNan.h → CBot/src/CBot/CBotInstr/CBotExprLitNan.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitNull.cpp → CBot/src/CBot/CBotInstr/CBotExprLitNull.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitNull.h → CBot/src/CBot/CBotInstr/CBotExprLitNull.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitNum.cpp → CBot/src/CBot/CBotInstr/CBotExprLitNum.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitNum.h → CBot/src/CBot/CBotInstr/CBotExprLitNum.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitString.cpp → CBot/src/CBot/CBotInstr/CBotExprLitString.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprLitString.h → CBot/src/CBot/CBotInstr/CBotExprLitString.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprRetVar.cpp → CBot/src/CBot/CBotInstr/CBotExprRetVar.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprRetVar.h → CBot/src/CBot/CBotInstr/CBotExprRetVar.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprUnaire.cpp → CBot/src/CBot/CBotInstr/CBotExprUnaire.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprUnaire.h → CBot/src/CBot/CBotInstr/CBotExprUnaire.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprVar.cpp → CBot/src/CBot/CBotInstr/CBotExprVar.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExprVar.h → CBot/src/CBot/CBotInstr/CBotExprVar.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExpression.cpp → CBot/src/CBot/CBotInstr/CBotExpression.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotExpression.h → CBot/src/CBot/CBotInstr/CBotExpression.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotFieldExpr.cpp → CBot/src/CBot/CBotInstr/CBotFieldExpr.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotFieldExpr.h → CBot/src/CBot/CBotInstr/CBotFieldExpr.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotFor.cpp → CBot/src/CBot/CBotInstr/CBotFor.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotFor.h → CBot/src/CBot/CBotInstr/CBotFor.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotFunction.cpp → CBot/src/CBot/CBotInstr/CBotFunction.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotFunction.h → CBot/src/CBot/CBotInstr/CBotFunction.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotIf.cpp → CBot/src/CBot/CBotInstr/CBotIf.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotIf.h → CBot/src/CBot/CBotInstr/CBotIf.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotIndexExpr.cpp → CBot/src/CBot/CBotInstr/CBotIndexExpr.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotIndexExpr.h → CBot/src/CBot/CBotInstr/CBotIndexExpr.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotInstr.cpp → CBot/src/CBot/CBotInstr/CBotInstr.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

4
src/CBot/CBotInstr/CBotInstr.h → CBot/src/CBot/CBotInstr/CBotInstr.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify
@ -38,7 +38,7 @@ class CBotDebug;
* \endcode
* the following structure is generated:
* \dot
* # Generated using the CBot_compile_graph tool
* # Generated using the CBot-CompileGraph tool
* # and slightly modified
* digraph {
* start [label=<START> shape=box3d color=cyan]

2
src/CBot/CBotInstr/CBotInstrCall.cpp → CBot/src/CBot/CBotInstr/CBotInstrCall.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotInstrCall.h → CBot/src/CBot/CBotInstr/CBotInstrCall.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotInstrMethode.cpp → CBot/src/CBot/CBotInstr/CBotInstrMethode.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotInstrMethode.h → CBot/src/CBot/CBotInstr/CBotInstrMethode.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotInstrUtils.cpp → CBot/src/CBot/CBotInstr/CBotInstrUtils.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotInstrUtils.h → CBot/src/CBot/CBotInstr/CBotInstrUtils.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotLeftExpr.cpp → CBot/src/CBot/CBotInstr/CBotLeftExpr.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotLeftExpr.h → CBot/src/CBot/CBotInstr/CBotLeftExpr.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotLeftExprVar.cpp → CBot/src/CBot/CBotInstr/CBotLeftExprVar.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotLeftExprVar.h → CBot/src/CBot/CBotInstr/CBotLeftExprVar.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotListArray.cpp → CBot/src/CBot/CBotInstr/CBotListArray.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotListArray.h → CBot/src/CBot/CBotInstr/CBotListArray.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotListExpression.cpp → CBot/src/CBot/CBotInstr/CBotListExpression.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotListExpression.h → CBot/src/CBot/CBotInstr/CBotListExpression.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotListInstr.cpp → CBot/src/CBot/CBotInstr/CBotListInstr.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotListInstr.h → CBot/src/CBot/CBotInstr/CBotListInstr.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotLogicExpr.cpp → CBot/src/CBot/CBotInstr/CBotLogicExpr.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotLogicExpr.h → CBot/src/CBot/CBotInstr/CBotLogicExpr.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotNew.cpp → CBot/src/CBot/CBotInstr/CBotNew.cpp
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

2
src/CBot/CBotInstr/CBotNew.h → CBot/src/CBot/CBotInstr/CBotNew.h
View File

@ -1,6 +1,6 @@
/*
* This file is part of the Colobot: Gold Edition source code
* Copyright (C) 2001-2021, Daniel Roux, EPSITEC SA & TerranovaTeam
* Copyright (C) 2001-2023, Daniel Roux, EPSITEC SA & TerranovaTeam
* http://epsitec.ch; http://colobot.info; http://github.com/colobot
*
* This program is free software: you can redistribute it and/or modify

Some files were not shown because too many files have changed in this diff Show More