]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
Thomas Debesse [Sun, 29 Jan 2023 18:30:00 +0000 (18:30 +0000)]
Merge branch 'master' into master-merge
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
Thomas Debesse [Sat, 14 Jan 2023 18:19:12 +0000 (19:19 +0100)]
tools: remove daemonmap
Thomas Debesse [Fri, 7 Oct 2022 08:01:06 +0000 (10:01 +0200)]
q3map2: fixup an automatic git merge mistake
Thomas Debesse [Fri, 7 Oct 2022 07:57:44 +0000 (09:57 +0200)]
Merge branch 'master' into master-merge
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
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
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.
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
}
}
```
Thomas Debesse [Thu, 18 Aug 2022 14:40:28 +0000 (16:40 +0200)]
Merge branch 'master' into master-merge
Thomas Debesse [Thu, 18 Aug 2022 13:29:51 +0000 (15:29 +0200)]
transformpath: do not segfault if environment variable is missing
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
Thomas Debesse [Mon, 15 Aug 2022 14:05:29 +0000 (16:05 +0200)]
Merge branch 'master' into master-merge
Thomas Debesse [Wed, 27 Jul 2022 23:40:35 +0000 (01:40 +0200)]
daemonmap: update submodule
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.
Thomas Debesse [Tue, 28 Jun 2022 12:13:09 +0000 (14:13 +0200)]
library-bundler: improve FreeBSD library bundling
Thomas Debesse [Tue, 28 Jun 2022 11:09:52 +0000 (13:09 +0200)]
tools: fix compilation on some systems
Thomas Debesse [Fri, 24 Jun 2022 23:56:13 +0000 (01:56 +0200)]
Merge branch 'master' into master-merge
Thomas Debesse [Fri, 24 Jun 2022 23:35:47 +0000 (01:35 +0200)]
macos: fix theme color variant name like the theme did
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.
Thomas Debesse [Fri, 24 Jun 2022 22:06:07 +0000 (00:06 +0200)]
transformpath: fix % characters in strings
Thomas Debesse [Tue, 21 Jun 2022 23:21:37 +0000 (01:21 +0200)]
radiant: fix windows build
Thomas Debesse [Tue, 21 Jun 2022 21:55:41 +0000 (23:55 +0200)]
radiant: some comments from NRC
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
Thomas Debesse [Tue, 21 Jun 2022 21:21:02 +0000 (23:21 +0200)]
radiant: fix xy/yz/xz layout
Thomas Debesse [Tue, 21 Jun 2022 06:38:04 +0000 (08:38 +0200)]
radiant: re-enable Credits and Issues buttons in About window
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
Thomas Debesse [Tue, 21 Jun 2022 04:33:07 +0000 (06:33 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:32:59 +0000 (06:32 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:29:46 +0000 (06:29 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:27:49 +0000 (06:27 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:27:31 +0000 (06:27 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:24:13 +0000 (06:24 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:23:57 +0000 (06:23 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:18:48 +0000 (06:18 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:18:35 +0000 (06:18 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:10:48 +0000 (06:10 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:08:48 +0000 (06:08 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:08:40 +0000 (06:08 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:06:16 +0000 (06:06 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:05:55 +0000 (06:05 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:05:22 +0000 (06:05 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 04:05:15 +0000 (06:05 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 03:59:45 +0000 (05:59 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 03:30:11 +0000 (05:30 +0200)]
contrib: fix bobToolz loading
Thomas Debesse [Tue, 21 Jun 2022 03:21:49 +0000 (05:21 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:54:06 +0000 (04:54 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:52:21 +0000 (04:52 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:52:11 +0000 (04:52 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:43:16 +0000 (04:43 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:25:25 +0000 (04:25 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:22:18 +0000 (04:22 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:21:38 +0000 (04:21 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:04:34 +0000 (04:04 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:04:02 +0000 (04:04 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:03:33 +0000 (04:03 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:03:03 +0000 (04:03 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:02:30 +0000 (04:02 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:02:03 +0000 (04:02 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:01:29 +0000 (04:01 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 02:01:17 +0000 (04:01 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 01:59:17 +0000 (03:59 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 01:58:45 +0000 (03:58 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 01:57:24 +0000 (03:57 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 01:57:16 +0000 (03:57 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 01:38:14 +0000 (03:38 +0200)]
Thomas Debesse [Tue, 21 Jun 2022 00:23:21 +0000 (02:23 +0200)]
Add some notes about NetRadiantCustom alternative code
Thomas Debesse [Tue, 21 Jun 2022 00:17:20 +0000 (02:17 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 04:00:15 +0000 (06:00 +0200)]
Add uncommited change from
db0e95d2 (merge
c5065eec /
f6b9708d )
Thomas Debesse [Mon, 20 Jun 2022 03:47:32 +0000 (05:47 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 03:47:15 +0000 (05:47 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:55:44 +0000 (04:55 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:51:00 +0000 (04:51 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:48:59 +0000 (04:48 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:45:20 +0000 (04:45 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:44:49 +0000 (04:44 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:44:41 +0000 (04:44 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:40:16 +0000 (04:40 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:39:53 +0000 (04:39 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:39:42 +0000 (04:39 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:38:12 +0000 (04:38 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:31:43 +0000 (04:31 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:30:37 +0000 (04:30 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:30:15 +0000 (04:30 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:29:55 +0000 (04:29 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:29:33 +0000 (04:29 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:29:25 +0000 (04:29 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:26:20 +0000 (04:26 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:26:13 +0000 (04:26 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:25:08 +0000 (04:25 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:24:45 +0000 (04:24 +0200)]
Thomas Debesse [Mon, 20 Jun 2022 02:24:01 +0000 (04:24 +0200)]
Thomas Debesse [Sun, 19 Jun 2022 21:48:39 +0000 (23:48 +0200)]
q3map2: fix dds/ prefixed dds image loading, don't break following formats
The dds/ prefix was mistakenly kept for ktx, crn and and webp loading.
Thomas Debesse [Sun, 19 Jun 2022 21:18:19 +0000 (23:18 +0200)]
bikeshedding: spacing
Thomas Debesse [Sun, 19 Jun 2022 21:08:55 +0000 (23:08 +0200)]
crunch: update submodule
Thomas Debesse [Sat, 18 Jun 2022 23:55:22 +0000 (01:55 +0200)]
radiant: rename AppData folder on Windows, also do not mixup with NRC
Configuration is now stored in %AppData%/NetRadiant
instead of %AppData%/NetRadiantSettings on Windows.
It's more consistent with the way of doing things
one windows and it also prevents to conflict with
NetRadiant Custom configuration.
Thomas Debesse [Sun, 19 Jun 2022 19:17:32 +0000 (21:17 +0200)]
radiant: restore original backup behaviour on Windows, ref
4d38a666
Restore original backup behaviour on Windows as NT symlinks are not handled
yet, see
4d38a666f972e7cbc2156865a2c99ecf2192c467 .
Thomas Debesse [Fri, 26 Nov 2021 00:21:23 +0000 (01:21 +0100)]
radiant: introduce transformpath lib and make use of it to transform engine path
Thomas Debesse [Sat, 18 Jun 2022 21:23:52 +0000 (23:23 +0200)]
radiant: rework the configuration of FHS and absolute FHS installation
Walter Doekes [Wed, 13 Apr 2022 21:50:40 +0000 (23:50 +0200)]
fix bobtoolz exclusion list path
"Failed To Load Exclusion List: /usr/bin/plugins/bt/bt-el1.txt"
when clicking on Tree Planter. Now it's rightly loaded from
"/usr/share/netradiant/plugins/bt/bt-el1.txt".