a88d9cdd39
Implemented shader-side recoloring in HSV and added more material tags
2022-06-18 22:18:25 +02:00
f2cc131ff7
Merge branch 'dev' into dev-graphics-overhaul
...
# Conflicts:
# .github/workflows/build.yml
2022-05-02 09:24:05 +02:00
b6f2a9e544
Fix for invisible batteries (code by melex750) ( #1520 )
...
* Fix for invisible batteries (code by melex750)
* Updated vcpkg
* A workaround for sprintf define
* Added mpg123 to dependencies due to newer version of SndFile
* Removed CONFIG
* Another fix for dependencies
* Made additional dependencies optional
2022-04-29 00:02:04 +02:00
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
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
4541db7f21
Merge pull request #1498 from rasmusgo/dev-loadgame-arg
...
Load game from command line
2022-03-06 23:05:04 +01:00
86d8ee4c38
Merge pull request #1496 from rasmusgo/fix-spelling
...
Fix spelling
2022-03-04 16:28:32 +01:00
fa5e229015
Fixed forward declaration of enums
2022-02-26 19:44:49 +01:00
8533be8d5c
Replaced MakeUnique and MakeUniqueArray with std::make_unique
2022-02-26 18:48:51 +01:00
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
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
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
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
ee390bc270
LoadFinishedLevels if needed in LoadScene
2022-02-08 20:02:56 +01:00
14e7cd0e52
Rename loadgame to loadsave
2022-02-08 14:17:11 +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
3400a0fab0
Add -loadgame argument to load game on start
2022-02-02 11:01:57 +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
9c37f6cbd5
Fully refactored Math::Matrix, removed matrix.h and moved remaining functions to other files
2022-01-05 19:12:35 +01:00
208f142cd2
Made Math::Matrix an alias to glm::mat4, partial refactors
2022-01-05 00:35:41 +01:00
0bba168f94
Removed vector.h, refactored redundant functions and moved remaining ones to func.h
2022-01-04 20:43:36 +01:00
db3b1d74d1
Refactored unnecessary Normalize, DotProduct, CrossProduct and Clamp functions
2022-01-04 02:10:36 +01:00
b4bfb8b242
Refactored Math::Vector in CLevelParserParam, CObjectCondition and CScoreboard
2021-12-29 02:19:22 +01:00
47ad390f1d
Refactored Math::Vector in CCamera, CLightManager, CLightning, CMainMovie, glutil.h and geometry.h
2021-12-29 00:08:02 +01:00
d25d6124a9
Changed Math::Vector into alias to glm::vec3
2021-12-28 23:01:30 +01:00
77c6f8e54f
Refactored Math::Point in CRobotMain, CObjectFactory, CBaseBuilding, CAutoInfo, CScript, CDebugMenu, CDisplayText and CObjectInterface
2021-12-24 20:08:04 +01:00
07d3d79e8d
Refactored Math::Point in CPlanet, CTerrain, CWater and CLevelParserParam
2021-12-24 02:04:15 +01:00
c389156499
Added commands for controling triplanar mapping
2021-12-14 21:58:23 +01:00
80f074e2ba
Update license headers
2021-09-11 15:53:59 +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
8647deafc8
Merge branch dev into dev-gameplus
2021-03-21 22:30:23 +01:00
ad2e3db92f
Fix more dynamic casts for gcc-11
...
Signed-off-by: suve <veg@svgames.pl>
Jeff's patch was written for the 0.1.12 stable release.
Adapted to work with the "dev" branch (as of commit 13098ee
2020-09-15 10:20:24 +02:00
2685a1eb60
Add cell capacity parameters ( #1348 )
2020-08-31 13:37:45 +02:00
56c99e741e
Make Vault buildable
2020-08-08 20:51:56 +02:00
2023756023
Fix factory() being able to produce non-bot units
2020-07-30 11:11:51 +02:00
16795e0d49
Use level parser instead of JSON for manifest
2020-07-22 21:40:13 +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
754dfefefd
Add Missions+ gamemode
2020-07-20 18:35:31 +02:00
95cab790c1
Rename 'freemissions' back to 'free'
2020-07-17 19:33:53 +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
7d7a29117e
Save audio settings when option changes
...
Mute/unmute option when game windowis in background relies on settings
being updates. This happens when users leaves Options screen. This
commit adds saving audio settings on each change.
This is a fix for #1315
2020-07-10 20:15:18 +02:00
37e4ed8029
Updated license headers ( #1317 )
...
* Updated headers
* Updated more headers
2020-07-07 10:19:36 +02:00
a65776e0e7
Prevent game crash on bad savegame title
...
It was noted in issues #1207 and #1232 that game can crash when savegame
does not contain title. This might be a problem when saving game fails
and user is informed about it only in console. Proper fix should be a
visible error message informing that saving failed. This commit filters
invalid savegames from load windows and prevents game crash in narrow
cases.
2020-07-06 11:38:23 +02:00
04b1944939
Add option to mute sounds when game is not focused
...
Closes #823
2020-07-05 14:58:46 +02:00
fb9fa49ce8
Use PHYSFS for saving screenshots
2020-07-05 12:55:40 +02:00
0b9673029d
Merge dev into dev-builders and resolve conflicts
2020-05-15 15:06:37 +02:00
5bf6f12ae5
Add HeavyTrainer texture recoloring
2020-01-11 17:04:40 +01:00
a66b3d0672
Refactor SaveState and RestoreState to use streams
2019-04-11 04:13:13 -04:00
723c552783
Add Heavy and Amphibious trainer bots
2018-12-23 07:04:06 +01:00
Tomasz Kapuściński