]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
Thomas Debesse [Mon, 5 Aug 2019 01:27:37 +0000 (03:27 +0200)]
bundle: more linux bundling
Thomas Debesse [Thu, 1 Aug 2019 19:15:08 +0000 (21:15 +0200)]
bundle: linux shared lib bundling
- always rely on up-to-date x11 and gl libraries, bundling them will break on future distros
Thomas Debesse [Thu, 1 Aug 2019 19:20:23 +0000 (21:20 +0200)]
bundle: a bunch of improvements
Thomas Debesse [Thu, 1 Aug 2019 20:30:27 +0000 (22:30 +0200)]
bundle: chmod +x library-bundler
Thomas Debesse [Thu, 1 Aug 2019 22:28:49 +0000 (00:28 +0200)]
cmake: BUNDLE_LIBRARIES disables FHS_INSTALL
Thomas Debesse [Thu, 1 Aug 2019 19:15:34 +0000 (21:15 +0200)]
bikeshedding: spacing
Thomas Debesse [Sun, 4 Aug 2019 19:38:19 +0000 (19:38 +0000)]
Merge branch 'floating' into 'master'
floating window: use HINT_UTILITY on Windows but normal window everywhere else, <3 @SpiKe, ref !140 !147
See merge request xonotic/netradiant!152
Thomas Debesse [Sun, 4 Aug 2019 19:29:24 +0000 (21:29 +0200)]
floating window: use HINT_UTILITY on Windows but normal window everywhere else, ref !140 !147
GDK_WINDOW_TYPE_HINT_UTILITY would have been a good option for any OS but KDE is known to be broken (such window is not put in focus).
We must use GDK_WINDOW_TYPE_HINT_UTILITY on Windows to be sure the window is resizeable and to avoid the infinite minimize-restore loop.
<3 @SpiKe
Thomas Debesse [Sat, 27 Jul 2019 20:21:53 +0000 (20:21 +0000)]
Merge branch 'kingpin' into 'master'
add Kingpin gamepack
See merge request xonotic/netradiant!149
Thomas Debesse [Wed, 24 Jul 2019 23:22:07 +0000 (01:22 +0200)]
add Kingpin gamepack
Thomas Debesse [Sat, 27 Jul 2019 20:15:35 +0000 (20:15 +0000)]
Merge branch 'q3map2-cmdline-help' into 'master'
q3map2: add more to q3map2 -help and fix some issues with command-line processing
See merge request xonotic/netradiant!150
Zack Middleton [Wed, 24 Jul 2019 06:24:09 +0000 (01:24 -0500)]
q3map2: add missing help for q3map2 stage arguments
Move -keeplights help from -light stage to -bsp. Add other ~40 arguments
that were missing from help. My main focus was on the -convert stage
but I tried to document the rest as well. Some descriptions are copied
from message when enabling the option.
Zack Middleton [Wed, 24 Jul 2019 06:11:58 +0000 (01:11 -0500)]
q3map2: fix crash if command-line argument is missing
Running `q3map2 -fs_forbiddenpath -v mapname.map` would crash because
-v gets replaced with NULL in main().
Running `q3map2 -threads` would crash because missing next argument
for number of threads.
Zack Middleton [Tue, 23 Jul 2019 04:50:17 +0000 (23:50 -0500)]
q3map2: fix not displaying default args for some q3map2 stages
Fix not displaying default arguments, and possibly segfaulting, when
running q3map2 -bsp, -analyze, -convert, -exportents, -export, or
-import.
Thomas Debesse [Tue, 23 Jul 2019 23:19:47 +0000 (23:19 +0000)]
Merge branch 'radiant-cmdline-null-mapname' into 'master'
radiant: fix command-line error message for non-map filename
See merge request xonotic/netradiant!148
Zack Middleton [Tue, 23 Jul 2019 20:32:47 +0000 (15:32 -0500)]
radiant: fix command-line error message for non-map filename
mapname wasn't set so "(null)" was printed.
Fixes
6ba43753 ("radiant: fix command-line opening on windows").
Thomas Debesse [Tue, 23 Jul 2019 19:57:27 +0000 (19:57 +0000)]
Merge branch 'floating' into 'master'
make floating windows resizable on Windows, ref !140
See merge request xonotic/netradiant!147
Thomas Debesse [Tue, 23 Jul 2019 19:47:14 +0000 (21:47 +0200)]
make floating windows resizable on Windows, ref !140
“hint menu” windows are resizeable on Linux but not on Windows,
that's why it's better to use the “hint utility” type instead.
Thomas Debesse [Tue, 23 Jul 2019 04:13:05 +0000 (04:13 +0000)]
Merge branch 'readme-no-redownload' into 'master'
add how to avoid redownloading gamepacks to README.md
See merge request xonotic/netradiant!145
Zack Middleton [Tue, 23 Jul 2019 03:42:30 +0000 (22:42 -0500)]
add how to avoid redownloading gamepacks to README.md
Thomas Debesse [Tue, 23 Jul 2019 03:23:49 +0000 (03:23 +0000)]
Merge branch 'bintarget' into 'master'
add a "binaries" target, fix #135, <3 @zturtleman
Closes #135
See merge request xonotic/netradiant!144
Thomas Debesse [Tue, 23 Jul 2019 02:21:22 +0000 (04:21 +0200)]
add a "binaries" target, fix #135, <3 @zturtleman
add a "binaries" target to be able to rebuild everything without
redownloading gamepacks
Thomas Debesse [Tue, 23 Jul 2019 02:20:57 +0000 (02:20 +0000)]
Merge branch 'cleanup' into 'master'
some clean up
Closes #134
See merge request xonotic/netradiant!142
Thomas Debesse [Tue, 23 Jul 2019 02:07:14 +0000 (04:07 +0200)]
rename game_packs target to gamepacks
Thomas Debesse [Tue, 23 Jul 2019 02:06:46 +0000 (04:06 +0200)]
radiant target is now named netradiant, fix #134
also mention the BUNDLE_LIBRARIES cmake option, ref #133
Thomas Debesse [Mon, 22 Jul 2019 02:24:16 +0000 (04:24 +0200)]
delete the COMPILING file as it is heavily outdated
- macos instructions were not edited in 4 years
- linux and windows instructions were not edited in 9 years
and almost everything in this file is now obsolete or wrong
build instructions in README.md file are meant to be up to date
Thomas Debesse [Mon, 22 Jul 2019 02:10:03 +0000 (02:10 +0000)]
Merge branch 'restart' into 'master'
make radiant able to restart itself when required, ask user to
See merge request xonotic/netradiant!141
Thomas Debesse [Sun, 14 Jul 2019 00:57:54 +0000 (02:57 +0200)]
bikeshedding: some wording
Thomas Debesse [Sun, 14 Jul 2019 06:19:51 +0000 (08:19 +0200)]
radiant: make restart notification a question
thanks to latched variable mechanism
people can chose to not restart immediately
Thomas Debesse [Sun, 14 Jul 2019 06:05:00 +0000 (08:05 +0200)]
radiant: restart on game change
ask user to restart radiant on game change
Thomas Debesse [Sun, 14 Jul 2019 15:37:02 +0000 (17:37 +0200)]
radiant: restart on latched preference change
Thomas Debesse [Sun, 14 Jul 2019 00:53:50 +0000 (02:53 +0200)]
radiant: code to make radiant able to restart itself
- save preferences
- check for map being modified (this asks user for saving if not yet saved)
- check for a map being currently edited
- start a new instance, with the current map as parameter if exists
- quit current instance if new instance started correctly
Thomas Debesse [Sun, 14 Jul 2019 00:35:17 +0000 (02:35 +0200)]
radiant: get own radiant executable file path
previous code was getting it to compute app_path, lib_path and data_path
but was not keeping the value
Thomas Debesse [Sun, 14 Jul 2019 04:06:08 +0000 (06:06 +0200)]
radiant: fix command-line opening on windows
clean-up windows path, especially use '/' instead of '\'
as directory separator since since radiant is hardcoded
to use an lookup for '/' anywhere.
Thomas Debesse [Mon, 22 Jul 2019 02:08:35 +0000 (02:08 +0000)]
Merge branch 'floating' into 'master'
gtk2: do not make floating windows minimizable
See merge request xonotic/netradiant!140
Thomas Debesse [Sat, 13 Jul 2019 20:56:48 +0000 (22:56 +0200)]
gtk2: do not make floating windows minimizable
First, this feature leads to an horrible behavior on
Windows where the application ends in a loop of endless
minimization and restoration, probably because the window
manager minimizes or restores the whole application once
a floating window in minimized or restored, leading to a
race condition between all floating windows, some being
minimized and others being restored at the same time,
triggering the minimization and the restoration of the
others, and so on. It's difficult to say such issue
will never happen on other OS or with some window manager.
Second, those floating windows are expected to be displayed
or hidden using menu or keyboard shortcut, it's a design
choice. Then the OS-specific way to minimize/restore them
is superflous and less efficient.
Finally, the mainframe is not created as a floating window
so the user minimizes the application by minimizing the
mainframe.
Thomas Debesse [Sat, 13 Jul 2019 18:06:23 +0000 (18:06 +0000)]
Merge branch 'heretic2' into 'master'
heretic2: use a dedicated heretic subdirectory for Heretic 2 stuff, and more
See merge request xonotic/netradiant!139
Thomas Debesse [Fri, 5 Jul 2019 22:55:35 +0000 (00:55 +0200)]
readme: update target related help
Thomas Debesse [Sat, 13 Jul 2019 17:56:14 +0000 (19:56 +0200)]
tools/heretic2: also make q2map a required target
Thomas Debesse [Fri, 5 Jul 2019 23:37:23 +0000 (01:37 +0200)]
makefile: install heretic2 stuff like cmake does
Thomas Debesse [Fri, 5 Jul 2019 22:44:24 +0000 (00:44 +0200)]
tools/heretic2: print h2data instead of qdata in messages
Thomas Debesse [Fri, 5 Jul 2019 22:33:50 +0000 (00:33 +0200)]
tools/heretic2: move heretic2 stuff to its own directory
Thomas Debesse [Fri, 5 Jul 2019 22:07:54 +0000 (22:07 +0000)]
Merge branch 'winconsole' into 'master'
make tools target the console subsystem on Windows
See merge request xonotic/netradiant!137
Thomas Debesse [Fri, 5 Jul 2019 20:25:34 +0000 (22:25 +0200)]
cmake: do not use WIN32 for console tools
allow them to output stdout on console and spawn a console if required
it's not very intuitive and explicit but the WIN32 cmake keyword
in add_executable call is to not target the console subsystem but
only the graphical one
so console tools just have to not use that keyword, even if they imay
display a window like when doing q2map -glview
then the WIN32 keyword is a kind of “no console” keyword
Thomas Debesse [Thu, 4 Jul 2019 23:57:34 +0000 (01:57 +0200)]
cmake: make tools target the console subsystem on Windows
previously on Windows the stdout stuff was only printed on MinTTY console or SSH shell,
this change makes the tools to target the console subsystem so they also print stdout
on cmd console.
this also makes the tool spawning a cmd console windows when not started from a console,
allowing people to monitor what is printed.
this is done by adding a console_app() cmake macro that enables the -mconsole linker flag.
For exhaustivity an extraneous window_app() macro is done too that enables the -mwindows
flag. The -mwindows looks to be implicit, but making this macro explicit and using it
keeps the CMakeLists.txt file self documenting which exe has to be compiled with -mconsole,
which one has to be compiled with -mwindows, and which one has to be compiled with both.
this is a way to check if an exe targets only the windows subsystem:
$ objdump -p netradiant.exe | egrep '^Subsystem'
Subsystem
00000002 (Windows GUI)
this is a way to check if an exe targets the console subsystem:
$ objdump -p q3map2.exe | egrep '^Subsystem'
Subsystem
00000003 (Windows CUI)
note that this one targets both console and windows subsystem, only console is reported:
$ objdump -p q2map.exe | egrep '^Subsystem'
Subsystem
00000003 (Windows CUI)
Thomas Debesse [Mon, 24 Jun 2019 19:02:41 +0000 (19:02 +0000)]
Merge branch 'bundle' into 'master'
improve lib and other stuff bundling on windows
See merge request xonotic/netradiant!136
Thomas Debesse [Wed, 19 Jun 2019 18:45:53 +0000 (20:45 +0200)]
bundle: store dll in lib subdirectory, bundle all of them at once
instead of finding and copying the dll each time a binary is produced,
the path of the produced binary is stored in a unique file (to avoid race
condition) and the target for that binary is added as a dependency to a new
target named `bundle` that does the finding and the copying once for all.
this avoids race condition while building targets in parallel, workaround
the inability of cmake to track a common list between all targets and to keep
it from configure to build step
this makes the bundle process more reliable and avoid things being copied
twice. Before that I've seen copy processes starting to copy the same file
even with the -n option telling to not copy if the file exists, then seeing
one of them failing because they both started when the file was not yet
copied but one finished the copy before the other one
this also makes the bundling faster by only doing things once for all
the dll are then moved to a lib/ subdirectory instead of the root
of the buld directory
each binary having dll to find and copy is built with a special resource file
embedding a manifest telling there is an assembly directory containing dll
named lib, then a manifest is writen for that assembly directory listing all
the dll it can find there telling windows to look for them there at binary
loading instead of the system directory and the place right to binary
this:
- helps to ensure the right dll is loaded even if another exists
with the same name on the system
- reduce the mess by storing all dll in one dedicated directory
- avoids the double cmake configure run by removing the need to
glob the build directory before installation
Thomas Debesse [Tue, 18 Jun 2019 21:06:14 +0000 (23:06 +0200)]
bundle: also bundle hicolor icons with libgtk
Thomas Debesse [Mon, 17 Jun 2019 23:01:18 +0000 (01:01 +0200)]
bundle: export gtk theme/engine bundle code to the script
now triggered on libgtk bundling
Thomas Debesse [Mon, 17 Jun 2019 22:15:11 +0000 (00:15 +0200)]
bundle: use ntldd on msys2 instead of ldd to enable 32bit build on 64bit os
Thomas Debesse [Mon, 17 Jun 2019 21:33:59 +0000 (23:33 +0200)]
bundle: export lib bundling code to a standalone script
Thomas Debesse [Tue, 18 Jun 2019 22:01:05 +0000 (22:01 +0000)]
Merge branch 'wingtk2gl' into 'master'
workaround the GTK2 GLWidget bug on Windows, fix #64
Closes #64
See merge request xonotic/netradiant!133
Thomas Debesse [Sun, 16 Jun 2019 15:40:08 +0000 (17:40 +0200)]
workaround the GTK2 GLWidget bug on Windows
Thomas Debesse [Tue, 18 Jun 2019 21:38:06 +0000 (21:38 +0000)]
Merge branch 'quake2' into 'master'
cmake: building quake2 and heretic2 tools to be on par with legacy makefile
See merge request xonotic/netradiant!134
Thomas Debesse [Sun, 16 Jun 2019 23:35:07 +0000 (01:35 +0200)]
icons: some touchup
Thomas Debesse [Sun, 16 Jun 2019 23:34:48 +0000 (01:34 +0200)]
heretic2: remove stale file
Thomas Debesse [Sun, 16 Jun 2019 23:07:57 +0000 (01:07 +0200)]
h2data: fix build on macos
Thomas Debesse [Sun, 16 Jun 2019 23:07:16 +0000 (01:07 +0200)]
cmake: build quake2 and heretic2 tools to be on par with legacy Makefile
Thomas Debesse [Tue, 18 Jun 2019 21:36:05 +0000 (21:36 +0000)]
Merge branch 'gamepacks' into 'master'
gamepacks: install them in a gamepacks/ subdirectory
See merge request xonotic/netradiant!135
Thomas Debesse [Mon, 17 Jun 2019 19:42:42 +0000 (21:42 +0200)]
gamepacks: install them in a gamepacks/ subdirectory
Thomas Debesse [Sun, 16 Jun 2019 15:43:32 +0000 (15:43 +0000)]
Merge branch 'gamepacks' into 'master'
cmake: allow to set an arbitrary directory to store downloaded gamepacks
See merge request xonotic/netradiant!132
Thomas Debesse [Sun, 16 Jun 2019 14:24:52 +0000 (16:24 +0200)]
cmake: allow to set an arbitrary directory to store downloaded gamepacks
this is useful when you have as many as build directories as os/arch combination
but want to download game packs only once
Thomas Debesse [Sun, 16 Jun 2019 15:20:51 +0000 (17:20 +0200)]
readme: edit build instructions
Thomas Debesse [Sun, 16 Jun 2019 13:36:16 +0000 (13:36 +0000)]
Merge branch 'polishing' into 'master'
polishing stuff a bit, no functionnal changes
See merge request xonotic/netradiant!130
Thomas Debesse [Wed, 5 Jun 2019 02:58:28 +0000 (04:58 +0200)]
plugins: unify About window wording
also get rid of Q3Radiant, SDRadiant, GTKRadiant references
use RADIANT_NAME definition instead
Thomas Debesse [Wed, 5 Jun 2019 01:30:53 +0000 (03:30 +0200)]
logging: no need for quotes around netradiant version in radiant.log
Thomas Debesse [Wed, 5 Jun 2019 01:17:06 +0000 (03:17 +0200)]
radiant/tools: use RADIANT_NAME instead of hardcoding NetRadiant or Radiant
Thomas Debesse [Sun, 16 Jun 2019 11:08:29 +0000 (13:08 +0200)]
bikeshedding: comment wording
Thomas Debesse [Wed, 5 Jun 2019 00:20:58 +0000 (02:20 +0200)]
bikeshedding: spacing
Thomas Debesse [Sun, 16 Jun 2019 11:20:40 +0000 (13:20 +0200)]
bikeshedding: cmake quoting
Thomas Debesse [Tue, 4 Jun 2019 23:46:28 +0000 (01:46 +0200)]
cmake: use complete version string in radiant about dialog
Thomas Debesse [Wed, 5 Jun 2019 00:00:30 +0000 (02:00 +0200)]
cmake/makefile: define NetRadiant name
Thomas Debesse [Wed, 5 Jun 2019 00:00:58 +0000 (02:00 +0200)]
cmake/makefile: there is no need for MAJOR/MINOR/PATCH anymore
Thomas Debesse [Wed, 29 May 2019 21:25:08 +0000 (23:25 +0200)]
cmake: there is no conflict anymore between radiant directory and netradiant file
Thomas Debesse [Wed, 29 May 2019 21:21:59 +0000 (23:21 +0200)]
cmake: add “tools” target
the same way there is now a BUILD_RADIANT and BUILD_TOOLS build option,
allow people to just do: make tools
Thomas Debesse [Tue, 4 Jun 2019 23:12:08 +0000 (01:12 +0200)]
cmake: only set RADIANT_ABOUTMSG for netradiant build
Thomas Debesse [Tue, 4 Jun 2019 23:08:42 +0000 (01:08 +0200)]
cmake: unify radiant variable names
Thomas Debesse [Tue, 4 Jun 2019 23:06:52 +0000 (01:06 +0200)]
cmake: fix RADIANT_ABOUTMSG definition to be used in About window
Thomas Debesse [Tue, 4 Jun 2019 22:35:52 +0000 (00:35 +0200)]
cmake: does not display license list since it can be set to none
Thomas Debesse [Tue, 4 Jun 2019 22:16:51 +0000 (00:16 +0200)]
cmake: put the macOS libffi hack in FindGLIB instead of FindGTKGLExt
Thomas Debesse [Mon, 3 Jun 2019 21:39:14 +0000 (23:39 +0200)]
cmake: prefer absolute paths instead of relative ones
Thomas Debesse [Mon, 3 Jun 2019 21:37:25 +0000 (23:37 +0200)]
cmake: spacing
Thomas Debesse [Tue, 4 Jun 2019 00:48:52 +0000 (02:48 +0200)]
cmake: better way to set per OS options
Thomas Debesse [Sun, 16 Jun 2019 13:20:16 +0000 (13:20 +0000)]
Merge branch 'xdg' into 'master'
radiant: mkdir config parent dir
See merge request xonotic/netradiant!129
Thomas Debesse [Sun, 16 Jun 2019 11:07:17 +0000 (13:07 +0200)]
radiant: mkdir config parent dir
Thomas Debesse [Sun, 16 Jun 2019 13:11:59 +0000 (13:11 +0000)]
Merge branch 'crnlib' into 'master'
crnlib: update submodule reference
See merge request xonotic/netradiant!131
Thomas Debesse [Sun, 16 Jun 2019 13:09:40 +0000 (15:09 +0200)]
crnlib: update submodule reference
- import fixes from Unity
- fix FreeBSD build
Thomas Debesse [Sat, 1 Jun 2019 20:46:28 +0000 (22:46 +0200)]
macos: do not require xquartz and do not build against x11
Thomas Debesse [Sun, 2 Jun 2019 01:21:39 +0000 (01:21 +0000)]
Merge branch 'freebsd' into 'master'
FreeBSD support
See merge request xonotic/netradiant!75
Thomas Debesse [Sun, 2 Jun 2019 01:08:39 +0000 (03:08 +0200)]
readme: add FreeBSD build instructions
Thomas Debesse [Wed, 30 Aug 2017 22:58:12 +0000 (22:58 +0000)]
preproc: PATH_MAX is defined in sys/syslimits.h on FreeBSD
Thomas Debesse [Wed, 30 Aug 2017 22:32:48 +0000 (22:32 +0000)]
cmake: look for libraries in /usr/local/lib on FreeBSD
Thomas Debesse [Wed, 30 Aug 2017 22:30:44 +0000 (22:30 +0000)]
vector: do not redefine lrint on FreeBSD
Thomas Debesse [Sun, 2 Jun 2019 01:16:05 +0000 (03:16 +0200)]
readme: minor edits
Thomas Debesse [Sun, 2 Jun 2019 00:17:55 +0000 (02:17 +0200)]
cmake: fix icons install and stuff like that (bug from
b4b0ad3 ), <3 @SpiKe
Thomas Debesse [Sat, 1 Jun 2019 23:28:06 +0000 (01:28 +0200)]
readme: minor update
Thomas Debesse [Sat, 1 Jun 2019 21:13:29 +0000 (21:13 +0000)]
Merge branch 'smokinguns' into 'master'
Smokin' Guns support
See merge request xonotic/netradiant!122
Thomas Debesse [Tue, 28 May 2019 20:51:29 +0000 (22:51 +0200)]
gamepacks: add Smokin' Guns support
Thomas Debesse [Wed, 1 May 2019 14:16:52 +0000 (16:16 +0200)]
q3map2: make Smokin'Guns code not requiring a rebuild
Not only Smokin'Guns game can now use .tex sidecar file
Tequila [Mon, 18 Feb 2013 18:28:44 +0000 (19:28 +0100)]
q3map2: Forgot to commit game_smokinguns.h, thanks TheDoctor for the remind