]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
Thomas Debesse [Mon, 21 Dec 2020 16:12:51 +0000 (17:12 +0100)]
easy-builder: also build builtins, make macos use builtin gtkglext
Thomas Debesse [Tue, 22 Dec 2020 19:08:31 +0000 (20:08 +0100)]
macos: disable drawing xorrectangle (rectangle selection feedback)
disable drawing xorrectangle (rectangle selection feedback)
to workaround crash, selection still works
Thomas Debesse [Mon, 21 Dec 2020 13:34:33 +0000 (14:34 +0100)]
macos: workaround faulty destructor
Thomas Debesse [Mon, 21 Dec 2020 00:47:21 +0000 (01:47 +0100)]
gtkglext: build macos non-x11 gtkglext
Thomas Debesse [Thu, 17 Dec 2020 20:54:29 +0000 (21:54 +0100)]
gtkglext: build and bundle built-in gtkglext
There is a chicken-and-egg problem, so the build must be done in two steps,
First build built-in libraries:
cmake -G "Unix Makefiles" -S. -Bbuild -DBUILTIN_GTKGLEXT=ON -DBUNDLE_LIBRARIES=ON
cmake --build build --parallel $(nproc) -- builtins
Then detect the built-in libraries and build netradiant and install the bundle as usual:
cmake -S. -Bbuild
cmake --build build --parallel $(nproc) install
There is no need to set cmake options on second step but cmake still has to be called again to detect the new files.
Thomas Debesse [Thu, 17 Dec 2020 18:47:59 +0000 (19:47 +0100)]
bundler: detect missing libraries
Thomas Debesse [Tue, 15 Dec 2020 12:21:38 +0000 (13:21 +0100)]
gtkglext: build builtin GtkGLExt as cmake external project
Do:
cmake -G "Unix Makefiles" -S. -Bbuild -DBUILTIN_GTKGLEXT=ON
cmake --build build --parallel $(nproc)
A GtkGLExt tree knonn to build will be downloaded into:
build/gtkglext-prefix/src/gtkglext
and installed into:
build/external
NetRadiant does not build against this builtin GtkGLExt yet.
Thomas Debesse [Wed, 1 Jul 2020 16:20:25 +0000 (18:20 +0200)]
q3map2/light_bounce: prevent infinite loop on obscure bias compute
New code produces same result without loop at all, so
it cannot fall in infinite loop, and it is faster in
use cases requiring more than one loop in previous code.
The Unvanquished vega map is known to trigger the bug:
https://github.com/UnvanquishedAssets/map-vega_src.dpkdir
I reproduced it multiple time on various hardware (8 core FX-9590,
12 core/24 thread Ryzen 9 3900X) with commit
af40508 and using
final compilation profile edited to use -fastbounce instead
of -fast option.
The symptom is simple, q3map2 stucks there:
--- Radiosity (bounce 1 of 8) ---
--- RadCreateDiffuseLights ---
0...1...2...3..
Or somewhere else in that progression bar given your hardware
and the amount of core your CPU has.
When stuck, all the CPU cores are running 100% but the thread
never returns (a strace can reveals it, a gdb backtrace too).
Thanks to @slipher for the precious advices and improving my first
attempt to fix it.
For more information on the issue, I asked:
> which negative value never can become positive
> when incremented infinitely?
slipher said:
> for a double, any value less than -2^53 would have this property
> don't know for float off the top of my head
But then, it means that's theorically verified this loop was able
to run forever in some case.
I don't know what this code is doing anyway, but at least we can
keep the behaviour without requiring to understand it.
Garux [Wed, 25 Mar 2020 18:21:07 +0000 (21:21 +0300)]
q3map2 * fix: do not affect styled lightmaps by floodlight
port of https://github.com/id-tech-3-tools/map-compiler/pull/12
https://github.com/id-tech-3-tools/map-compiler/commit/
87b8589a3a5069c482243bb33c587fc18911746c
Thomas Debesse [Sat, 23 May 2020 12:31:16 +0000 (14:31 +0200)]
gamepacks: add Alien Arena (GPL)
Thomas Debesse [Mon, 25 May 2020 08:54:22 +0000 (08:54 +0000)]
Merge branch 'vfs' into 'master'
Some VFS fixes: attempt to load .pak and .wad, load png fallback even if game does not support png, do not load engine path twice
Closes #141 and #139
See merge request xonotic/netradiant!166
Thomas Debesse [Fri, 22 May 2020 16:17:35 +0000 (18:17 +0200)]
radiant/texwindow: use TextureBrowser_showWads when possible
instead of doing alternatively:
- !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) )
- TextureBrowser_showWads()
the last one calling:
- !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) )
Thomas Debesse [Fri, 22 May 2020 16:06:50 +0000 (18:06 +0200)]
radiant/texwindow: only show per-wad textures, update texture window title with wad name
Thomas Debesse [Fri, 22 May 2020 15:04:29 +0000 (17:04 +0200)]
radiant/texwindow: beautify wad list
Thomas Debesse [Fri, 22 May 2020 12:58:11 +0000 (14:58 +0200)]
radiant/texwindow: test .wad file extension case-insensitively on all systems, fix #139
Thomas Debesse [Thu, 21 May 2020 22:43:20 +0000 (00:43 +0200)]
radiant/image: load fallback images with png loader even if game does not support png, fix #141
Current implementation has a minor issue, when "Hide Fallback" option is
disabled, the fallback image does not appear in texture browser before radiant
makes use of it (for example creating a brush before selecting a texture).
Since "Hide Fallback" option is enabled by default and it never makes sense
to apply those fallback intentionally, I don't care for the moment.
I would like to see a better implementation that would work for all
editor images (like the one set with `qer_editorImage` shader keyword).
Thomas Debesse [Fri, 22 May 2020 08:34:43 +0000 (10:34 +0200)]
radiant/vfs: do not load enginepath twice
Do not load engine path twice when the home path and the engine path is the same,
This happens when a game does not have home path.
Also rework a bit that code, and prints useful information on console.
Thomas Debesse [Thu, 21 May 2020 18:22:26 +0000 (20:22 +0200)]
radiant/vfs: rework vfs loading, attempt to load wads and paks, ref #139
Also load .pak extracted as .pakdir (can be done using unpak).
NOTE: that feature would have to be supported by map compilers to
be useful. This is still handy for testing purpose so I'm keeping it.
Also prints on console the opened pak directories.
Azamat H. Hackimov [Thu, 21 May 2020 01:08:39 +0000 (04:08 +0300)]
Fixing compilation with -DBUILD_SHARED_LIBS=ON
Libraries under libs should be forced STATIC since there circular
dependencies and implicit linking with external libraries. Otherwise
compilation will fails with underlinking errors.
Thomas Debesse [Thu, 21 May 2020 09:24:59 +0000 (11:24 +0200)]
daemonmap: update submodule for fixes for compilation with '-DBUILD_SHARED_LIBS=ON'
Thomas Debesse [Sun, 17 May 2020 15:53:01 +0000 (15:53 +0000)]
Merge branch 'illwieckz/gcc10' into 'master'
Fix compilation with GCC 10, <3 @SpiKe, fix #140
Closes #140
See merge request xonotic/netradiant!163
Thomas Debesse [Fri, 15 May 2020 03:33:45 +0000 (05:33 +0200)]
daemonmap: update submodule
Thomas Debesse [Fri, 15 May 2020 03:18:01 +0000 (05:18 +0200)]
h2data: use static for homonyms
Thomas Debesse [Fri, 15 May 2020 02:51:27 +0000 (04:51 +0200)]
q3data: already defined in cmdlib.h
Thomas Debesse [Fri, 15 May 2020 02:21:03 +0000 (04:21 +0200)]
q2map: declare once, define as extern
Thomas Debesse [Fri, 15 May 2020 02:11:36 +0000 (04:11 +0200)]
q2map: do not define globally when used locally
Thomas Debesse [Thu, 14 May 2020 11:18:25 +0000 (13:18 +0200)]
h2data: do not redefine if unused
Thomas Debesse [Thu, 14 May 2020 11:14:19 +0000 (13:14 +0200)]
h2data: declare once, define as extern
Thomas Debesse [Thu, 14 May 2020 11:04:30 +0000 (13:04 +0200)]
q3map2: declare or define with Q_EXTERN
Thomas Debesse [Thu, 14 May 2020 11:02:03 +0000 (13:02 +0200)]
q3map2: already defined in inout.h
Thomas Debesse [Fri, 24 Apr 2020 23:34:51 +0000 (01:34 +0200)]
readme: add download link, make sure people download source using git, and other rewording
Thomas Debesse [Sun, 19 Apr 2020 09:49:36 +0000 (11:49 +0200)]
q3map2: generate unvanquished minimap sidecar file
also enable the option for work-in-progress smokinguns port on dæmon
Thomas Debesse [Sat, 18 Apr 2020 08:03:56 +0000 (10:03 +0200)]
q3map2: remove useless zlib dependency
Rudolf Polzer [Sun, 19 Apr 2020 00:41:25 +0000 (02:41 +0200)]
Comment ColorToBytesNonZero and fix zero detection in light.c.
Rudolf Polzer [Sat, 18 Apr 2020 00:10:39 +0000 (20:10 -0400)]
Fix ioq3 compatibility bug with lightgrid and only one light.
Correct math requires the ambient component of the lightgrid to be zero
in that case. However, ioq3 ignores lightgrid cells with all zero ambient
value, EVEN if the directed value is nonzero.
This change sets the ambient value to #010101 if it'd be pitch black. This
should be a minimal change without affecting light hue that fixes
lightgrid rendering. In engines like DarkPlaces, almost no map should
look different from this.
Fixes #137.
Thomas Debesse [Mon, 6 Apr 2020 00:16:27 +0000 (02:16 +0200)]
easy-builder: make it compatible with Ubuntu 18.04/CMake 3.10
on CMake 3.10i, options -S and -B were not supported yet
Thomas Debesse [Sun, 5 Apr 2020 03:57:55 +0000 (05:57 +0200)]
readme: update
Thomas Debesse [Sun, 5 Apr 2020 03:53:57 +0000 (05:53 +0200)]
Merge branch 'clang' into 'master'
Thomas Debesse [Sun, 5 Apr 2020 03:52:42 +0000 (05:52 +0200)]
readme: gcc is not required anymore on FreeBSD and macOS
Thomas Debesse [Sun, 5 Apr 2020 03:37:54 +0000 (05:37 +0200)]
easy-builder: do not enforce gcc on FreeBSD and macOS
slipher [Sun, 5 Apr 2020 03:09:07 +0000 (05:09 +0200)]
clang/error: fix: call to convertToOpaque is ambiguous
slipher [Sun, 5 Apr 2020 02:13:48 +0000 (04:13 +0200)]
clang/error: fix: non-type template argument refers to function Export that does not have linkage
slipher [Sun, 5 Apr 2020 01:44:55 +0000 (03:44 +0200)]
clang/error: fix: non-type template argument refers to function ExportThunk that does not have linkage
Thomas Debesse [Sat, 4 Apr 2020 19:23:28 +0000 (21:23 +0200)]
radiant/build: add comment telling MaingFrame_getWindow() is suspicious
Thomas Debesse [Sat, 4 Apr 2020 09:09:58 +0000 (11:09 +0200)]
docs: set index.html to redirect
Thomas Debesse [Sat, 4 Apr 2020 08:39:28 +0000 (10:39 +0200)]
contrib: update urls and names
Thomas Debesse [Sat, 4 Apr 2020 08:07:56 +0000 (10:07 +0200)]
radiant/build: center buildmenu editor on screen
I haven't managed to center it on main windows
centering on screen is still better than top -left
Thomas Debesse [Sat, 4 Apr 2020 05:21:15 +0000 (07:21 +0200)]
bikeshedding: unifying some variable in contrib/bobtoolz
Thomas Debesse [Sat, 4 Apr 2020 04:54:05 +0000 (06:54 +0200)]
bikeshedding: unifying some variable in contrib/shaderplug
Thomas Debesse [Sat, 4 Apr 2020 05:42:55 +0000 (07:42 +0200)]
contrib/bobtoolz: center some dialog windows on main window
also rename the Path Plotter window title correctly
Thomas Debesse [Sat, 4 Apr 2020 04:41:46 +0000 (06:41 +0200)]
contrib/brushexport: center export window on main window
Thomas Debesse [Sat, 4 Apr 2020 04:23:10 +0000 (06:23 +0200)]
contrib/prtview: center config window on main window
also center color picker on config window
Thomas Debesse [Sat, 4 Apr 2020 07:50:54 +0000 (09:50 +0200)]
radiant/xywindow: center background select error message on main window
Thomas Debesse [Sat, 4 Apr 2020 06:07:10 +0000 (08:07 +0200)]
radiant/prefs: center preferences window on main window
Thomas Debesse [Sat, 4 Apr 2020 05:13:15 +0000 (07:13 +0200)]
radiant: center messagebox on main window
Thomas Debesse [Sat, 4 Apr 2020 02:32:17 +0000 (04:32 +0200)]
radiant/about: reword message
Thomas Debesse [Sat, 4 Apr 2020 02:26:15 +0000 (04:26 +0200)]
radiant/about: rework layout
Thomas Debesse [Sat, 4 Apr 2020 02:02:17 +0000 (04:02 +0200)]
radiant/about: add link to website
Thomas Debesse [Sat, 4 Apr 2020 01:53:47 +0000 (03:53 +0200)]
radiant/about: make issue tracker url clickable
Thomas Debesse [Sat, 4 Apr 2020 01:23:47 +0000 (03:23 +0200)]
contrib/bobtoolz: unify about dialog construction
Thomas Debesse [Sat, 4 Apr 2020 01:14:50 +0000 (03:14 +0200)]
contrib/sunplug: unify about dialog construction
Thomas Debesse [Sat, 4 Apr 2020 01:10:12 +0000 (03:10 +0200)]
contrib/prtview: unify about dialog construction
Thomas Debesse [Sat, 4 Apr 2020 01:36:42 +0000 (03:36 +0200)]
cmake: install global.xlink
Thomas Debesse [Sat, 4 Apr 2020 01:30:28 +0000 (03:30 +0200)]
global.xlink: fix q3map2 handbook url (was dead link)
Thomas Debesse [Sat, 4 Apr 2020 01:29:27 +0000 (03:29 +0200)]
global.xlink: update netradiant website url
Thomas Debesse [Sat, 4 Apr 2020 00:43:57 +0000 (02:43 +0200)]
daemonmap: sync submodule to print own git version
Thomas Debesse [Sat, 4 Apr 2020 00:35:21 +0000 (02:35 +0200)]
cmake: drop useless version.h
Thomas Debesse [Sat, 4 Apr 2020 00:25:11 +0000 (02:25 +0200)]
tools/cmake: do not compute git version again
Thomas Debesse [Mon, 30 Mar 2020 02:27:13 +0000 (04:27 +0200)]
bundle: make daemonmap buildable and bundlable like other tools as submodule
Thomas Debesse [Tue, 31 Mar 2020 23:37:26 +0000 (01:37 +0200)]
easy-builder: make possible to check for more than one submodule
Thomas Debesse [Tue, 31 Mar 2020 16:48:23 +0000 (18:48 +0200)]
easy-builder: strip release binaries, support older cmake
- use `install/strip` target for release build
- CMake used in Ubuntu bionic (currently used to build
redistributable packages, old enough to be older than
most of the commonly used distributions) does not
support -S option yet
Thomas Debesse [Tue, 31 Mar 2020 00:44:09 +0000 (02:44 +0200)]
readme: use cmake -S instead of undocumented -H
undocumented -H for source directory was replaced
by documented -S and -H is now an alias to --help
Thomas Debesse [Tue, 31 Mar 2020 00:40:34 +0000 (02:40 +0200)]
easy-builder: improvements
- handle arguments with spaces properly
- provide fallback for nproc
- replace cmake undocumented -H with -S
- do not require to change directory
Thomas Debesse [Sun, 29 Mar 2020 20:19:59 +0000 (22:19 +0200)]
bikeshedding: minor readme fix
Thomas Debesse [Sun, 29 Mar 2020 16:47:33 +0000 (18:47 +0200)]
q3map2/smokinguns: fix .tex writing, <3 @vloup
Thanks ElBarto (@vloup) for reporting this
Garux [Sun, 29 Mar 2020 00:59:32 +0000 (01:59 +0100)]
bikeshedding: reduce diff noise with Garux tree
see:
https://github.com/Garux/netradiant-custom/commit/
4292115ef741ff066b382c094f8c7814afaccf59 #diff-386c03feac6f15ccc15c4dab7bb97320R342
that's not fair
Thomas Debesse [Sun, 29 Mar 2020 00:28:29 +0000 (01:28 +0100)]
q3map2: pad with zero, not with null pointers, ref #160
see:
https://gitlab.com/xonotic/netradiant/-/merge_requests/160#note_287938815
Thomas Debesse [Fri, 27 Mar 2020 18:11:38 +0000 (19:11 +0100)]
radiant/buildmenu: rename ".[ExecutableType]" as "[ExecutableExt]"
- introduce GDEF_OS_EXE_EXT
- no need for RADIANT_EXECUTABLE anymore
- keep "[ExecutableType]" parsing but it looks useless
Thomas Debesse [Sat, 28 Mar 2020 00:52:57 +0000 (01:52 +0100)]
radiant/buildmenu: fixup, ref #138
Thomas Debesse [Fri, 27 Mar 2020 16:32:57 +0000 (17:32 +0100)]
radiant/buildmenu: better executable extension strip, ref #138
this fixes issue #138 on my end
Thomas Debesse [Fri, 27 Mar 2020 00:29:04 +0000 (01:29 +0100)]
bikeshedding: some touchup on library-bundler
Thomas Debesse [Fri, 27 Mar 2020 15:43:17 +0000 (15:43 +0000)]
Merge branch 'missingarg' into 'master'
q3map2: fix segfault when missing bspfile arg on light stage
See merge request xonotic/netradiant!161
Thomas Debesse [Fri, 27 Mar 2020 00:52:28 +0000 (01:52 +0100)]
q3map2: fix segfault when missing bspfile arg on light stage
Thomas Debesse [Thu, 23 Jan 2020 21:53:18 +0000 (21:53 +0000)]
Merge branch 'memoryfixes' into 'master'
q3map2: fix memory errors and misuses
See merge request xonotic/netradiant!160
Thomas Debesse [Thu, 23 Jan 2020 21:27:12 +0000 (22:27 +0100)]
q3map2: use safe_malloc0 when safe_malloc is followed by a memset to 0 with the same size
Thomas Debesse [Thu, 23 Jan 2020 18:54:31 +0000 (19:54 +0100)]
q3map2: zero the verts array on initialization, verts are tested to not be null in FindMetaVertex()
Thomas Debesse [Tue, 14 Jan 2020 08:01:29 +0000 (09:01 +0100)]
q3map: magic string, know about the asctime's trailing \n
Thomas Debesse [Tue, 14 Jan 2020 08:00:14 +0000 (09:00 +0100)]
q3map: magic string, no closing parenthesis
Thomas Debesse [Tue, 14 Jan 2020 10:01:58 +0000 (11:01 +0100)]
tools/quake2: use same strupr other tools use
Thomas Debesse [Tue, 14 Jan 2020 10:00:47 +0000 (11:00 +0100)]
tools/hd2data: strupr is windows only, define it elsewhere
some compiler may ask if strstr would have to be used instead, which is wrong
Thomas Debesse [Tue, 14 Jan 2020 09:34:48 +0000 (10:34 +0100)]
q3map2/vis: do not read outside of script before detecting end of script
Thomas Debesse [Tue, 14 Jan 2020 08:42:37 +0000 (09:42 +0100)]
autoexpand: add an alternative way to autoexpand while zeroing the allocated memory
use it to allocate shader lump, without that, garbage from uninitialized memory may be written
after the ending \0 of strings
Thomas Debesse [Tue, 14 Jan 2020 07:06:47 +0000 (08:06 +0100)]
bsp lump write: pad with zeros, not with random unitialized memory data
Thomas Debesse [Tue, 14 Jan 2020 06:28:50 +0000 (07:28 +0100)]
q3map2/vfs: free temporary allocated dirlist when not used
Thomas Debesse [Tue, 14 Jan 2020 05:52:08 +0000 (06:52 +0100)]
LoadPNGBuffer: use safe_malloc0 to allocate a zeored imate buffer
valgrind reports there may be issues if this is not initialized
Thomas Debesse [Tue, 14 Jan 2020 05:17:15 +0000 (06:17 +0100)]
introduce safe_malloc0, also 0 the memory before usage
note called safe_calloc because calloc does not have the same syntax
and this safe_malloc0 uses malloc syntax
Thomas Debesse [Tue, 14 Jan 2020 05:12:06 +0000 (06:12 +0100)]
unnecessary SAFE_MALLOC ifdef: always defined
Thomas Debesse [Tue, 14 Jan 2020 04:47:47 +0000 (05:47 +0100)]
valgrind: Conditional jump or move depends on uninitialised value
Thomas Debesse [Tue, 14 Jan 2020 04:39:45 +0000 (05:39 +0100)]
fix a buffer overflow due to a string not being large enough to store ending \0
Thomas Debesse [Mon, 20 Jan 2020 19:52:02 +0000 (19:52 +0000)]
Merge branch 'easy-builder' into 'master'
introduce easy-builder script
See merge request xonotic/netradiant!157