]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
Tequila [Tue, 22 Jan 2013 10:28:39 +0000 (11:28 +0100)]
q3map2: Smokin'Guns 1.2.1 flavour
- Imported old q3map2 modifications by spoon from the v0.0.1 q3map2 for WesternQuake3
- Added support for lava content making dynamite explodes and molotov burns
- Added support for "-game smokinguns" option
- Added SMOKINGUNS define in CPPDEFINES so q3map2 builds with Smokin'Guns modifications
- Updated Smokin'Guns map pack to use "-game smokinguns" option with q3map2 tool
Thomas Debesse [Sat, 1 Jun 2019 20:55:27 +0000 (20:55 +0000)]
Merge branch 'msys2' into 'master'
msys2: fix build instructions, improve library bundling <3 @Mario
See merge request xonotic/netradiant!126
Thomas Debesse [Sat, 1 Jun 2019 18:38:02 +0000 (20:38 +0200)]
icons: enable q3map2 and q3data windows exe icons
Thomas Debesse [Sat, 1 Jun 2019 14:25:11 +0000 (16:25 +0200)]
readme: update installation instructions and telle people to rerun cmake before installing
Thomas Debesse [Sat, 1 Jun 2019 14:04:41 +0000 (16:04 +0200)]
msys2/bundle: also bundle compiler libs (minizip…)
Thomas Debesse [Sat, 1 Jun 2019 03:39:28 +0000 (05:39 +0200)]
icons: redo the netradiant icon with 512×512 resolution
- redraw netradiant.png as 512×512 instead of weird 416×416
- rebuild netradiant.ico with 32, 64, 128, 256 and 512 sizes
Thomas Debesse [Sat, 1 Jun 2019 02:01:41 +0000 (04:01 +0200)]
icons: fix netradiant windows exe icon
- use the one that is expected to be used
- drop the older ones
Thomas Debesse [Fri, 31 May 2019 23:44:54 +0000 (01:44 +0200)]
msys2/bundle: install libs only once
Thomas Debesse [Fri, 31 May 2019 23:28:13 +0000 (01:28 +0200)]
msys2/bundle: speed-up the build to not copy what is already copied
Thomas Debesse [Fri, 31 May 2019 22:17:18 +0000 (00:17 +0200)]
cmake: avoid useless dot dir in the middle of some paths
avoid annoying something/./something
Thomas Debesse [Fri, 31 May 2019 21:25:48 +0000 (23:25 +0200)]
cmake/gamepacks: tell cmake about the gamepack files and let it install them
Thomas Debesse [Fri, 31 May 2019 21:24:03 +0000 (23:24 +0200)]
msys2/bundle: gtk2 loaders and theme, installation
- pixbuf loaders
- pixmap and wimp engines
- windows theme
- install those plus the libs discovered with ldd
- only bundle windows stuff on windows
Thomas Debesse [Fri, 31 May 2019 16:21:19 +0000 (18:21 +0200)]
readme: some touchup
Thomas Debesse [Fri, 31 May 2019 15:02:06 +0000 (17:02 +0200)]
msys2: update build instructions in readme
- add minizip and git to pacman packages to install
* minizip is required by netradiant and q3map2
* git is required by gamepack-manager
* other game packs may require subversion
- tell how to use mingw over ssh
- autodetect mingw architecture, give instruction to override
- fix a typo (a i character was mistakenly added somewhere)
Thomas Debesse [Sat, 1 Jun 2019 17:52:45 +0000 (19:52 +0200)]
gamepacks: avoid readlink for useless things
Thomas Debesse [Sat, 1 Jun 2019 16:18:07 +0000 (16:18 +0000)]
Merge branch 'macos' into 'master'
fix linking on macOS and tell people how to build
See merge request xonotic/netradiant!125
Thomas Debesse [Mon, 20 May 2019 19:22:14 +0000 (21:22 +0200)]
readme: macOS instructions update
- tell macOS users to install coreutils, as grealpath is required by gamepack-manager
- tell them to use GCC since of clang fails to build netradiant
Thomas Debesse [Mon, 20 May 2019 17:52:56 +0000 (19:52 +0200)]
cmake: fix linking on macOS
Thomas Debesse [Mon, 20 May 2019 17:50:21 +0000 (19:50 +0200)]
cmake: spacing
Thomas Debesse [Sat, 1 Jun 2019 15:48:02 +0000 (15:48 +0000)]
Merge branch 'gamepack-manager' into 'master'
some gamepack-manager fixes for legacy Makefile and macOS
See merge request xonotic/netradiant!124
Thomas Debesse [Thu, 23 May 2019 00:39:45 +0000 (02:39 +0200)]
gamepack-manager: use GNU sed on macOS and avoid GNU cp option
Thomas Debesse [Mon, 20 May 2019 19:17:02 +0000 (21:17 +0200)]
gamepack-manager: try to compute realpath the portable way
Thomas Debesse [Sun, 19 May 2019 22:41:04 +0000 (00:41 +0200)]
gamepack-manager: Makefile honors shebang
and properly create directories when called from Makefile
Thomas Debesse [Sat, 1 Jun 2019 15:22:30 +0000 (15:22 +0000)]
Merge branch 'gdefos' into 'master'
rework GDEF_OS macros
See merge request xonotic/netradiant!123
Thomas Debesse [Thu, 23 May 2019 00:42:39 +0000 (02:42 +0200)]
gdef: PATH_MAX seems to not only be undefined on Windows but on macOS too
Thomas Debesse [Sat, 27 Jan 2018 22:54:15 +0000 (23:54 +0100)]
rework GDEF_OS macros
Thomas Debesse [Sat, 1 Jun 2019 15:08:02 +0000 (15:08 +0000)]
Merge branch 'msys2-ldd' into 'master'
msys2/bundle: properly parse ldd output for dll bundling on windows
See merge request xonotic/netradiant!128
Thomas Debesse [Fri, 31 May 2019 15:59:56 +0000 (17:59 +0200)]
msys2/bundle: properly parse ldd output for dll bundling on windows
- properly filters out Windows dll using case insensitive grep
- filters out non .dll lines in ldd output, avoid empty lines and ??? lines
- copy dll preserving timestamps
Thomas Debesse [Fri, 31 May 2019 18:24:35 +0000 (18:24 +0000)]
Merge branch 'ellipsis' into 'master'
ui: fix the ellipsis icon
See merge request xonotic/netradiant!127
Thomas Debesse [Fri, 31 May 2019 18:22:05 +0000 (20:22 +0200)]
ui: fix the ellipsis icon
Thomas Debesse [Tue, 21 May 2019 23:46:40 +0000 (23:46 +0000)]
Merge branch 'macos' into 'master'
MacOS compilation fix
See merge request xonotic/netradiant!112
Thomas Debesse [Sun, 19 May 2019 23:11:31 +0000 (01:11 +0200)]
only apply mac fix on macos
Jay Dolan [Sat, 6 May 2017 13:38:00 +0000 (09:38 -0400)]
Fix compilation on OS X for RTLD_DEEPBIND.
Thomas Debesse [Sat, 18 May 2019 21:15:43 +0000 (21:15 +0000)]
Merge branch 'xdgpath' into 'master'
detect XDG compliant games on Linux, obsolete !111, <3 Ingar
See merge request xonotic/netradiant!113
Thomas Debesse [Sun, 25 Nov 2018 01:05:00 +0000 (02:05 +0100)]
radiant: spacing fix
Thomas Debesse [Sun, 25 Nov 2018 00:53:22 +0000 (01:53 +0100)]
q3map2: drop Q_UNIX definition (rely on GDEF_OS_POSIX instead)
Thomas Debesse [Sun, 25 Nov 2018 00:35:12 +0000 (01:35 +0100)]
q3map2: use ~/Library/Application Support on Mac
Thomas Debesse [Sun, 25 Nov 2018 00:26:46 +0000 (01:26 +0100)]
q3map2: better detection of Windows
Thomas Debesse [Sat, 24 Nov 2018 22:40:04 +0000 (23:40 +0100)]
q3map2: check Linux prefix against XDG_DATA_HOME before HOME
Thomas Debesse [Sat, 24 Nov 2018 22:17:53 +0000 (23:17 +0100)]
q3map2: code simplification
Thomas Debesse [Sat, 24 Nov 2018 22:07:29 +0000 (23:07 +0100)]
q3map2: revert Unvanquished prefix to legacy format
Thomas Debesse [Sat, 24 Nov 2018 22:06:59 +0000 (23:06 +0100)]
radiant: check Linux prefix against XDG_DATA_HOME before HOME
Thomas Debesse [Sun, 25 Nov 2018 00:18:34 +0000 (01:18 +0100)]
radiant: does not use Linux home path on MacOS
Thomas Debesse [Wed, 2 Jan 2019 03:06:29 +0000 (04:06 +0100)]
cmake/radiant: FHS fixes
really install game files in share/netradiant
look for glsl stuff in share/netradiant/gl
and a bit more
Thomas Debesse [Wed, 14 Nov 2018 21:56:03 +0000 (22:56 +0100)]
readme: update
Thomas Debesse [Wed, 14 Nov 2018 21:13:18 +0000 (22:13 +0100)]
cmake: allow to configure for radiant/tools/gamepacks separately
people can switch on/off
- BUILD_RADIANT
- BUILD_TOOLS
- DOWNLOAD_GAMEPACKS
Thomas Debesse [Mon, 12 Nov 2018 19:01:33 +0000 (20:01 +0100)]
cmake: do not look for graphical libs when not building radiant
Thomas Debesse [Sun, 4 Nov 2018 04:24:31 +0000 (05:24 +0100)]
cmake: option for FHS installation is now FHS_INSTALL
Thomas Debesse [Sun, 4 Nov 2018 04:02:18 +0000 (05:02 +0100)]
radiant: strip .[ExecutableType] entirely (including preceding dot) outside of Windows
keep backward compatibility with existing build menus
Thomas Debesse [Sun, 16 Jul 2017 01:53:36 +0000 (03:53 +0200)]
cmake: XDG desktop integration
- desktop file
- application icon
- map mime type
Thomas Debesse [Wed, 18 Apr 2018 18:34:00 +0000 (20:34 +0200)]
cmake: rename “radiant” binary to “netradiant”
Thomas Debesse [Sun, 4 Nov 2018 01:01:48 +0000 (02:01 +0100)]
cmake: FHS installation
optional installation following Filesystem Hierarchy Standard
Thomas Debesse [Sat, 3 Nov 2018 23:16:02 +0000 (00:16 +0100)]
cmake: drop generation and usage of radiant version files
RADIANT_MAJOR etc.
Thomas Debesse [Sat, 18 May 2019 20:46:00 +0000 (20:46 +0000)]
Merge branch 'msys2thread' into 'master'
threading: [partial] Working NetRadiant and q3map2 on MSYS2 (both x86, x86_64)
See merge request xonotic/netradiant!118
Aleksandr Palamar [Thu, 24 Mar 2016 18:29:16 +0000 (20:29 +0200)]
threading: [partial] Working NetRadiant and q3map2 on MSYS2 (both x86, x86_64)
this code is meant to fix q3map2 threading on MSYS2
partial commit from original by Aleksandr “void995” Palamar:
-
c1c3c66ec062438e1a99266751122557517d708d
initially named:
> Working NetRadiant and q3map2 on MSYS2 (both x86, x86_64),
> fixed problems with out of bounds and got rid of unneeded
> warning messages. Optimisations for MSYS2 were disabled as
> they are causing crashes. Added specific MSYS2 shell scripts
> for installing DLLs and GTK themes.
see merge request !18
https://gitlab.com/xonotic/netradiant/merge_requests/18
Thomas Debesse [Sat, 18 May 2019 20:44:12 +0000 (20:44 +0000)]
Merge branch 'q3rally-gamepack' into 'master'
add Q3Rally gamepack
See merge request xonotic/netradiant!121
Thomas Debesse [Sun, 21 Apr 2019 12:59:39 +0000 (14:59 +0200)]
add Q3Rally gamepack
Thomas Debesse [Sat, 18 May 2019 20:39:33 +0000 (20:39 +0000)]
Merge branch 'gridcolors-adwaitadark' into 'master'
Optional grid color scheme to fit the Adwaita Dark GTK theme
See merge request xonotic/netradiant!110
Thomas Debesse [Sun, 4 Nov 2018 08:43:50 +0000 (09:43 +0100)]
Optional grid color scheme to fit the Adwaita Dark GTK theme
Thomas Debesse [Sat, 18 May 2019 20:36:25 +0000 (20:36 +0000)]
Merge branch 'mschwan/gdef-inline-fix' into 'master'
Include globaldefs.h in arrayedlist.h
Closes #118
See merge request xonotic/netradiant!115
Thomas Debesse [Sat, 18 May 2019 20:32:17 +0000 (20:32 +0000)]
Merge branch 'nomaccheck' into 'master'
drop old MAC_STATIC_HACK no one requested to be enabled in 12 years
See merge request xonotic/netradiant!120
Thomas Debesse [Sun, 4 Mar 2018 17:10:07 +0000 (18:10 +0100)]
drop old MAC_STATIC_HACK no one requested to be enabled in 12 years
Thomas Debesse [Sat, 27 Apr 2019 22:19:38 +0000 (00:19 +0200)]
redo !103, refix #76, was reintroduced in
957d2ff
Thomas Debesse [Sun, 10 Mar 2019 23:48:35 +0000 (23:48 +0000)]
Merge branch 'fixrevert' into 'master'
redo a windows fix from
20dbf5c that was mistakenly lost
See merge request xonotic/netradiant!117
Thomas Debesse [Sun, 10 Mar 2019 23:44:48 +0000 (00:44 +0100)]
redo a windows fix from
20dbf5c that was mistakenly lost
Mario [Tue, 12 Feb 2019 04:36:09 +0000 (04:36 +0000)]
Merge branch 'revert-restyle' into 'master'
Revert the fork maker commit [revert restyle]
See merge request xonotic/netradiant!116
Thomas Debesse [Mon, 11 Feb 2019 01:31:14 +0000 (02:31 +0100)]
Revert partially (manual) "reformat code! now the code is only ugly on the *inside*"
This reverts commit
9dfae1c9b270ee369c6362903a9205b30751b95f .
But only for files whose changes that were manually reverted.
Thomas Debesse [Sun, 10 Feb 2019 19:43:55 +0000 (20:43 +0100)]
Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"
This reverts commit
9dfae1c9b270ee369c6362903a9205b30751b95f .
But only for files whose changes that were automatically reverted.
Rudolf Polzer [Tue, 8 Jan 2019 22:31:59 +0000 (14:31 -0800)]
Remove a mention of -mcpu.
Martin Schwan [Sun, 6 Jan 2019 18:54:45 +0000 (19:54 +0100)]
Include globaldefs.h in arrayedlist.h
This fixes a compiler error where GDEF_ATTRIBUTE_INLINE was not defined
and thus made tools/quake2/qdata_heretic2/qcommon/arrayedlist.h to fail.
Thomas Debesse [Wed, 28 Nov 2018 22:39:12 +0000 (22:39 +0000)]
Merge branch 'werror' into 'master'
Add -werror option to q3map2 to make all warnings into errors
See merge request xonotic/netradiant!114
maek [Wed, 28 Nov 2018 08:59:27 +0000 (08:59 +0000)]
Add -werror option to q3map2 to make all warnings into errors
Thomas Debesse [Mon, 5 Nov 2018 14:50:25 +0000 (15:50 +0100)]
gamepack-manager: fix extra-urls trick
Thomas Debesse [Thu, 25 Oct 2018 04:06:55 +0000 (06:06 +0200)]
game fixes
Thomas Debesse [Sun, 4 Nov 2018 17:45:56 +0000 (17:45 +0000)]
Merge branch 'picomodel-obj-surface-vertexes' into 'master'
Fix over allocating vertexes for OBJ models with multiple surfaces
See merge request xonotic/netradiant!107
Thomas Debesse [Sun, 4 Nov 2018 07:37:09 +0000 (07:37 +0000)]
Merge branch 'werror' into 'master'
make -Werror and -pedantic-errors a cmake option named USE_WERROR
See merge request xonotic/netradiant!106
Thomas Debesse [Sun, 28 Oct 2018 23:09:46 +0000 (00:09 +0100)]
make -Werror and -pedantic-errors a cmake option named USE_WERROR
Thomas Debesse [Sun, 4 Nov 2018 07:23:51 +0000 (08:23 +0100)]
a bunch of gamepack-manager udpates
Mario [Sat, 3 Nov 2018 22:37:41 +0000 (08:37 +1000)]
Fix a minor typo
Mario [Sat, 3 Nov 2018 22:36:18 +0000 (22:36 +0000)]
Merge branch 'webp' into 'master'
add webp support (Ingar code)
See merge request xonotic/netradiant!100
Mario [Fri, 2 Nov 2018 23:48:03 +0000 (23:48 +0000)]
Merge branch 'picomodel-obj-messages' into 'master'
Print OBJ/MTL filename in all picomodel OBJ loader messages
See merge request xonotic/netradiant!108
Zack Middleton [Wed, 31 Oct 2018 01:21:16 +0000 (20:21 -0500)]
Fix over allocating vertexes for OBJ models with multiple surfaces
Loading Wavefront OBJ models in picomodel (used by radiant and q3map2)
did not reset the surface vertex index when starting a new surface. This
caused there to be unused vertexes, equal to the number of vertexes in
all previous surfaces, at the beginning of each surface. Exponential OBJ
vertex memory usage as number of surfaces increases. It did not affect
displaying or processing the surface faces.
Mario [Wed, 31 Oct 2018 04:22:41 +0000 (04:22 +0000)]
Merge branch 'gamepack-manager' into 'master'
new gamepack-manager script to download and install game packs
See merge request xonotic/netradiant!98
Thomas Debesse [Sat, 9 Jun 2018 18:38:38 +0000 (20:38 +0200)]
new gamepack-manager script to download and install game packs
New gamepack-manager script to download and install game packs
--------------------------------------------------------------
Just run `./gamepack-manager -h` to get an extensive help.
It obsoletes:
- `download-gamepacks.sh`
- `install-gamepack.sh`
- `install-gamepacks.sh`
New cmake options to configure game pack downloading
----------------------------------------------------
- `GAMEPACK_LICENSE`
- `GAMEPACK_NAME`
They must be used with `DOWNLOAD_GAMEPACKS=ON`
If set to `none`, those extra filters are not used.
By default `GAMEPACK_LICENSE` filters for free licenses only.
By default `GAMEPACK_NAME` does not filter anything.
Examples
--------
Configure to only fetch free game packs:
```sh
cmake .. \
-DDOWNLOAD_GAMEPACKS=ON \
-DGAMEPACKS_LICENSE=free \
-DGAMEPACKS_NAME=none
```
Configure to only fetch Xonotic and Unvanquished game packs:
```sh
cmake .. \
-DDOWNLOAD_GAMEPACKS=ON \
-DGAMEPACKS_LICENSE=none \
-DGAMEPACKS_NAME="Xonotic Unvanquished"
```
Configure to only fetch GPL game packs and Quake2 game pack:
```sh
cmake .. \
-DDOWNLOAD_GAMEPACKS=ON \
-DGAMEPACKS_LICENSE=GPL \
-DGAMEPACKS_NAME="Quake2"
```
Fetch the game packs:
```
make game_packs
```
Note that it also works on `install` stage.
Zack Middleton [Wed, 31 Oct 2018 02:48:05 +0000 (21:48 -0500)]
Print name of undefined OBJ material
From Garux's netradiant-custom fork.
Zack Middleton [Wed, 31 Oct 2018 02:00:20 +0000 (21:00 -0500)]
Print OBJ/MTL filename in all picomodel OBJ loader messages
Filename was previously only displayed in OBJ fatal error.
Thomas Debesse [Sun, 28 Oct 2018 22:35:43 +0000 (23:35 +0100)]
readme update
Thomas Debesse [Sun, 28 Oct 2018 22:12:37 +0000 (23:12 +0100)]
avoid the do while false hack, use goto
Thomas Debesse [Sun, 28 Oct 2018 22:09:03 +0000 (23:09 +0100)]
remove questionable disabled debug dds code, git is made to keep track of junk history
Thomas Debesse [Fri, 6 Jul 2018 19:22:25 +0000 (21:22 +0200)]
webp: add cmake support
Stijn Buys [Sun, 30 Jun 2013 12:11:59 +0000 (14:11 +0200)]
WebP support for radiant and q3map2.
Thomas Debesse [Fri, 6 Jul 2018 18:28:42 +0000 (20:28 +0200)]
q3map2/image.c: avoid the pyramid of if
Thomas Debesse [Sun, 28 Oct 2018 22:19:32 +0000 (23:19 +0100)]
oops, readd crunch submodule
Thomas Debesse [Sun, 28 Oct 2018 21:56:32 +0000 (22:56 +0100)]
last minute fix to save legacy Makefile life one more time
Mario [Sun, 28 Oct 2018 21:33:15 +0000 (21:33 +0000)]
Merge branch 'crunch-submodule' into 'master'
Add crunch support to radiant and q3map2, the submodule way
See merge request xonotic/netradiant!104
Thomas Debesse [Sun, 28 Oct 2018 21:24:54 +0000 (22:24 +0100)]
make crunch build optional and disabled by default
Thomas Debesse [Tue, 2 Oct 2018 22:26:44 +0000 (00:26 +0200)]
make crunch a submodule
dolcetriade [Thu, 5 Jul 2018 19:07:31 +0000 (12:07 -0700)]
q3map2: Add crn loading support to q3map2
dolcetriade [Wed, 4 Jul 2018 05:49:58 +0000 (22:49 -0700)]
image: add crn support to the image plugin.
This works by converting the crn file to dds in memory
and then using the dds load functions to convert the dds
file to RGBA. This is because crn also stores the file as
a compressed texture meant to be uploaded directly to the
GPU, however, radiant wants an RGBA array.
Mario [Sun, 28 Oct 2018 21:20:16 +0000 (21:20 +0000)]
Merge branch 'image_nofail' into 'master'
do not fail on missing image or model plugin, they can be optional
See merge request xonotic/netradiant!105