613efd7599
Added missing glm library to CI
2021-12-04 15:31:16 +01:00
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
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
ce71f25901
Removed unused shader files
2021-10-25 21:42:19 +02:00
fea6b87139
Added fog to terrain renderer and renamed variables
2021-10-17 16:27:29 +02:00
4157604458
Added shadow renderer and removed rendering modes
2021-10-17 16:05:20 +02:00
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
1438438937
Merge pull request #1462 from colobot/dev-update-license
...
Update license headers
2021-09-11 16:10:44 +02:00
80f074e2ba
Update license headers
2021-09-11 15:53:59 +02:00
171bba1bcd
Rewrite the update license script
...
The old script duplicated license headers for me, instead of
updating them.
2021-09-11 15:53:50 +02:00
95579bbf1d
Merge pull request #1461 from colobot/AbigailBuccaneer-platform-independent
...
Merge PR#1141 "Use C++11 threading and timing constructs"
2021-09-11 14:23:09 +02:00
c9dca4cebd
Rename SystemDialogType::ERROR to ERROR_MSG
...
Unfortunately, the ERROR name collides with
a preprocessor definition in windows.h
2021-09-11 13:40:22 +02:00
6aa83c93ac
Update data submodule
2021-09-11 13:29:03 +02:00
a69b88e09a
Move time related functions out of CSystemUtils
...
GetCurrentTimeStamp() has not been moved because of
CApplication unit tests.
2021-09-11 13:26:38 +02:00
5daaba6e64
Fixes after merge
...
Fix mistakes after previous merge and make it compile.
Rewrite the function interpolating between time stamps as it was
written after the original pull request was created. Add unit tests
for it.
I couldn't help myself and also changed some enums to enum classes and
did some renames.
2021-09-11 12:44:26 +02:00
2b107736e2
Merge branch 'platform-independent' of https://github.com/AbigailBuccaneer/colobot into AbigailBuccaneer-platform-independent
2021-09-11 10:47:39 +02:00
30d688c1ec
Added and implemented terrain renderer
2021-09-05 16:32:19 +02:00
58c75ce61a
Added implicit conversion between Math::Matrix and glm::mat4
2021-09-05 16:32:18 +02:00
100be95113
Added CVertexBuffer and reimplemented vertex buffer management
2021-09-05 16:32:18 +02:00
5c037837f5
Added Vertex3D
2021-09-05 16:32:17 +02:00
12e696bf1c
Added color and moved uniform data to uniform buffer block
2021-09-05 16:32:17 +02:00
55513703b2
Removed unused static buffer types
2021-09-05 16:32:16 +02:00
f2eafd563e
Removed interface rendering mode
2021-09-05 16:32:16 +02:00
16200bbeac
Removed all dependency on interface rendering mode
2021-09-05 16:32:16 +02:00
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
704e3f2f0d
Improved code for loading and linking shaders
2021-09-05 16:32:15 +02:00
fe02cf3e4b
Added Vertex2D
2021-09-05 16:32:14 +02:00
5e7fb5010f
Temporarily removed CNullDevice
2021-09-05 16:32:14 +02:00
b322ce064b
Added dependency on glm
...
# Conflicts:
# src/CMakeLists.txt
2021-09-05 16:31:57 +02:00
ec21faf15c
Removed gl14 and gl21 devices
2021-09-05 16:25:38 +02:00
e0c5ca962f
Merge pull request #1327 from MrJohn10/vscode-instructions
...
Add instructions for compilation and installation using vscode
2021-09-05 15:17:04 +02:00
37f82acff0
Merge pull request #1457 from vieux/master
...
system_macosx.cpp: fix typo
2021-09-05 14:40:32 +02:00
c04d3ef50d
Merge pull request #1341 from colobot/dev-modern
...
Merge dev-modern into dev
2021-09-05 14:32:13 +02:00
62b14bcf62
Bump C++ version from 11 to 17
2021-09-04 22:27:06 +02:00
005f5b5103
Replace ::add-path:: function with appending to $GITHUB_PATH
...
See https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
2021-09-04 21:59:49 +02:00
bb6c32c897
Update run-vcpkg action from v3 to v7
2021-09-04 21:52:58 +02:00
8299fe41bc
Remove JenkinsFile as it's no longer used
2021-09-04 21:52:58 +02:00
d39f1999e7
Remove support for MXE
2021-09-04 21:52:58 +02:00
d06b7e1456
Update vcpkg version used in CI
2021-09-04 21:52:58 +02:00
41cf9974f9
Bump CMake version from 3.17 to 3.16
...
See https://github.com/colobot/colobot/issues/1306#issuecomment-657096265
2021-09-04 21:51:55 +02:00
bbf5c806d8
Fix MSVC compilation due to macros in Windows API headers
...
There exists `CreateDirectory` `#define` somewhere and it results in
failed compilation of `resourcemanager.cpp`.
Similarly for `RemoveDirectory`. See
https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createdirectorya
Rename the two methods to remove the conflict.
The fail occurs at least when using Visual Studio 2022 Preview.
2021-09-04 20:34:02 +02:00
8f0b367f9c
Find Opus because SndFile now depends on it
2021-09-04 20:33:15 +02:00
65e12621ff
Link brotli since freetype can now depend on it
...
The fixes are from PR #1371
2021-09-04 20:31:22 +02:00
84d23e91ed
Fix CMAKE_MSVC_RUNTIME_LIBRARY name for dynamic runtime
2021-09-04 20:29:52 +02:00
5e37f84bc7
Merge branch 'dev' into dev-modern
2021-09-04 19:11:24 +02:00
11047ecd53
system_macosx.cpp: fix typo
2021-08-24 15:48:31 -07:00
c039e7e859
Post-release 0.2.0-alpha
2021-08-21 22:57:34 +02:00
faa4eaae20
Release 0.2.0-alpha: Bump version
2021-08-21 22:57:34 +02:00
d9c966a95b
Release 0.2.0-alpha: Merge branch 'dev'
2021-08-21 22:57:33 +02:00
92f574d2ca
Remove Ubuntu 16.04 from CI jobs
2021-08-21 22:48:51 +02:00
Tomasz Kapuściński