Commit Graph

3234 Commits (5749fff3770c61c2cb629194548ea4bbcff1b370)

Author SHA1 Message Date
Mateusz Przybył 5749fff377
Merge pull request #1342 from colobot/dev-lighting-fix
Fixes lighting issues and mipmapping
2020-08-03 20:48:15 +02:00
Tomasz Kapuściński 4c14050b27 Fixed mipmaps being outdates after texture update. 2020-07-31 22:04:47 +02:00
Tomasz Kapuściński 33b7c893cb Allow length of the light direction vector to influence strength of the light source.
This fixes the issue with objects and terrain being darker than they should be. As it turns out, most levels have not normalized light direction which happens to make light brighter and this is the expected result. To keep in line with GL14 engine, newer engines should use the length of the vector to make light brighter.
2020-07-31 22:01:33 +02:00
Mateusz Przybył aa8122f16f
Merge pull request #1339 from immibis/fix-quicksave-sim-speed-crash
Fix crash when quick-saving with increased game speed
2020-07-26 15:17:17 +02:00
immibis 9e743e86af Fix crash when quick-saving with increased game speed 2020-07-26 14:55:56 +02:00
immibis 5eebe300fc
Support new-format text models through the same code path as old models; update Blender script (#1290) 2020-07-25 21:13:26 +02:00
Mateusz Przybył fbe2191800
Allow producing objects with no keyword in CBOT (#1335) 2020-07-24 02:20:06 +02:00
Mateusz Przybył a5c7187017
Fix crashes on SatCom in Moon missions (#1334) 2020-07-22 00:37:37 +02:00
MrSimbax 5112bf86df Fix linter issues 2020-07-21 21:11:08 +02:00
Mateusz Przybył 2d32e3a798
Merge pull request #1255 from timgott/smooth_shadows_gl21
Smooth shadows in gl21
2020-07-21 20:55:47 +02:00
Mateusz Przybył fd2b72b296
Merge pull request #1263 from nextghost/dev
Fix OpenGL specular lighting
2020-07-21 20:55:21 +02:00
Droog71 c4385961c4
Fix for issue #1163 (#1332)
* Clamped power variable before assignment to params in object manager. Attempted to fix formatting issues.

* Fixed Clamp function not implemented correctly.

* Fixed formatting issue, space after commas.

* Created ClampPower method in object_manager.h and implemented in object_manager.cpp, Removed similar code from robotmain.cpp

* Removed redundant call to ClampPower in object_manager.cpp

* Added second call to ClampPower back to object_manager.cpp. Made ClampPower method private. Attempted to fix whitespace issues.

* Fixed missing assignment to params.power in CreateObject method of object_manager.cpp

* fixed white space at end of line 182 in object_manager.h

* Fixed doxygen compatibility issue.
2020-07-20 21:55:44 +02:00
krzys_h f1d6787b08
Merge pull request #1333 from colobot/dev-gh-actions
Use colobot-lint from GitHub Actions rather than Jenkins and fix linter on PRs from forks
2020-07-20 21:42:13 +02:00
krzys-h b47ee4dd1e Don't try to upload annotations for pull requests from forks
The GITHUB_TOKEN is readonly when running from a fork... and I've found exactly 0 workarounds for this issue

I wanted to check permissions on the actual token rather than if we are running inside a fork, but the header that is supposed to specify the permissions doesn't exist under GH Actions (╯°□°)╯︵ ┻━┻
2020-07-20 21:06:13 +02:00
krzys_h dc6cfbb691 Use colobot-lint from GitHub Actions rather than Jenkins 2020-07-20 19:51:50 +02:00
Droog71 d64d78acfc
Fix for issue #1221 (#1230)
* Fix for issue #1221

* Removed object array and implemented GetObjectName method in it's place.

* Fixed indentation issue.

* Fixed white space at end of lines 1571, 1572.
2020-07-19 10:55:55 +02:00
Emxx52 0a3cdd342b
Merge pull request #1322 from colobot/dev-update-translations
Update translations
2020-07-14 23:52:20 +02:00
Emxx52 d29570c20a
Merge pull request #1331 from colobot/dev-heavyduty
Update Heavy bots, fix collisions
2020-07-14 22:52:08 +02:00
Mateusz Przybył 174669ec92
Merge pull request #1257 from immibis/1164-fix
When game speed is 2 or higher, run multiple ticks.
2020-07-14 22:41:05 +02:00
MrSimbax f87ae45745 Update translations
Also add a Polish translation for "Mute sounds in background".
Related issue: #1316
2020-07-14 22:16:56 +02:00
MrJohn10 61126af370
Update contact section in Readme - add Discord server, remove forum and IRC channels (#1328) 2020-07-14 18:32:51 +02:00
Fiftytwo 83a32b36b3 Fix collision persistence of exploding Heavy bots 2020-07-13 20:27:40 +02:00
Fiftytwo c80a816808 Merge branch 'dev' into dev-heavyduty 2020-07-13 19:51:23 +02:00
Fiftytwo a2c62a9da6 Make Heavy bots destroy bushes on contact 2020-07-13 19:44:50 +02:00
immibis a2aeef0155 When game speed is 2 or higher, run multiple ticks. 2020-07-11 21:20:55 +02:00
Mateusz Przybył 90af1d9c16
Merge pull request #1318 from Erihel/mute_fix
Save audio settings when option changes
2020-07-10 20:30:41 +02:00
Krzysztof Dermont 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
Mateusz Przybył b8523aa1db
Merge pull request #1329 from colobot/dev-msvc-sed-fix
Fix update-pot not working with MSBuild
2020-07-10 11:33:41 +02:00
MrSimbax bf1982f4e4 Change `make update-pot` comment to cmake command
`make update-pot` only works if a generator producing Makefiles was
used with `cmake`. The `cmake` command to build a specific target
will work for any generator.
2020-07-10 11:01:47 +02:00
MrSimbax 963cd1b347 Fix sed cmd not working with MSBuild
Fixes the `'\1' is not recognized as an internal or external command`
error when trying to run the target `update-pot` with MSBuild.

The `|` characters probably messed with cmd.exe or PowerShell syntax
rules so they were replaced with slashes `/`.

Also, at least some implementations of sed for Windows would produce
CRLF line endings instead of LF line endings. The issue is fixed by
adding the flag `-b`.
2020-07-10 10:53:38 +02:00
krzys_h 1c8c01ad96
Merge pull request #1325 from colobot/dev-gh-actions-lint
Send colobot-lint results to GitHub using annotations
2020-07-09 20:14:05 +02:00
MrSimbax 97b266182b Fix MXE build 2020-07-09 19:55:11 +02:00
krzys-h 4eaa8588d7 Add missing apt-get update 2020-07-09 19:37:52 +02:00
krzys-h 76bb08779a Switch to actions/checkout@v2
As per GitHub recommendations
2020-07-09 19:37:22 +02:00
krzys-h 03c60202b8 Clean up some of the old colobot-lint run scripts 2020-07-09 19:09:38 +02:00
krzys-h dcd84523ab Send colobot-lint results to GitHub using annotations
This makes the results visible directly in the pull request UI changes
view
2020-07-09 19:09:38 +02:00
Fiftytwo 6a23e97533 Fix collisions of animated plants 2020-07-08 14:17:08 +02:00
MrSimbax 4bd6e01b65 Fix filename style of the particles generator 2020-07-07 21:30:21 +02:00
MrJohn10 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
krzys_h 6efc977286
Merge pull request #1320 from colobot/dev-gh-actions
Set up GitHub actions
2020-07-07 19:35:19 +02:00
krzys-h a6a7b0c96c Display correct PR target branch as success rather than skipped 2020-07-07 18:37:21 +02:00
krzys-h 0ef21bfdbb Test builds on Ubuntu 16.04, 18.04 and 20.04
It's free, so why not?

This also partially deprecates the Docker container used for building -
now it's used only for MXE builds (because building MXE takes way too
long to do it inside the action)
2020-07-07 18:17:24 +02:00
krzys-h 6d7aadf987 Migrate to GitHub Actions
This is pretty much a straight port of our Jenkinsfile to GitHub
Actions. It could use some modernization in a few places, but it should
work for now.

Note that I left the Jenkinsfile for now - we'll be using them both
until we are sure that the GitHub Actions version is stable.
2020-07-07 18:09:12 +02:00
tomangelo 37e4ed8029
Updated license headers (#1317)
* Updated headers

* Updated more headers
2020-07-07 10:19:36 +02:00
Fiftytwo c50b36118e Revert "Make Recycler Recycle small Building Ruins." 2020-07-07 09:40:47 +02:00
MrSimbax 47687931d7 Fix compilation error
Apparently binary constants are a C++14 feature.
2020-07-06 18:29:30 +02:00
MrSimbax cb364a4f96 Fix typo 2020-07-06 18:29:30 +02:00
MrSimbax 06921e711d Fix 'uninitialized field' warnings 2020-07-06 18:29:30 +02:00
MrSimbax 124467c6e1 Fix 'naked new' warning 2020-07-06 18:29:30 +02:00
MrSimbax faa4a6eefa Fix "inconsistent declaration parameter name" 2020-07-06 18:29:30 +02:00