]> git.rm.cloudns.org Git - xonotic/netradiant.git/log
xonotic/netradiant.git
7 days agoMerge branch 'illwieckz/fix-brush-fusing' into 'master' master
Thomas Debesse [Sat, 2 Nov 2024 07:43:53 +0000 (07:43 +0000)]
Merge branch 'illwieckz/fix-brush-fusing' into 'master'

q3map2: import fused brush fix from NRC

See merge request xonotic/netradiant!211

2 weeks agoq3map2: import fused brush fix from NRC 211/head
Thomas Debesse [Sat, 26 Oct 2024 00:44:40 +0000 (02:44 +0200)]
q3map2: import fused brush fix from NRC

Import and rewrite in C that fix for a bug fusing brushes at map compile time:

- https://github.com/Garux/netradiant-custom/commit/5283b70a83acdbaa9c37f33852fc1ac9a86f7c6b

6 months agoMerge branch 'NateEag-master-patch-12920' into 'master'
Spike29 [Tue, 23 Apr 2024 11:06:31 +0000 (11:06 +0000)]
Merge branch 'NateEag-master-patch-12920' into 'master'

Fix typo in README.md

See merge request xonotic/netradiant!207

6 months agoFix typo in README.md
Nate Eagleson [Tue, 23 Apr 2024 02:29:05 +0000 (02:29 +0000)]
Fix typo in README.md

7 months agonetradiant: strip 16-bit png to 8-bit, fix #153 illwieckz/png16
Thomas Debesse [Sat, 30 Mar 2024 00:19:15 +0000 (01:19 +0100)]
netradiant: strip 16-bit png to 8-bit, fix #153

7 months agomacos: workaround AppleClang compiler strrchr optimization bug illwieckz/macos-workaround-strrchr
Thomas Debesse [Fri, 29 Mar 2024 19:22:32 +0000 (20:22 +0100)]
macos: workaround AppleClang compiler strrchr optimization bug

Apple shipped a clang built for macOS with an optimization enabled
that is not available on macOS. This compiler error may then be faced:

  ld: Undefined symbols:
_memrchr, referenced from:
    name_read(char const*) in map.cpp.o

This is a compiler error:

> On Mac OSX (macOS version 12.4, sdk version 12.1) llvm can replace call
> to strrchr() with call to memrchr() when string length is known at
> compile time. This results in link error, because memrchr is not present
> in libSystem.
> -- https://github.com/llvm/llvm-project/issues/62254

We workaround this by making the string length not known at build time
on macOS to avoid triggering the unavailable compiler optimization.

7 months agoreadme: update
Thomas Debesse [Fri, 29 Mar 2024 17:30:04 +0000 (18:30 +0100)]
readme: update

7 months agoMerge branch 'illwieckz/entity-count' into 'master'
bones_was_here [Fri, 22 Mar 2024 04:39:48 +0000 (04:39 +0000)]
Merge branch 'illwieckz/entity-count' into 'master'

netradiant: fix entity count in map info, fix #184

Closes #184

See merge request xonotic/netradiant!204

7 months agonetradiant: fix entity count in map info, fix #184
Thomas Debesse [Thu, 21 Mar 2024 22:07:24 +0000 (23:07 +0100)]
netradiant: fix entity count in map info, fix #184

8 months agoRevert "Fix netradiant#182"
Thomas Debesse [Thu, 15 Feb 2024 14:43:44 +0000 (15:43 +0100)]
Revert "Fix netradiant#182"

This reverts commit f88482a4806e19b0df5117d6cb17249ccd967940.

8 months agoMerge branch 'uis/lightfix' into 'master'
Thomas Debesse [Thu, 15 Feb 2024 13:57:08 +0000 (13:57 +0000)]
Merge branch 'uis/lightfix' into 'master'

Prevent NANs from polluting lightmap on every bounce. Fixes #182.

Closes #182

See merge request xonotic/netradiant!203

8 months agoMerge branch 'uis/better-culling' into 'master'
Thomas Debesse [Thu, 15 Feb 2024 13:56:34 +0000 (13:56 +0000)]
Merge branch 'uis/better-culling' into 'master'

Place drawsurfs only based on surfaces instead of vertices.

See merge request xonotic/netradiant!202

10 months agoFix netradiant#182
uis [Sat, 23 Dec 2023 18:03:42 +0000 (21:03 +0300)]
Fix netradiant#182

10 months agoMake ubsan happy
uis [Sat, 23 Dec 2023 21:26:08 +0000 (00:26 +0300)]
Make ubsan happy

10 months agoSmall improvements
uis [Fri, 22 Dec 2023 21:16:49 +0000 (00:16 +0300)]
Small improvements

10 months agoPlace drawsurfs only based on surfaces instead of vertices.
uis [Sun, 10 Dec 2023 00:35:15 +0000 (03:35 +0300)]
Place drawsurfs only based on surfaces instead of vertices.

Without it drawsurfs have annoying tendency to be marked as part of leaf which they only touch with verticies

14 months agoplugins: chose Radiant IQM plugin, iqmmodel for macOS, picomodel for everything else illwieckz/iqm
Thomas Debesse [Tue, 15 Aug 2023 22:42:01 +0000 (00:42 +0200)]
plugins: chose Radiant IQM plugin, iqmmodel for macOS, picomodel for everything else

The picomodel IQM code makes NetRadiant crash on macOS.
No one has found time to investigate this in month.

We need a working NetRadiant IQM plugin to load
Unvanquished game entity models on macOS, the
plugin from AAradiant (AlienArena project) is
known to work.

Q3map2 uses picomodel to load IQM on all platforms
because iqmmodel plugin is radiant-only, so there
may be a remaining bug when baking IQM models in BSP
with q3map2 on macOS (not tested), but editing a map
with IQM entity models and misc_animated_models will
not crash NetRadiant.

This patch makes possible to release a macOS NetRadiant
build that don't crash when rendering IQM models.

We should fix picomodel crash with IQM on macOS in any way,
because it is believed q3map2 may need it, but waiting for
a picomodel fix will not delay any NetRadiant release.

One can force NetRadiant to be built against a given IQM
plugin (for example to debug it) whatever the platform
by setting the RADIANT_IQM_PLUGIN CMake variable to
either `iqmmodel` or `picomodel`. Any other value,
including empty string, will set the default plugin for
the platform.

14 months agoRevert "plugins: delete iqmmodel, picomodel will implement iqm instead"
Thomas Debesse [Tue, 15 Aug 2023 21:02:02 +0000 (23:02 +0200)]
Revert "plugins: delete iqmmodel, picomodel will implement iqm instead"

This reverts commit a5c61fb07873b0a545965db5baa7752fa4799474.

14 months agoRestore “Show All” menu option in texture browser, fix #181 illwieckz/showall
Thomas Debesse [Tue, 15 Aug 2023 17:04:37 +0000 (19:04 +0200)]
Restore “Show All” menu option in texture browser, fix #181

This option was probably mistakenly removed
in https://gitlab.com/xonotic/netradiant/-/merge_requests/193

14 months agoMerge branch 'Spike29/fix182' into 'master'
Thomas Debesse [Tue, 15 Aug 2023 17:07:05 +0000 (17:07 +0000)]
Merge branch 'Spike29/fix182' into 'master'

Work around an issue with Stormkeep lightmaps generation

See merge request xonotic/netradiant!199

17 months agoModify a loop iterator to work around an issue with Stormkeep lightmaps generation
Spike29 [Sat, 20 May 2023 09:29:49 +0000 (11:29 +0200)]
Modify a loop iterator to work around an issue with Stormkeep lightmaps generation

18 months agoMerge branch 'DefaultUser/Fix185_gcc13_uint64_t' into 'master'
Freddy [Fri, 5 May 2023 12:19:44 +0000 (12:19 +0000)]
Merge branch 'DefaultUser/Fix185_gcc13_uint64_t' into 'master'

Fix build with GCC 13

Closes #185

See merge request xonotic/netradiant!198

18 months agoFix build with GCC 13
Freddy [Thu, 4 May 2023 16:14:52 +0000 (18:14 +0200)]
Fix build with GCC 13

Fixes https://gitlab.com/xonotic/netradiant/-/issues/185

20 months agogamepack-manager: remove the validated list, as all available packages are validated
Thomas Debesse [Tue, 21 Feb 2023 14:59:03 +0000 (15:59 +0100)]
gamepack-manager: remove the validated list, as all available packages are validated

20 months agomove old stuff
Thomas Debesse [Tue, 21 Feb 2023 14:20:40 +0000 (15:20 +0100)]
move old stuff

20 months agotools: rename compressed xcf file extension
Thomas Debesse [Tue, 21 Feb 2023 12:20:06 +0000 (13:20 +0100)]
tools: rename compressed xcf file extension

20 months agogamepacks: update gamelist
Thomas Debesse [Tue, 21 Feb 2023 02:46:40 +0000 (03:46 +0100)]
gamepacks: update gamelist

- re-enable jedi knight games with new repository
- switch prey to new repository

20 months agogamepacks: update Wrath gamepack license
Thomas Debesse [Mon, 20 Feb 2023 20:14:20 +0000 (21:14 +0100)]
gamepacks: update Wrath gamepack license

20 months agoMerge branch 'master-merge' into 'master'
Thomas Debesse [Mon, 20 Feb 2023 19:26:04 +0000 (19:26 +0000)]
Merge branch 'master-merge' into 'master'

First bunch of merge from NetRadiantCustom

See merge request xonotic/netradiant!193

20 months agoMerge branch 'master' into master-merge
Thomas Debesse [Mon, 20 Feb 2023 19:25:08 +0000 (20:25 +0100)]
Merge branch 'master' into master-merge

20 months agogamepacks: add wrath support
Thomas Debesse [Mon, 20 Feb 2023 19:20:17 +0000 (20:20 +0100)]
gamepacks: add wrath support

20 months agoradiant: bump the commands (shortcuts) version
Thomas Debesse [Mon, 20 Feb 2023 15:40:48 +0000 (16:40 +0100)]
radiant: bump the commands (shortcuts) version

The shortcuts were modified by NetRadiant-custom in an incompatible way

20 months agoMerge branch 'master' into master-merge
Thomas Debesse [Mon, 20 Feb 2023 15:40:09 +0000 (16:40 +0100)]
Merge branch 'master' into master-merge

20 months agoradiant: use the same shortcuts.ini file for all games
Thomas Debesse [Mon, 20 Feb 2023 15:36:37 +0000 (16:36 +0100)]
radiant: use the same shortcuts.ini file for all games

20 months agoradiant: do not store useless commandlist.txt
Thomas Debesse [Mon, 20 Feb 2023 15:21:26 +0000 (16:21 +0100)]
radiant: do not store useless commandlist.txt

It is only written, never read, shortcuts.ini is used instead.

20 months agoMerge branch 'master' into master-merge
Thomas Debesse [Sun, 19 Feb 2023 17:18:13 +0000 (18:18 +0100)]
Merge branch 'master' into master-merge

20 months agoradiant: do not hide materials using notex textures, only notex materials
Thomas Debesse [Sun, 19 Feb 2023 17:17:11 +0000 (18:17 +0100)]
radiant: do not hide materials using notex textures, only notex materials

Materials using notex textures are likely
valid materials with image misssing or
with unknown image format, they should
be listed.

20 months agoMerge branch 'master' into master-merge
Thomas Debesse [Sun, 19 Feb 2023 15:50:10 +0000 (16:50 +0100)]
Merge branch 'master' into master-merge

20 months agocmake: force Release build if CMAKE_BUILD_TYPE is unset
Thomas Debesse [Sun, 19 Feb 2023 15:49:53 +0000 (16:49 +0100)]
cmake: force Release build if CMAKE_BUILD_TYPE is unset

20 months agoMerge branch 'master' into master-merge
Thomas Debesse [Sun, 19 Feb 2023 15:40:44 +0000 (16:40 +0100)]
Merge branch 'master' into master-merge

20 months agoradiant: force -lOpenGL -lGL when building with OpenGL_GL_PREFERENCE=GLVND, <3 SpiKe
Thomas Debesse [Sun, 19 Feb 2023 15:40:28 +0000 (16:40 +0100)]
radiant: force -lOpenGL -lGL when building with OpenGL_GL_PREFERENCE=GLVND, <3 SpiKe

20 months agocmake: use elseif for some system-specific code
Thomas Debesse [Sun, 19 Feb 2023 15:15:35 +0000 (16:15 +0100)]
cmake: use elseif for some system-specific code

20 months agoMerge branch 'master' into master-merge
Thomas Debesse [Sun, 19 Feb 2023 14:26:32 +0000 (15:26 +0100)]
Merge branch 'master' into master-merge

21 months agoradiant: update FGD parser (improvements from NetRadiant-custom)
Thomas Debesse [Thu, 9 Feb 2023 09:12:08 +0000 (10:12 +0100)]
radiant: update FGD parser (improvements from NetRadiant-custom)

Partially imported patches from:

f0ce315ed3f8e826dad2a40e89bb7689c555f8bb
  * handle fgd spawnflags #115
62f06a9af34b70f1c3bfbdfb75b6405cdac8d4c5
  * appease incompatible fgds loading: only show message window once
- commit 8d19be1c0e506c6e3f9e5e2e7154ca81af077097
  * fgd: support studio("display/model/path") and flags(Angles)
c6c978a38faebf7ad5cc1d240fe9c5e15491fc0a
  * load all found *.fgd, not just halflife.fgd

FGD spawnflags are not handled yet (only parsed and ignored).

Co-authored-by: Garux <garux@mail.ru>
21 months agoradiant: update credits/changes/issues urls
Thomas Debesse [Thu, 9 Feb 2023 05:56:31 +0000 (06:56 +0100)]
radiant: update credits/changes/issues urls

The credits one was a dead link,
others were redirects.

21 months agoMerge branch 'illwieckz/no-daemonmap' into 'master'
Thomas Debesse [Sat, 4 Feb 2023 00:56:45 +0000 (00:56 +0000)]
Merge branch 'illwieckz/no-daemonmap' into 'master'

tools: remove daemonmap

See merge request xonotic/netradiant!197

21 months agotools: remove daemonmap
Thomas Debesse [Sat, 14 Jan 2023 18:19:12 +0000 (19:19 +0100)]
tools: remove daemonmap

21 months agoradiant: fix build with gtk3
Clyybber [Sat, 14 Jan 2023 13:39:05 +0000 (14:39 +0100)]
radiant: fix build with gtk3

21 months agoradiant: disable GL rectangle selection feedback on gtk3 as implementation is gtk2...
Clyybber [Sat, 14 Jan 2023 13:39:05 +0000 (14:39 +0100)]
radiant: disable GL rectangle selection feedback on gtk3 as implementation is gtk2 only

Co-authored-by: Thomas Debesse <dev@illwieckz.net>
21 months agoMerge branch 'master' into master-merge
Thomas Debesse [Thu, 9 Feb 2023 05:57:46 +0000 (06:57 +0100)]
Merge branch 'master' into master-merge

21 months agoMerge branch 'master' into master-merge
Thomas Debesse [Sun, 29 Jan 2023 18:30:00 +0000 (18:30 +0000)]
Merge branch 'master' into master-merge

2 years agoq3map2: fixup an automatic git merge mistake
Thomas Debesse [Fri, 7 Oct 2022 08:01:06 +0000 (10:01 +0200)]
q3map2: fixup an automatic git merge mistake

2 years agoMerge branch 'master' into master-merge
Thomas Debesse [Fri, 7 Oct 2022 07:57:44 +0000 (09:57 +0200)]
Merge branch 'master' into master-merge

2 years agoMerge branch 'illwieckz/externalnames' into 'master'
Thomas Debesse [Fri, 7 Oct 2022 07:49:54 +0000 (07:49 +0000)]
Merge branch 'illwieckz/externalnames' into 'master'

q3map2: add -externalnames option to write explicit external lightmap names...

See merge request xonotic/netradiant!196

2 years agoMerge branch 'mac' into 'master'
Thomas Debesse [Fri, 7 Oct 2022 07:41:35 +0000 (07:41 +0000)]
Merge branch 'mac' into 'master'

Make it build on M1 Mac

See merge request xonotic/netradiant!195

2 years agoMake it build on M1 Mac
slipher [Fri, 19 Aug 2022 06:23:38 +0000 (01:23 -0500)]
Make it build on M1 Mac

The CMake changes are to work around the issue that the pkgconfig
module is populating the xxx_LIBRARIES variable with the library
name only (e.g. 'glib-2.0') rather than the full path, which the
linker is unable to find. I guess the correct way to do it is to
use the xxx_LDFLAGS variable from pkgconfig which should tell the
linker where to find the libraries, but it's kind of annoying
because we also have a non-pkgconfig route.

The xxx_LINK_LIBRARIES variable has the full library paths but
it is available only from CMake 3.12 so it can't be used
unconditionally.

2 years agoq3map2: add -externalnames option to write explicit external lightmap names when...
Thomas Debesse [Mon, 22 Aug 2022 13:32:06 +0000 (15:32 +0200)]
q3map2: add -externalnames option to write explicit external lightmap names when writing style shaders

It makes possible for game engines to run less code on each rendering
frame by not doing any computation to find the file.

On some game engines it may even make the lightmaps be processed
with simpler GLSL code as they will be processed as simple colormaps
instead of more complex code purposed for usual lightmaps with
features that aren't needed in such situation anyway.

Or some engine may implement a specific GLSL code to blend multiple
colormaps in a single pass without having to implement alternate code
for lightmaps.

Example with scripts/q3map2_gloom2.shader:

```
-gloom2/7C9AD47A87BC98CCA1FF30C4D788DD47
+gloom2/72353935F9542782B847B2E329A8CC80
 { // Q3Map2 defaulted
  {
  map $lightmap
  rgbGen identity
  }

  // Q3Map2 custom lightstyle stage(s)
  {
- map $lightmap
+ map maps/gloom2/lm_0000.tga
  blendFunc GL_SRC_ALPHA GL_ONE
  rgbGen wave noise 1 .75 1.6 4.2 // style 2
  tcGen lightmap
  tcMod transform 1 0 0 1 0.54492 0.10156
  }
  {
- map $lightmap
+ map maps/gloom2/lm_0000.tga
  blendFunc GL_SRC_ALPHA GL_ONE
  rgbGen wave noise 1 .5 3.7 4.9 // style 3
  tcGen lightmap
  tcMod transform 1 0 0 1 -0.38672 0.19043
  }
  {
- map $lightmap
+ map maps/gloom2/lm_0000.tga
  blendFunc GL_SRC_ALPHA GL_ONE
  rgbGen wave noise 1 1 2.6 1.3 // style 4
  tcGen lightmap
  tcMod transform 1 0 0 1 0.24023 0.19043
  }

  {
  map textures/gloom2/e8clangfloor05c.tga
  blendFunc GL_DST_COLOR GL_ZERO
  rgbGen identity
  }
 }
```

2 years agoMerge branch 'master' into master-merge
Thomas Debesse [Thu, 18 Aug 2022 14:40:28 +0000 (16:40 +0200)]
Merge branch 'master' into master-merge

2 years agotransformpath: do not segfault if environment variable is missing
Thomas Debesse [Thu, 18 Aug 2022 13:29:51 +0000 (15:29 +0200)]
transformpath: do not segfault if environment variable is missing

2 years agoMerge branch 'netradiant-156-fix-invalid-vector-access' into 'master'
Thomas Debesse [Thu, 18 Aug 2022 13:37:01 +0000 (13:37 +0000)]
Merge branch 'netradiant-156-fix-invalid-vector-access' into 'master'

Do not crash in Winding_Clip when using -D_GLIBCXX_ASSERTIONS

Closes #156

See merge request xonotic/netradiant!194

2 years agoMerge branch 'master' into master-merge
Thomas Debesse [Mon, 15 Aug 2022 14:05:29 +0000 (16:05 +0200)]
Merge branch 'master' into master-merge

2 years agodaemonmap: update submodule
Thomas Debesse [Wed, 27 Jul 2022 23:40:35 +0000 (01:40 +0200)]
daemonmap: update submodule

2 years agoDo not crash in Winding_Clip when using -D_GLIBCXX_ASSERTIONS
Walter Doekes [Sun, 17 Jul 2022 20:16:36 +0000 (22:16 +0200)]
Do not crash in Winding_Clip when using -D_GLIBCXX_ASSERTIONS

When setting -D_GLIBCXX_ASSERTIONS, invalid vector accesses are found,
like empty_vector.back(). In this case, the result was not used so the
bug wasn't found without the assertion.

This changeset fixes so dragging a brush to 0 size does not crash/abort
netradiant.

Closes #156.

2 years agolibrary-bundler: improve FreeBSD library bundling
Thomas Debesse [Tue, 28 Jun 2022 12:13:09 +0000 (14:13 +0200)]
library-bundler: improve FreeBSD library bundling

2 years agotools: fix compilation on some systems
Thomas Debesse [Tue, 28 Jun 2022 11:09:52 +0000 (13:09 +0200)]
tools: fix compilation on some systems

2 years agoMerge branch 'master' into master-merge
Thomas Debesse [Fri, 24 Jun 2022 23:56:13 +0000 (01:56 +0200)]
Merge branch 'master' into master-merge

2 years agomacos: fix theme color variant name like the theme did
Thomas Debesse [Fri, 24 Jun 2022 23:35:47 +0000 (01:35 +0200)]
macos: fix theme color variant name like the theme did

2 years agogamepack-manager: more reliable extra-urls.txt parsing
Thomas Debesse [Fri, 24 Jun 2022 22:08:31 +0000 (00:08 +0200)]
gamepack-manager: more reliable extra-urls.txt parsing

Make it works even when the shell transforms \n from stdin into \r\n
on Windows.

2 years agotransformpath: fix % characters in strings
Thomas Debesse [Fri, 24 Jun 2022 22:06:07 +0000 (00:06 +0200)]
transformpath: fix % characters in strings

2 years agoradiant: fix windows build
Thomas Debesse [Tue, 21 Jun 2022 23:21:37 +0000 (01:21 +0200)]
radiant: fix windows build

2 years agoradiant: some comments from NRC
Thomas Debesse [Tue, 21 Jun 2022 21:55:41 +0000 (23:55 +0200)]
radiant: some comments from NRC

2 years agoradiant: less deprecated GTK2 stuff, they are even not supported in GTK3
Thomas Debesse [Tue, 21 Jun 2022 21:54:24 +0000 (23:54 +0200)]
radiant: less deprecated GTK2 stuff, they are even not supported in GTK3

2 years agoradiant: fix xy/yz/xz layout
Thomas Debesse [Tue, 21 Jun 2022 21:21:02 +0000 (23:21 +0200)]
radiant: fix xy/yz/xz layout

2 years agoradiant: re-enable Credits and Issues buttons in About window
Thomas Debesse [Tue, 21 Jun 2022 06:38:04 +0000 (08:38 +0200)]
radiant: re-enable Credits and Issues buttons in About window

2 years agoradiant: display plugin toolbar as toolbar when filter toolbar is also enabled, not...
Thomas Debesse [Tue, 21 Jun 2022 05:14:14 +0000 (07:14 +0200)]
radiant: display plugin toolbar as toolbar when filter toolbar is also enabled, not as a menu

2 years agoMerge commit 'e36a9e0f374477a0a4c778d06454a979cd53fc47' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:33:07 +0000 (06:33 +0200)]
Merge commit 'e36a9e0f374477a0a4c778d06454a979cd53fc47' into master-merge

2 years agoMerge commit 'a8192282200b4691a016c4f7757638cbb132f2dc' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:32:59 +0000 (06:32 +0200)]
Merge commit 'a8192282200b4691a016c4f7757638cbb132f2dc' into master-merge

2 years agoMerge commit '54a2bda443aace9c00a1615af10cc1dc8b1f0cd1' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:29:46 +0000 (06:29 +0200)]
Merge commit '54a2bda443aace9c00a1615af10cc1dc8b1f0cd1' into master-merge

2 years agoMerge commit '19c67e1114f894604c3346fe1af9b015184328be' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:27:49 +0000 (06:27 +0200)]
Merge commit '19c67e1114f894604c3346fe1af9b015184328be' into master-merge

2 years agoMerge commit '667d3275589dac91b5bfe96f0244183007be6efd' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:27:31 +0000 (06:27 +0200)]
Merge commit '667d3275589dac91b5bfe96f0244183007be6efd' into master-merge

2 years agoMerge commit '61214e743288ffe8a58cf7876bd8f7f435397571' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:24:13 +0000 (06:24 +0200)]
Merge commit '61214e743288ffe8a58cf7876bd8f7f435397571' into master-merge

2 years agoMerge commit '8d6828cd68e9104c2c68b962b341b4f572b4bc38' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:23:57 +0000 (06:23 +0200)]
Merge commit '8d6828cd68e9104c2c68b962b341b4f572b4bc38' into master-merge

2 years agoMerge commit 'e155ebe99481333af4a7660d174db490e2a75fb5' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:18:48 +0000 (06:18 +0200)]
Merge commit 'e155ebe99481333af4a7660d174db490e2a75fb5' into master-merge

2 years agoMerge commit 'aa4bc3893f6c0c360c91896eba46631e53b2f0d1' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:18:35 +0000 (06:18 +0200)]
Merge commit 'aa4bc3893f6c0c360c91896eba46631e53b2f0d1' into master-merge

2 years agoMerge commit 'ddee6cbe7c5fcbba52e7881a411f310809b867f9' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:10:48 +0000 (06:10 +0200)]
Merge commit 'ddee6cbe7c5fcbba52e7881a411f310809b867f9' into master-merge

2 years agoMerge commit '6134b25a1b87ad94c5a082915064a33ea66b07d7' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:08:48 +0000 (06:08 +0200)]
Merge commit '6134b25a1b87ad94c5a082915064a33ea66b07d7' into master-merge

2 years agoMerge commit '1644eeece07040927ced5628e3922774576c64c9' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:08:40 +0000 (06:08 +0200)]
Merge commit '1644eeece07040927ced5628e3922774576c64c9' into master-merge

2 years agoMerge commit 'a8f1237884e3741541e891724fbae07f8ff7d3b8' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:06:16 +0000 (06:06 +0200)]
Merge commit 'a8f1237884e3741541e891724fbae07f8ff7d3b8' into master-merge

2 years agoMerge commit '6352fbdd7968d7dffa2ba4c57ee5cade250e04ed' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:05:55 +0000 (06:05 +0200)]
Merge commit '6352fbdd7968d7dffa2ba4c57ee5cade250e04ed' into master-merge

2 years agoMerge commit 'd930835fa0ffd32d2e6459e11e526ec0733745bc' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:05:22 +0000 (06:05 +0200)]
Merge commit 'd930835fa0ffd32d2e6459e11e526ec0733745bc' into master-merge

2 years agoMerge commit '0c0ed6c1a75ce05a91209fdf3ad8378a7b7e7f6a' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 04:05:15 +0000 (06:05 +0200)]
Merge commit '0c0ed6c1a75ce05a91209fdf3ad8378a7b7e7f6a' into master-merge

2 years agoMerge commit '6a7a6b309311c16138981200f4539770755c243a' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 03:59:45 +0000 (05:59 +0200)]
Merge commit '6a7a6b309311c16138981200f4539770755c243a' into master-merge

2 years agocontrib: fix bobToolz loading
Thomas Debesse [Tue, 21 Jun 2022 03:30:11 +0000 (05:30 +0200)]
contrib: fix bobToolz loading

2 years agoMerge commit '87f4eea939309a5ea1972323e237d23afdf01104' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 03:21:49 +0000 (05:21 +0200)]
Merge commit '87f4eea939309a5ea1972323e237d23afdf01104' into master-merge

2 years agoMerge commit '93a3d833ff57ef8304cb547dd1e3664b6b276ec4' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 02:54:06 +0000 (04:54 +0200)]
Merge commit '93a3d833ff57ef8304cb547dd1e3664b6b276ec4' into master-merge

2 years agoMerge commit '1a0075a3f03af095ee32ded7f101cac79267f906' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 02:52:21 +0000 (04:52 +0200)]
Merge commit '1a0075a3f03af095ee32ded7f101cac79267f906' into master-merge

2 years agoMerge commit 'f472e6f0e8066e62cf3e159287bb07de97d2e59d' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 02:52:11 +0000 (04:52 +0200)]
Merge commit 'f472e6f0e8066e62cf3e159287bb07de97d2e59d' into master-merge

2 years agoMerge commit 'e984b9f54a0c733aab34a8ec19724dc4114ade28' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 02:43:16 +0000 (04:43 +0200)]
Merge commit 'e984b9f54a0c733aab34a8ec19724dc4114ade28' into master-merge

2 years agoMerge commit '839c9693774fdb0e420391f65b8066e8bd04c591' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 02:25:25 +0000 (04:25 +0200)]
Merge commit '839c9693774fdb0e420391f65b8066e8bd04c591' into master-merge

2 years agoMerge commit '84881a66140ad93d0b6cd4d55efbbb459bd91f48' into master-merge
Thomas Debesse [Tue, 21 Jun 2022 02:22:18 +0000 (04:22 +0200)]
Merge commit '84881a66140ad93d0b6cd4d55efbbb459bd91f48' into master-merge