]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
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 [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 [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 [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: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 [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".
Walter Doekes [Wed, 13 Apr 2022 19:51:52 +0000 (21:51 +0200)]
use /usr/lib/x86_64-linux-gnu/netradiant path
Walter Doekes [Sat, 9 Apr 2022 17:48:22 +0000 (19:48 +0200)]
fix warning when not really starting netradiant
When doing netradiant --help, you would see:
GLib-CRITICAL **: 19:22:11.618: g_string_free: assertion 'string != NULL'
failed -- twice. This fixes it.
Walter Doekes [Sat, 9 Apr 2022 17:20:58 +0000 (19:20 +0200)]
do not rename() .map symlinks, but just overwrite them
If the user uses symlinks (perhaps from a carefully constructed CVS path),
we would break the symlink when saving the map file. Do not write a .bak
file in this case and just overwrite the symlink target.
Thomas Debesse [Tue, 15 Feb 2022 22:10:41 +0000 (22:10 +0000)]
Merge branch 'flake' into 'master'
Add nix flake support for the repo's quake tools (tools like q3map)
See merge request xonotic/netradiant!192
Thomas Debesse [Tue, 15 Feb 2022 22:08:33 +0000 (22:08 +0000)]
Merge branch 'make-git-dependency-optional' into 'master'
Make git dependency optional if GIT_VERSION is set
See merge request xonotic/netradiant!191
Thomas Debesse [Tue, 15 Feb 2022 22:04:45 +0000 (22:04 +0000)]
Merge branch 'reproducible' into 'master'
Reproducible builds: omit build date and q3map version from bsp files
See merge request xonotic/netradiant!190
Antoine Fontaine [Thu, 10 Feb 2022 18:29:44 +0000 (19:29 +0100)]
Add nix flake support for the repo's quake tools (tools like q3map)
A nix flake allows building and running the software with the Nix
package manager, used in NixOS or standalone. You can consider as
a package or repo description.
In this case, this only packages the quake tool binaries, that is
h2data, q2map, q3data, q3map2 and qdata3.
Antoine Fontaine [Thu, 10 Feb 2022 21:14:17 +0000 (22:14 +0100)]
Make git dependency optional if GIT_VERSION is set
Thomas Debesse [Tue, 11 Jan 2022 10:53:24 +0000 (11:53 +0100)]
mime: fix mimetype and file type association
Antoine Fontaine [Mon, 3 Jan 2022 16:41:01 +0000 (17:41 +0100)]
Reproducible builds: omit build date and q3map version from bsp files
Thomas Debesse [Thu, 23 Dec 2021 00:00:34 +0000 (01:00 +0100)]
radiant: store preferences in Library/Application Support on macOS
Thomas Debesse [Fri, 24 Dec 2021 17:00:01 +0000 (17:00 +0000)]
Merge branch 'illwieckz/fixorigin' into 'master'
q3map2: Import two commits from netradiant-custom by Garux (fix debugorigin crash and uninitialized value)
See merge request xonotic/netradiant!188
Thomas Debesse [Thu, 23 Dec 2021 19:20:53 +0000 (19:20 +0000)]
Merge branch 'illwieckz/picomaterial' into 'master'
pico: detect intentional material name and do not replace them with texture
See merge request xonotic/netradiant!187
Thomas Debesse [Thu, 23 Dec 2021 14:41:24 +0000 (15:41 +0100)]
pico: detect intentional material name and do not replace them with texture
Detect intentional material name to not replace it with texture name.
Reimplement commits by Garux:
https://github.com/Garux/netradiant-custom/commit/
1bd3e7ae186b55fb61e3738d2493432c0b1f5a7b
https://github.com/Garux/netradiant-custom/commit/
ea21eee2254fb2e667732d8f1b0f83c439a89bfa
This attempts to restore proper material behaviour when the mapper knows what he is doing,
also called Julius' case or correct case because Julius is always correct™
while keeping the fallback for other situations, also called newbie's case
which may be compatible with third-party tools not following Quake 3 conventions.
See: https://gitlab.com/xonotic/netradiant/-/merge_requests/179#note_777324051
<3 @julius__ @Garux
Garux [Tue, 21 Dec 2021 10:48:33 +0000 (13:48 +0300)]
fix uninitialized value use in IlluminateRawLightmap
Garux [Tue, 21 Dec 2021 10:20:41 +0000 (13:20 +0300)]
fix -debugorigin crash in IlluminateVertexes
Thomas Debesse [Sun, 28 Nov 2021 00:39:02 +0000 (01:39 +0100)]
library-bundler: proper xargs usage
Prevent this warning:
xargs: warning: options --max-args and --replace/-I/-i are mutually exclusive, ignoring previous --max-args value
Thomas Debesse [Sun, 28 Nov 2021 00:38:43 +0000 (01:38 +0100)]
readme: update
Thomas Debesse [Tue, 9 Nov 2021 12:39:55 +0000 (13:39 +0100)]
radiant: list games alphabetically
Note: for some unknown reason it sorts “Quake 3” after “Quake 4”.
Thomas Debesse [Tue, 17 Aug 2021 07:34:06 +0000 (09:34 +0200)]
gamepacks: add more gamepacks and turn some into git-based ones
Thomas Debesse [Tue, 9 Nov 2021 03:00:35 +0000 (04:00 +0100)]
bikeshedding: better indentation
Thomas Debesse [Tue, 9 Nov 2021 02:16:00 +0000 (03:16 +0100)]
bikeshedding: better string syntax
Thomas Debesse [Sat, 2 Oct 2021 01:13:51 +0000 (03:13 +0200)]
mainframe: request texture browser to show all or common textures on VFS refresh
Thomas Debesse [Thu, 21 Oct 2021 12:11:32 +0000 (14:11 +0200)]
cmake: fix gtkglex build configuration issues
Thomas Debesse [Mon, 8 Nov 2021 22:22:20 +0000 (22:22 +0000)]
Merge branch 'focus-ok-button' into 'master'
Focus "ok" button on modal windows by default
See merge request xonotic/netradiant!186
Thomas Debesse [Mon, 8 Nov 2021 22:21:39 +0000 (22:21 +0000)]
Merge branch 'dds' into 'master'
radiant: also list images from dds/textures/ as textures/ ones, <3 Ballerburg
See merge request xonotic/netradiant!185
Thomas Debesse [Fri, 27 Aug 2021 23:12:42 +0000 (01:12 +0200)]
radiant: also list images from dds/textures/ as textures/ ones
Thomas Debesse [Tue, 2 Nov 2021 16:40:46 +0000 (17:40 +0100)]
gamepack-manager: fix Kingpin gamepack download url
Thomas Debesse [Wed, 29 Sep 2021 23:37:09 +0000 (01:37 +0200)]
radiant/layouts: add a single-window layout
Antoine Fontaine [Wed, 29 Sep 2021 13:56:56 +0000 (15:56 +0200)]
Focus "ok" button on modal windows by default
Thomas Debesse [Wed, 29 Sep 2021 13:44:30 +0000 (15:44 +0200)]
daemonmap: sync submodule
Thomas Debesse [Wed, 29 Sep 2021 13:42:57 +0000 (15:42 +0200)]
gtkglext: some fixes and improvements
Thomas Debesse [Fri, 27 Aug 2021 21:25:25 +0000 (23:25 +0200)]
radiant: ask user to restart the editor when map load switches the brush format
Thomas Debesse [Tue, 10 Aug 2021 04:56:30 +0000 (04:56 +0000)]
Merge branch 'iqm' into 'master'
add IQM format support into lib/picomodel
See merge request xonotic/netradiant!184
Marco Hladik [Thu, 29 Jul 2021 15:44:53 +0000 (17:44 +0200)]
add IQM format support into lib/picomodel
This is a combination of 2 commits.
- add IQM format support into lib/picomodel
https://github.com/TTimo/GtkRadiant/commit/
3408871d79d51b9bf27f0098cd3bc4edd92b105d
- Merge illwieckz their portability fix
https://github.com/TTimo/GtkRadiant/commit/
be993ad4222fc9fc28080a8ba8f962da82c7b1f4
See https://github.com/TTimo/GtkRadiant/pull/668
Thomas Debesse [Fri, 30 Jul 2021 02:56:18 +0000 (04:56 +0200)]
plugins: delete iqmmodel, picomodel will implement iqm instead
ballerburg9005 [Thu, 24 Jun 2021 22:58:54 +0000 (00:58 +0200)]
radiant: add entries to increase and decrease FOV in camera menu
ballerburg9005 [Thu, 24 Jun 2021 22:31:28 +0000 (00:31 +0200)]
radiant: make camera FOV modifiable and add slider in preferences
ballerburg9005 [Thu, 24 Jun 2021 22:31:28 +0000 (00:31 +0200)]
radiant: Increase the far-clip distance
Thomas Debesse [Wed, 16 Jun 2021 20:31:06 +0000 (22:31 +0200)]
q3map2: increase VFS_MAXDIRS because multiple pakpaths with many pk3dirs can lead to high list of VFS directories
Thomas Debesse [Mon, 3 May 2021 23:10:42 +0000 (23:10 +0000)]
Merge branch 'gtk3' into 'master'
Disable wayland backend on Linux and BSD
See merge request xonotic/netradiant!178
Antoine Fontaine [Sun, 28 Mar 2021 15:03:10 +0000 (17:03 +0200)]
various: readability improvements
Antoine Fontaine [Sun, 28 Mar 2021 14:15:09 +0000 (16:15 +0200)]
various: drop dead code
Antoine Fontaine [Sun, 28 Mar 2021 11:49:11 +0000 (13:49 +0200)]
radiant/brush: use std::shared_ptr
Antoine Fontaine [Sat, 27 Mar 2021 18:45:47 +0000 (19:45 +0100)]
Correct IMPL call
Antoine Fontaine [Fri, 26 Mar 2021 18:30:35 +0000 (19:30 +0100)]
Disable wayland backend on Linux and BSD
Better rely on XWayland for now. If someone wants to override it, set
GDK_BACKEND=wayland
Antoine Fontaine [Tue, 23 Mar 2021 12:19:35 +0000 (13:19 +0100)]
radiant: replace StringBuffer with std::string
Thomas Debesse [Mon, 3 May 2021 22:46:17 +0000 (00:46 +0200)]
q3map2/help: only read terminal columns using ioctl on Posix systems
It does not work on Windows with MSYS2.
It is verified to work on Linux, FreeBSD and macOS.
Antoine Fontaine [Mon, 3 May 2021 19:52:15 +0000 (21:52 +0200)]
quake3/help: move away from termcap
termcap is old and crusty. terminfo seems more recent (lol), but maybe
we can get away without adding any dependency :)
On my system, no -ltermcap exists. (Well, except a compat one provided
by zsh for some reason.)
Thomas Debesse [Mon, 3 May 2021 06:11:39 +0000 (08:11 +0200)]
q3map2/help: some improvements
- add some instructions from https://en.m.wikibooks.org/wiki/Q3Map2/Light
- make sure every comment starts capitalized
Thomas Debesse [Mon, 3 May 2021 05:41:22 +0000 (07:41 +0200)]
q3map2/games: fix quakelive home path
Thomas Debesse [Mon, 3 May 2021 05:34:11 +0000 (07:34 +0200)]
q3map2/games: bikeshedding
Thomas Debesse [Mon, 3 May 2021 05:31:09 +0000 (07:31 +0200)]
q3map2/games: bikeshedding
Thomas Debesse [Mon, 3 May 2021 05:26:14 +0000 (07:26 +0200)]
q3map2/games: add warsow and warfork
Thomas Debesse [Mon, 3 May 2021 04:57:23 +0000 (06:57 +0200)]
q3map2/help: remove typo
Thomas Debesse [Mon, 3 May 2021 04:57:10 +0000 (06:57 +0200)]
q3map2/help: add -help all
Thomas Debesse [Mon, 3 May 2021 04:45:05 +0000 (06:45 +0200)]
q3map2/help: read columns from terminal
Thomas Debesse [Mon, 3 May 2021 04:38:39 +0000 (06:38 +0200)]
q3map2/help: use a variable for the terminal columns
Thomas Debesse [Mon, 3 May 2021 04:23:06 +0000 (06:23 +0200)]
q3map2/help: list supported games
Thomas Debesse [Mon, 3 May 2021 04:01:33 +0000 (06:01 +0200)]
q3map2/games: add openarena, q3rally and worldofpadman
Thomas Debesse [Mon, 3 May 2021 03:06:18 +0000 (05:06 +0200)]
gamepack-manager: make possible to list and install validated games easily
Thomas Debesse [Mon, 3 May 2021 02:17:58 +0000 (04:17 +0200)]
netradiant: detect and add missing ExtraQ3map2Args in build menus
- detect q3map2 and enable ExtraQ3map2Args feature for unmaintained gamepacks
Thomas Debesse [Mon, 3 May 2021 01:08:34 +0000 (03:08 +0200)]
q3map2: switch back to fastallocate option name to reduce diff with NRC, keep compatibility with fastlightmapsearch
Thomas Debesse [Thu, 15 Apr 2021 12:53:55 +0000 (14:53 +0200)]
gamepack-manager: fetch world of padman gamepack from git
Antoine Fontaine [Tue, 27 Apr 2021 19:14:13 +0000 (21:14 +0200)]
import GCC10 fix by afontain
See: https://gitlab.com/xonotic/netradiant/-/issues/129#note_544674397
Garux [Mon, 23 Mar 2020 16:55:03 +0000 (19:55 +0300)]
picomodel::ase: support standard empty bitmap name 'none'
Garux [Fri, 22 Feb 2019 20:31:56 +0000 (23:31 +0300)]
prevent string overflow in radiant md2 loader
Garux [Fri, 22 Feb 2019 20:29:04 +0000 (23:29 +0300)]
* picomodel: fix md2 loader
duplicates management algorithm isn't as quick, as in old code, but quick nuff + working
Garux [Sat, 29 Sep 2018 18:34:03 +0000 (21:34 +0300)]
fix some strncpy use
Note by illwieckz: partial cherry-pick, vfsListShaderFiles is missing upstream
Garux [Sat, 29 Sep 2018 11:39:10 +0000 (14:39 +0300)]
* picomodel: do some guessings about shader paths to handle more cases out of the box; ones are based on material and diffuse map names:
name w/o path: assume textures are in the folder, where model file is
absolute path or with ..: try to cut at "/models/" or "/textures/" (as if leading to game folders); do previous case, if not
strip extensions and turn slashes to forward ones anytime
* picomodel::obj: fix diffuse map paths loading from .mtl
Garux [Sat, 9 Jun 2018 22:27:49 +0000 (01:27 +0300)]
picomodel: white default color of fm, md2 (was one white and rest black)
unified picoColor_white
Thomas Debesse [Tue, 27 Apr 2021 01:30:54 +0000 (03:30 +0200)]
q3map2: do not leak user temporary paths
do not write in "_q3map2_cmdline" worldspawn entity key user paths like:
-lightmapdir
-bspfile
-prtfile
-srffile
-linfile
Thomas Debesse [Sat, 24 Apr 2021 01:10:57 +0000 (01:10 +0000)]
Merge branch 'gcc10' into 'master'
GCC10
See merge request xonotic/netradiant!181
Thomas Debesse [Sat, 24 Apr 2021 01:04:39 +0000 (03:04 +0200)]
radiant: also filter subtelhint with “Filter hints” menu, <3 @Viech
Thomas Debesse [Sat, 24 Apr 2021 00:33:31 +0000 (02:33 +0200)]
vfs/dpk: properly find the dpkdir, even for maps not in maps/, typically mapmodel sources
Thomas Debesse [Wed, 7 Apr 2021 04:44:00 +0000 (06:44 +0200)]
q3map2/image: also look for images path without extension but with dot in their name
make sure that if a shader contains path to textures/directory/some.thing
q3map2 also look for textures/directory/some.thing.tga
instead of only looking for textures/directory/some.tga
Antoine Fontaine [Wed, 14 Apr 2021 21:44:28 +0000 (23:44 +0200)]
Fix possible security vulnerability and fatal error
Antoine Fontaine [Tue, 30 Mar 2021 18:26:34 +0000 (20:26 +0200)]
Fix cast warning
Antoine Fontaine [Wed, 31 Mar 2021 19:19:14 +0000 (21:19 +0200)]
fix include
Thomas Debesse [Thu, 25 Mar 2021 22:42:04 +0000 (23:42 +0100)]
macos: add --debug option to NetRadiant build to run with lldb