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
829c5fb42f
Added support for glTF 2.0 model format
2022-03-12 23:31:32 +01:00
aa3efd5841
Simplified model I/O, uses filename extensions to figure out format
2022-03-11 22:40:50 +01:00
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
d57370578f
Disabled convert_model tool
2022-03-11 20:48:55 +01:00
86d8ee4c38
Merge pull request #1496 from rasmusgo/fix-spelling
...
Fix spelling
2022-03-04 16:28:32 +01:00
8533be8d5c
Replaced MakeUnique and MakeUniqueArray with std::make_unique
2022-02-26 18:48:51 +01:00
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
6447304531
Added nlohmann-json library to dependencies
2022-02-25 20:41:45 +01:00
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
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
0003494c9e
Merge PR #1444
2022-01-29 17:16:57 +01:00
19ae57c9ad
Fix spelling of appearance
2022-01-24 19:56:47 +01:00
048393f448
Added CParticleRenderer and reimplemented particle rendering code to use it
2022-01-20 21:38:58 +01:00
9c37f6cbd5
Fully refactored Math::Matrix, removed matrix.h and moved remaining functions to other files
2022-01-05 19:12:35 +01:00
0bba168f94
Removed vector.h, refactored redundant functions and moved remaining ones to func.h
2022-01-04 20:43:36 +01:00
70151279f6
Removed Math::Point and minor refactor
2021-12-24 20:44:54 +01:00
f7c66741c6
Removed Math::IntPoint
2021-12-23 23:38:26 +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
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
2b107736e2
Merge branch 'platform-independent' of https://github.com/AbigailBuccaneer/colobot into AbigailBuccaneer-platform-independent
2021-09-11 10:47:39 +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
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
d39f1999e7
Remove support for MXE
2021-09-04 21:52:58 +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
5e37f84bc7
Merge branch 'dev' into dev-modern
2021-09-04 19:11:24 +02:00
c336a67afa
Fix MSVC building issues by correcting CMakeLists.txt
2021-01-03 15:46:01 +01:00
1c9f5f3f64
Merge branch 'dev' into dev-mod-manager
2020-08-21 18:21:08 +02:00
fbe2191800
Allow producing objects with no keyword in CBOT ( #1335 )
2020-07-24 02:20:06 +02:00
16795e0d49
Use level parser instead of JSON for manifest
2020-07-22 21:40:13 +02:00
f57da76ae8
Add handling of mods manifests
...
Also add Polish translations for mod manager related strings.
2020-07-22 16:35:47 +02:00
242477e3ee
Major UI change to mod manager
...
Move the button to the sidebar.
Add reordering option.
General improvements and refactoring.
2020-07-21 20:27:24 +02:00
8390d85e46
Refactor the mod manager
...
Moved list of mods logic to a new CModManager class.
The list of enabled mods is now managed by a flag instead of directory
names of mods.
Mods are now disabled by default.
Also general cleanup, fixing issues from the code review in
https://github.com/colobot/colobot/pull/1191 and fixing linter issues.
Regression: the state of enabled/disabled mods is now not persistent.
The plan is to use some kind of config file for this.
2020-07-18 14:30:50 +02:00
4905abe30b
Merge branch 'dev-mod-manager' of https://github.com/DavivaD/colobot into dev-mod-manager
2020-07-17 11:49:51 +02:00
73429315a7
Add USE_STATIC_RUNTIME option
...
Mainly useful for MSVC.
2020-07-14 20:43:42 +02:00
df7cdd4b8e
Fix some minor issues after CR
2020-07-14 13:51:07 +02:00
2143f21828
Fix linter
2020-07-14 13:43:33 +02:00
17e38bf66c
Install PDB file if available
2020-07-13 23:39:11 +02:00
c4037a885f
Make CI Windows build with MSVC instead of MXE
2020-07-12 23:17:42 +02:00
df65862c49
Start using CMake targets instead of variables
...
Moved most of the variables to targets in the main src.
Made libraries in repo export targets.
Refactor STATIC flags a little and add more.
This commit definitely breaks a lot of things like tests
but the main game builds at least with MSVC.
2020-07-10 18:49:54 +02:00
4ae0360640
Remove source grouping temporarily
...
It's probably not how it should be done with modern CMake, so I'm
removing this for now to focus on other changes first.
2020-07-10 13:03:23 +02:00
4bd6e01b65
Fix filename style of the particles generator
2020-07-07 21:30:21 +02:00
35b22f7a7f
Refactor - Move UI mouse particles generation to a new class. ( #1308 )
...
* Move UI mouse particles generation to a new class.
* refactoring
* refactor - change variable name
* change backslashes to forward slashes in include directives
* remove & from variable
* Refactoring - fix linter issues
* Refactoring - fix linter issues
* refactoring - fix linter issues
2020-07-07 20:48:52 +02:00
5cc565439c
Move open/save dialog from CStudio to CFileDialog
2020-07-05 14:33:59 +02:00
3fbfadb0d4
Merge branch 'dev' into dev-basedir
2020-04-03 21:12:48 +02:00
8f122d6603
Fix MSVC compilation (again)
2020-04-03 20:18:14 +02:00
587e189e97
Merge pull request #1250 from colobot/dev-compilation-fix
...
Fixes compilation problem
2019-12-28 20:52:36 +01:00
Tomasz Kapuściński