]> de.git.xonotic.org Git - xonotic/netradiant.git/log
xonotic/netradiant.git
4 years agobikeshedding: spacing
Thomas Debesse [Wed, 5 Jun 2019 00:20:58 +0000 (02:20 +0200)]
bikeshedding: spacing

4 years agobikeshedding: cmake quoting
Thomas Debesse [Sun, 16 Jun 2019 11:20:40 +0000 (13:20 +0200)]
bikeshedding: cmake quoting

4 years agocmake: use complete version string in radiant about dialog
Thomas Debesse [Tue, 4 Jun 2019 23:46:28 +0000 (01:46 +0200)]
cmake: use complete version string in radiant about dialog

4 years agocmake/makefile: define NetRadiant name
Thomas Debesse [Wed, 5 Jun 2019 00:00:30 +0000 (02:00 +0200)]
cmake/makefile: define NetRadiant name

4 years agocmake/makefile: there is no need for MAJOR/MINOR/PATCH anymore
Thomas Debesse [Wed, 5 Jun 2019 00:00:58 +0000 (02:00 +0200)]
cmake/makefile: there is no need for MAJOR/MINOR/PATCH anymore

4 years agocmake: there is no conflict anymore between radiant directory and netradiant file
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

4 years agocmake: add “tools” target
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

4 years agocmake: only set RADIANT_ABOUTMSG for netradiant build
Thomas Debesse [Tue, 4 Jun 2019 23:12:08 +0000 (01:12 +0200)]
cmake: only set RADIANT_ABOUTMSG for netradiant build

4 years agocmake: unify radiant variable names
Thomas Debesse [Tue, 4 Jun 2019 23:08:42 +0000 (01:08 +0200)]
cmake: unify radiant variable names

4 years agocmake: fix RADIANT_ABOUTMSG definition to be used in About window
Thomas Debesse [Tue, 4 Jun 2019 23:06:52 +0000 (01:06 +0200)]
cmake: fix RADIANT_ABOUTMSG definition to be used in About window

4 years agocmake: does not display license list since it can be set to none
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

4 years agocmake: put the macOS libffi hack in FindGLIB instead of FindGTKGLExt
Thomas Debesse [Tue, 4 Jun 2019 22:16:51 +0000 (00:16 +0200)]
cmake: put the macOS libffi hack in FindGLIB instead of FindGTKGLExt

4 years agocmake: prefer absolute paths instead of relative ones
Thomas Debesse [Mon, 3 Jun 2019 21:39:14 +0000 (23:39 +0200)]
cmake: prefer absolute paths instead of relative ones

4 years agocmake: spacing
Thomas Debesse [Mon, 3 Jun 2019 21:37:25 +0000 (23:37 +0200)]
cmake: spacing

4 years agocmake: better way to set per OS options
Thomas Debesse [Tue, 4 Jun 2019 00:48:52 +0000 (02:48 +0200)]
cmake: better way to set per OS options

4 years agoMerge branch 'xdg' into 'master'
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

4 years agoradiant: mkdir config parent dir 129/head
Thomas Debesse [Sun, 16 Jun 2019 11:07:17 +0000 (13:07 +0200)]
radiant: mkdir config parent dir

4 years agoMerge branch 'crnlib' into 'master'
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

4 years agocrnlib: update submodule reference 131/head
Thomas Debesse [Sun, 16 Jun 2019 13:09:40 +0000 (15:09 +0200)]
crnlib: update submodule reference

- import fixes from Unity
- fix FreeBSD build

4 years agomacos: do not require xquartz and do not build against x11
Thomas Debesse [Sat, 1 Jun 2019 20:46:28 +0000 (22:46 +0200)]
macos: do not require xquartz and do not build against x11

4 years agoMerge branch 'freebsd' into 'master'
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

4 years agoreadme: add FreeBSD build instructions
Thomas Debesse [Sun, 2 Jun 2019 01:08:39 +0000 (03:08 +0200)]
readme: add FreeBSD build instructions

4 years agopreproc: PATH_MAX is defined in sys/syslimits.h on FreeBSD
Thomas Debesse [Wed, 30 Aug 2017 22:58:12 +0000 (22:58 +0000)]
preproc: PATH_MAX is defined in sys/syslimits.h on FreeBSD

4 years agocmake: look for libraries in /usr/local/lib 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

4 years agovector: do not redefine lrint on FreeBSD
Thomas Debesse [Wed, 30 Aug 2017 22:30:44 +0000 (22:30 +0000)]
vector: do not redefine lrint on FreeBSD

4 years agoreadme: minor edits
Thomas Debesse [Sun, 2 Jun 2019 01:16:05 +0000 (03:16 +0200)]
readme: minor edits

4 years agocmake: fix icons install and stuff like that (bug from b4b0ad3), <3 @SpiKe
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

4 years agoreadme: minor update
Thomas Debesse [Sat, 1 Jun 2019 23:28:06 +0000 (01:28 +0200)]
readme: minor update

4 years agoMerge branch 'smokinguns' into 'master'
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

4 years agogamepacks: add Smokin' Guns support 122/head
Thomas Debesse [Tue, 28 May 2019 20:51:29 +0000 (22:51 +0200)]
gamepacks: add Smokin' Guns support

4 years agoq3map2: make Smokin'Guns code not requiring a rebuild
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

4 years agoq3map2: Forgot to commit game_smokinguns.h, thanks TheDoctor for the remind
Tequila [Mon, 18 Feb 2013 18:28:44 +0000 (19:28 +0100)]
q3map2: Forgot to commit game_smokinguns.h, thanks TheDoctor for the remind

4 years agoq3map2: Smokin'Guns 1.2.1 flavour
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

4 years agoMerge branch 'msys2' into 'master'
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

4 years agoicons: enable q3map2 and q3data windows exe icons 126/head
Thomas Debesse [Sat, 1 Jun 2019 18:38:02 +0000 (20:38 +0200)]
icons: enable q3map2 and q3data windows exe icons

4 years agoreadme: update installation instructions and telle people to rerun cmake before insta...
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

4 years agomsys2/bundle: also bundle compiler libs (minizip…)
Thomas Debesse [Sat, 1 Jun 2019 14:04:41 +0000 (16:04 +0200)]
msys2/bundle: also bundle compiler libs (minizip…)

4 years agoicons: redo the netradiant icon with 512×512 resolution
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

4 years agoicons: fix netradiant windows exe icon
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

4 years agomsys2/bundle: install libs only once
Thomas Debesse [Fri, 31 May 2019 23:44:54 +0000 (01:44 +0200)]
msys2/bundle: install libs only once

4 years agomsys2/bundle: speed-up the build to not copy what is already copied
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

4 years agocmake: avoid useless dot dir in the middle of some paths
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

4 years agocmake/gamepacks: tell cmake about the gamepack files and let it install them
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

4 years agomsys2/bundle: gtk2 loaders and theme, installation
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

4 years agoreadme: some touchup
Thomas Debesse [Fri, 31 May 2019 16:21:19 +0000 (18:21 +0200)]
readme: some touchup

4 years agomsys2: update build instructions in readme
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)

4 years agogamepacks: avoid readlink for useless things
Thomas Debesse [Sat, 1 Jun 2019 17:52:45 +0000 (19:52 +0200)]
gamepacks: avoid readlink for useless things

4 years agoMerge branch 'macos' into 'master'
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

4 years agoreadme: macOS instructions update 125/head
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

4 years agocmake: fix linking on macOS
Thomas Debesse [Mon, 20 May 2019 17:52:56 +0000 (19:52 +0200)]
cmake: fix linking on macOS

4 years agocmake: spacing
Thomas Debesse [Mon, 20 May 2019 17:50:21 +0000 (19:50 +0200)]
cmake: spacing

4 years agoMerge branch 'gamepack-manager' into 'master'
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

4 years agogamepack-manager: use GNU sed on macOS and avoid GNU cp option 124/head
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

4 years agogamepack-manager: try to compute realpath the portable way
Thomas Debesse [Mon, 20 May 2019 19:17:02 +0000 (21:17 +0200)]
gamepack-manager: try to compute realpath the portable way

4 years agogamepack-manager: Makefile honors shebang
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

4 years agoMerge branch 'gdefos' into 'master'
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

4 years agogdef: PATH_MAX seems to not only be undefined on Windows but on macOS too
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

4 years agorework GDEF_OS macros
Thomas Debesse [Sat, 27 Jan 2018 22:54:15 +0000 (23:54 +0100)]
rework GDEF_OS macros

4 years agoMerge branch 'msys2-ldd' into 'master'
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

4 years agomsys2/bundle: properly parse ldd output for dll bundling on windows 128/head
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

4 years agoMerge branch 'ellipsis' into 'master'
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

4 years agoui: fix the ellipsis icon 127/head
Thomas Debesse [Fri, 31 May 2019 18:22:05 +0000 (20:22 +0200)]
ui: fix the ellipsis icon

4 years agoMerge branch 'macos' into 'master'
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

4 years agoonly apply mac fix on macos
Thomas Debesse [Sun, 19 May 2019 23:11:31 +0000 (01:11 +0200)]
only apply mac fix on macos

4 years agoFix compilation on OS X for RTLD_DEEPBIND.
Jay Dolan [Sat, 6 May 2017 13:38:00 +0000 (09:38 -0400)]
Fix compilation on OS X for RTLD_DEEPBIND.

4 years agoMerge branch 'xdgpath' into 'master'
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

4 years agoradiant: spacing fix
Thomas Debesse [Sun, 25 Nov 2018 01:05:00 +0000 (02:05 +0100)]
radiant: spacing fix

4 years agoq3map2: drop Q_UNIX definition (rely on GDEF_OS_POSIX instead)
Thomas Debesse [Sun, 25 Nov 2018 00:53:22 +0000 (01:53 +0100)]
q3map2: drop Q_UNIX definition (rely on GDEF_OS_POSIX instead)

4 years agoq3map2: use ~/Library/Application Support on Mac
Thomas Debesse [Sun, 25 Nov 2018 00:35:12 +0000 (01:35 +0100)]
q3map2: use ~/Library/Application Support on Mac

4 years agoq3map2: better detection of Windows
Thomas Debesse [Sun, 25 Nov 2018 00:26:46 +0000 (01:26 +0100)]
q3map2: better detection of Windows

4 years agoq3map2: check Linux prefix against XDG_DATA_HOME before HOME
Thomas Debesse [Sat, 24 Nov 2018 22:40:04 +0000 (23:40 +0100)]
q3map2: check Linux prefix against XDG_DATA_HOME before HOME

4 years agoq3map2: code simplification
Thomas Debesse [Sat, 24 Nov 2018 22:17:53 +0000 (23:17 +0100)]
q3map2: code simplification

4 years agoq3map2: revert Unvanquished prefix to legacy format
Thomas Debesse [Sat, 24 Nov 2018 22:07:29 +0000 (23:07 +0100)]
q3map2: revert Unvanquished prefix to legacy format

4 years agoradiant: check Linux prefix against XDG_DATA_HOME before HOME
Thomas Debesse [Sat, 24 Nov 2018 22:06:59 +0000 (23:06 +0100)]
radiant: check Linux prefix against XDG_DATA_HOME before HOME

4 years agoradiant: does not use Linux home path on MacOS
Thomas Debesse [Sun, 25 Nov 2018 00:18:34 +0000 (01:18 +0100)]
radiant: does not use Linux home path on MacOS

4 years agocmake/radiant: FHS fixes 109/head
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

4 years agoreadme: update
Thomas Debesse [Wed, 14 Nov 2018 21:56:03 +0000 (22:56 +0100)]
readme: update

4 years agocmake: allow to configure for radiant/tools/gamepacks separately
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

4 years agocmake: do not look for graphical libs when not building radiant
Thomas Debesse [Mon, 12 Nov 2018 19:01:33 +0000 (20:01 +0100)]
cmake: do not look for graphical libs when not building radiant

4 years agocmake: option for FHS installation is now FHS_INSTALL
Thomas Debesse [Sun, 4 Nov 2018 04:24:31 +0000 (05:24 +0100)]
cmake: option for FHS installation is now FHS_INSTALL

4 years agoradiant: strip .[ExecutableType] entirely (including preceding dot) outside of Windows
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

4 years agocmake: XDG desktop integration
Thomas Debesse [Sun, 16 Jul 2017 01:53:36 +0000 (03:53 +0200)]
cmake: XDG desktop integration

- desktop file
- application icon
- map mime type

4 years agocmake: rename “radiant” binary to “netradiant”
Thomas Debesse [Wed, 18 Apr 2018 18:34:00 +0000 (20:34 +0200)]
cmake: rename “radiant” binary to “netradiant”

4 years agocmake: FHS installation
Thomas Debesse [Sun, 4 Nov 2018 01:01:48 +0000 (02:01 +0100)]
cmake: FHS installation

optional installation following Filesystem Hierarchy Standard

4 years agocmake: drop generation and usage of radiant version files
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.

4 years agoMerge branch 'msys2thread' into 'master'
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

4 years agothreading: [partial] Working NetRadiant and q3map2 on MSYS2 (both x86, x86_64)
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

4 years agoMerge branch 'q3rally-gamepack' into 'master'
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

4 years agoadd Q3Rally gamepack
Thomas Debesse [Sun, 21 Apr 2019 12:59:39 +0000 (14:59 +0200)]
add Q3Rally gamepack

4 years agoMerge branch 'gridcolors-adwaitadark' into 'master'
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

4 years agoOptional grid color scheme to fit the Adwaita Dark GTK theme 110/head
Thomas Debesse [Sun, 4 Nov 2018 08:43:50 +0000 (09:43 +0100)]
Optional grid color scheme to fit the Adwaita Dark GTK theme

4 years agoMerge branch 'mschwan/gdef-inline-fix' into 'master'
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

4 years agoMerge branch 'nomaccheck' into 'master'
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

4 years agodrop old MAC_STATIC_HACK no one requested to be enabled in 12 years
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

4 years agoredo !103, refix #76, was reintroduced in 957d2ff
Thomas Debesse [Sat, 27 Apr 2019 22:19:38 +0000 (00:19 +0200)]
redo !103, refix #76, was reintroduced in 957d2ff

5 years agoMerge branch 'fixrevert' into 'master'
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

5 years agoredo a windows fix from 20dbf5c that was mistakenly lost 117/head
Thomas Debesse [Sun, 10 Mar 2019 23:44:48 +0000 (00:44 +0100)]
redo a windows fix from 20dbf5c that was mistakenly lost

5 years agoMerge branch 'revert-restyle' into 'master'
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

5 years agoRevert partially (manual) "reformat code! now the code is only ugly on the *inside*" 116/head
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.

5 years agoRevert partially (auto) "reformat code! now the code is only ugly on the *inside*"
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.