]> git.rm.cloudns.org Git - xonotic/netradiant.git/log
xonotic/netradiant.git
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.

5 years agoRemove a mention of -mcpu.
Rudolf Polzer [Tue, 8 Jan 2019 22:31:59 +0000 (14:31 -0800)]
Remove a mention of -mcpu.

6 years agoMerge branch 'werror' into 'master'
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

6 years agoAdd -werror option to q3map2 to make all warnings into errors 114/head
maek [Wed, 28 Nov 2018 08:59:27 +0000 (08:59 +0000)]
Add -werror option to q3map2 to make all warnings into errors

6 years agogamepack-manager: fix extra-urls trick
Thomas Debesse [Mon, 5 Nov 2018 14:50:25 +0000 (15:50 +0100)]
gamepack-manager: fix extra-urls trick

6 years agogame fixes
Thomas Debesse [Thu, 25 Oct 2018 04:06:55 +0000 (06:06 +0200)]
game fixes

6 years agoMerge branch 'picomodel-obj-surface-vertexes' into 'master'
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

6 years agoMerge branch 'werror' into 'master'
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

6 years agomake -Werror and -pedantic-errors a cmake option named USE_WERROR 106/head
Thomas Debesse [Sun, 28 Oct 2018 23:09:46 +0000 (00:09 +0100)]
make -Werror and -pedantic-errors a cmake option named USE_WERROR

6 years agoa bunch of gamepack-manager udpates
Thomas Debesse [Sun, 4 Nov 2018 07:23:51 +0000 (08:23 +0100)]
a bunch of gamepack-manager udpates

6 years agoFix a minor typo
Mario [Sat, 3 Nov 2018 22:37:41 +0000 (08:37 +1000)]
Fix a minor typo

6 years agoMerge branch 'webp' into 'master'
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

6 years agoMerge branch 'picomodel-obj-messages' into 'master'
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

6 years agoFix over allocating vertexes for OBJ models with multiple surfaces 107/head
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.

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

6 years agonew gamepack-manager script to download and install game packs
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.

6 years agoPrint name of undefined OBJ material 108/head
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.

6 years agoPrint OBJ/MTL filename in all picomodel OBJ loader messages
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.

6 years agoreadme update
Thomas Debesse [Sun, 28 Oct 2018 22:35:43 +0000 (23:35 +0100)]
readme update

6 years agoavoid the do while false hack, use goto
Thomas Debesse [Sun, 28 Oct 2018 22:12:37 +0000 (23:12 +0100)]
avoid the do while false hack, use goto

6 years agoremove questionable disabled debug dds code, git is made to keep track of junk history
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

6 years agowebp: add cmake support
Thomas Debesse [Fri, 6 Jul 2018 19:22:25 +0000 (21:22 +0200)]
webp: add cmake support

6 years agoWebP support for radiant and q3map2.
Stijn Buys [Sun, 30 Jun 2013 12:11:59 +0000 (14:11 +0200)]
WebP support for radiant and q3map2.

6 years agoq3map2/image.c: avoid the pyramid of if
Thomas Debesse [Fri, 6 Jul 2018 18:28:42 +0000 (20:28 +0200)]
q3map2/image.c: avoid the pyramid of if

6 years agooops, readd crunch submodule
Thomas Debesse [Sun, 28 Oct 2018 22:19:32 +0000 (23:19 +0100)]
oops, readd crunch submodule

6 years agolast minute fix to save legacy Makefile life one more time
Thomas Debesse [Sun, 28 Oct 2018 21:56:32 +0000 (22:56 +0100)]
last minute fix to save legacy Makefile life one more time

6 years agoMerge branch 'crunch-submodule' into 'master'
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

6 years agomake crunch build optional and disabled by default
Thomas Debesse [Sun, 28 Oct 2018 21:24:54 +0000 (22:24 +0100)]
make crunch build optional and disabled by default

6 years agomake crunch a submodule
Thomas Debesse [Tue, 2 Oct 2018 22:26:44 +0000 (00:26 +0200)]
make crunch a submodule

6 years agoq3map2: Add crn loading support to q3map2
dolcetriade [Thu, 5 Jul 2018 19:07:31 +0000 (12:07 -0700)]
q3map2: Add crn loading support to q3map2

6 years agoimage: add crn support to the image plugin.
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.

6 years agoMerge branch 'image_nofail' into 'master'
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

6 years agodo not fail on missing image or model plugin, they can be optional 105/head
Thomas Debesse [Sun, 28 Oct 2018 19:45:16 +0000 (20:45 +0100)]
do not fail on missing image or model plugin, they can be optional

6 years agoMerge branch 'illwieckz/dropwin9x' fix !50
Thomas Debesse [Wed, 3 Oct 2018 00:05:48 +0000 (02:05 +0200)]
Merge branch 'illwieckz/dropwin9x' fix !50

6 years agoDrop Windows 9x support
Thomas Debesse [Thu, 13 Jul 2017 15:15:32 +0000 (17:15 +0200)]
Drop Windows 9x support

- Windows 98 was using `%windir%\Application Data` without defining `%APPDATA%`
- Writing user config in `C:\netradiant` looked fine on single user OS driving FAT file system
- We can't build for Windows platforms that does not support `%APPDATA%`
- Windows XP Schrödinger edition is able to define `%APPDATA%` while being dead at the same time
- Even ReactOS 3.11 for Workgroups defines `%APPDATA%`
- Wine defines `%APPDATA%` like a boss
- Twenty first century is now a thing
- NetRadiant will never run on OpenGEM/FreeDOS (and that's a shame)

6 years agoMerge branch 'illwieckz/vfs' fix !101
Thomas Debesse [Wed, 3 Oct 2018 00:01:40 +0000 (02:01 +0200)]
Merge branch 'illwieckz/vfs' fix !101

6 years agoloadSpecial is not used 101/head
Thomas Debesse [Sun, 15 Jul 2018 12:50:53 +0000 (14:50 +0200)]
loadSpecial is not used

6 years agodefault texture is notex, not textures/ dir
Thomas Debesse [Sat, 14 Jul 2018 21:54:51 +0000 (23:54 +0200)]
default texture is notex, not textures/ dir

use textures/radiant/notex as default texture path
instead of textures/ (which is a directory not a file)

6 years agoload notex textures from a builtin vfs
Thomas Debesse [Sat, 14 Jul 2018 20:33:10 +0000 (22:33 +0200)]
load notex textures from a builtin vfs

- allow gamepack to override it (example: smokinguns has custom ones)
- it's not required anymore to compute paths from bitmaps from them
- we can use textures/radian/notex as a default texture (and we need to)

6 years agorefresh vfs before parsing map
Thomas Debesse [Sat, 14 Jul 2018 17:19:56 +0000 (19:19 +0200)]
refresh vfs before parsing map

6 years agoMerge branch 'illwieckz/nonumbers' fix !95
Thomas Debesse [Tue, 2 Oct 2018 23:44:34 +0000 (01:44 +0200)]
Merge branch 'illwieckz/nonumbers' fix !95

6 years agodo not write useless empty line at beginning of map file
Thomas Debesse [Sat, 5 May 2018 18:05:41 +0000 (20:05 +0200)]
do not write useless empty line at beginning of map file

6 years ago“Load last map at startup” wording
Thomas Debesse [Sat, 5 May 2018 17:37:26 +0000 (19:37 +0200)]
“Load last map at startup” wording

6 years agoadd an opt-out setting to not write entity and brush number comment on map write
Thomas Debesse [Sat, 5 May 2018 17:35:27 +0000 (19:35 +0200)]
add an opt-out setting to not write entity and brush number comment on map write

6 years agoMerge branch 'illwieckz/lastmodelfolder' fix !85
Thomas Debesse [Tue, 2 Oct 2018 23:28:25 +0000 (01:28 +0200)]
Merge branch 'illwieckz/lastmodelfolder' fix !85

6 years agorestore “open userGamePath/maps/” behavior when LastMapFolder unset
Thomas Debesse [Mon, 5 Feb 2018 02:54:58 +0000 (03:54 +0100)]
restore “open userGamePath/maps/” behavior when LastMapFolder unset

The former behavior when LastMapFolder was not implemented
was to try to open maps/ dir in userGamePath.

When LastMapFolder code was written the code only looked
for userGamePath, this is restoring that behavior,
mimicking the code for model opening that does the
same with userGamePath/models.

As an extra, it also fallback on userGamePath is maps/
is missing.

6 years agoremember last model opened folder “LastModelFolder”
Thomas Debesse [Mon, 5 Feb 2018 02:38:47 +0000 (03:38 +0100)]
remember last model opened folder “LastModelFolder”

6 years agorename “LastFolder” to “LastMapFolder”
Thomas Debesse [Mon, 5 Feb 2018 02:10:56 +0000 (03:10 +0100)]
rename “LastFolder” to “LastMapFolder”

6 years agoMerge branch 'illwieckz/fixpng' fix !102
Thomas Debesse [Tue, 2 Oct 2018 23:25:23 +0000 (01:25 +0200)]
Merge branch 'illwieckz/fixpng' fix !102

6 years agoradiant: fix alpha channel for palette-with-transparency png
Thomas Debesse [Sun, 15 Jul 2018 18:44:12 +0000 (20:44 +0200)]
radiant: fix alpha channel for palette-with-transparency png

6 years agoMerge branch 'illwieckz/undodetail' fix !103
Thomas Debesse [Tue, 2 Oct 2018 23:21:20 +0000 (01:21 +0200)]
Merge branch 'illwieckz/undodetail' fix !103

6 years agoallow undo “make detail/structural”, <3 @SpiKe, thanks @Garux, fix #76
Thomas Debesse [Sun, 15 Jul 2018 19:42:02 +0000 (21:42 +0200)]
allow undo “make detail/structural”, <3 @SpiKe, thanks @Garux, fix #76

see https://gitlab.com/xonotic/netradiant/issues/76

6 years agoMerge branch 'picomodelname' into 'master'
Mario [Tue, 5 Jun 2018 10:14:35 +0000 (10:14 +0000)]
Merge branch 'picomodelname' into 'master'

print picomodel filename on error for @Viech, fix #112

Closes #112

See merge request xonotic/netradiant!93

6 years agoMerge branch 'filternonshader' into 'master'
Mario [Tue, 5 Jun 2018 10:11:00 +0000 (10:11 +0000)]
Merge branch 'filternonshader' into 'master'

filter non-shader texture paths at the same place

See merge request xonotic/netradiant!94

6 years agoMerge branch 'optional_q3map2_type' into 'master'
Mario [Tue, 5 Jun 2018 10:03:31 +0000 (10:03 +0000)]
Merge branch 'optional_q3map2_type' into 'master'

Fix BSP import error when q3map2_type is missing from gamepack xml

See merge request xonotic/netradiant!96

6 years agoMerge branch 'transfilterfix' into 'master'
Mario [Sat, 2 Jun 2018 13:22:16 +0000 (13:22 +0000)]
Merge branch 'transfilterfix' into 'master'

refresh vfs on map load instead of restarting it, fix #115

Closes #115

See merge request xonotic/netradiant!97

6 years agofix typo 97/head
Thomas Debesse [Sat, 2 Jun 2018 12:57:48 +0000 (14:57 +0200)]
fix typo

6 years agorefresh vfs on map load instead of restarting it, fix #115
Thomas Debesse [Sat, 2 Jun 2018 12:56:34 +0000 (14:56 +0200)]
refresh vfs on map load instead of restarting it, fix #115

it prevents the crash happening at map load when translucent
texture filter is activated, see #115

6 years agoFix BSP import error when q3map2_type is missing from gamepack xml 96/head
Zack Middleton [Tue, 22 May 2018 20:44:57 +0000 (15:44 -0500)]
Fix BSP import error when q3map2_type is missing from gamepack xml

Using File -> Import... to import a BSP using a gamepack that does not
specify q3map2_type (such as the Quake 3 gamepack) resulted in a fatal
error:

    runtime error: game attribute "q3map2_type" not found in "q3.game"

The code already has a fallback to use type "quake3" if q3map2_type is
missing so don't require gamepacks to specify it.

6 years agofilter non-shader texture paths at the same place
Thomas Debesse [Sat, 5 May 2018 01:23:14 +0000 (03:23 +0200)]
filter non-shader texture paths at the same place

also filter more known suffixes

6 years agoprint picomodel filename on error for @Viech, fix #112
Thomas Debesse [Fri, 4 May 2018 15:55:06 +0000 (17:55 +0200)]
print picomodel filename on error for @Viech, fix #112

6 years agoMerge branch 'Mario/winfix' into 'master'
TimePath [Thu, 3 May 2018 09:52:10 +0000 (09:52 +0000)]
Merge branch 'Mario/winfix' into 'master'

Merge branch Mario/winfix (S merge request)

See merge request xonotic/netradiant!91

6 years ago#define _USE_MATH_DEFINES 91/head
TimePath [Thu, 3 May 2018 09:28:14 +0000 (09:28 +0000)]
#define _USE_MATH_DEFINES

6 years agoFix the build
TimePath [Tue, 1 May 2018 12:34:59 +0000 (22:34 +1000)]
Fix the build

6 years agoMerge branch 'nomagicpath' into 'master'
Mario [Sun, 29 Apr 2018 14:27:43 +0000 (14:27 +0000)]
Merge branch 'nomagicpath' into 'master'

q3map2: disable magic path guess

See merge request xonotic/netradiant!90

6 years agoMerge branch 'csgmakeroom' into 'master'
Mario [Sun, 29 Apr 2018 14:08:29 +0000 (14:08 +0000)]
Merge branch 'csgmakeroom' into 'master'

implement CSG Make Room, thanks to Garux, <3 Mario

See merge request xonotic/netradiant!88

6 years agoMerge branch 'master' into Mario/winfix
Mario [Sun, 29 Apr 2018 14:01:55 +0000 (00:01 +1000)]
Merge branch 'master' into Mario/winfix

6 years agoMerge branch 'fix-fast' into 'master'
Mario [Sun, 29 Apr 2018 13:46:46 +0000 (13:46 +0000)]
Merge branch 'fix-fast' into 'master'

Fix a bug that prevent -fast to behave correctly

See merge request xonotic/netradiant!64

6 years agoMerge branch 'diffnoise' into 'master'
Mario [Sun, 29 Apr 2018 12:31:33 +0000 (12:31 +0000)]
Merge branch 'diffnoise' into 'master'

tools: reduce diff noise with GtkRadiant

See merge request xonotic/netradiant!82

6 years agoMerge branch 'iqmmodel' into 'master'
Mario [Sun, 29 Apr 2018 11:37:17 +0000 (11:37 +0000)]
Merge branch 'iqmmodel' into 'master'

plugins/iqmmodel: apply textures on surfaces

Closes #116

See merge request xonotic/netradiant!84

6 years agoMerge branch 'q3map2help' into 'master'
Mario [Sun, 29 Apr 2018 11:36:16 +0000 (11:36 +0000)]
Merge branch 'q3map2help' into 'master'

some fixes to q3map2 help

See merge request xonotic/netradiant!86

6 years agoMerge branch 'q3map2game' into 'master'
Mario [Sun, 29 Apr 2018 11:22:20 +0000 (11:22 +0000)]
Merge branch 'q3map2game' into 'master'

import some q3map2 game options from gtkradiant tree

See merge request xonotic/netradiant!87

6 years agoMerge branch 'fixvis' into 'master'
Mario [Sun, 29 Apr 2018 11:15:50 +0000 (11:15 +0000)]
Merge branch 'fixvis' into 'master'

q3map2: fix prt loading for vis computation when using -prtfile

See merge request xonotic/netradiant!89

6 years agoq3map2: -fs_nobasepath implies -fs_nomagicpath 90/head
Thomas Debesse [Sat, 28 Apr 2018 13:31:49 +0000 (15:31 +0200)]
q3map2: -fs_nobasepath implies -fs_nomagicpath

6 years agoq3map2: disable magic path guess
Thomas Debesse [Sat, 28 Apr 2018 13:22:13 +0000 (15:22 +0200)]
q3map2: disable magic path guess

6 years agoq3map2: fix prt loading for vis computation when using -prtfile 89/head
Thomas Debesse [Sat, 28 Apr 2018 13:15:23 +0000 (15:15 +0200)]
q3map2: fix prt loading for vis computation when using -prtfile

6 years agoimplement CSG Make Room, thanks to Garux, <3 Mario
Thomas Debesse [Sun, 4 Mar 2018 03:43:35 +0000 (04:43 +0100)]
implement CSG Make Room, thanks to Garux, <3 Mario

- implement CSG Make Room using code by @Garux from !11
- calls this operation “Make Room” like in DarkRadiant
  this is what GTKRadiant calls “CSG Hollow Touch”
- draw the pixmap icon according to the current theme
- greet @Mario

6 years agosome fixes to q3map2 help
Thomas Debesse [Sat, 3 Mar 2018 02:28:21 +0000 (03:28 +0100)]
some fixes to q3map2 help

6 years agoFix compile on MSYS2
Mario [Sun, 4 Mar 2018 04:12:08 +0000 (14:12 +1000)]
Fix compile on MSYS2

6 years agoExtra donotenterlarge surfaceparm for nonotenterlarge
Pan [Tue, 16 Jan 2018 12:12:13 +0000 (13:12 +0100)]
Extra donotenterlarge surfaceparm for nonotenterlarge

6 years agoimport some q3map2 game options from gtkradiant tree
Thomas Debesse [Sat, 3 Mar 2018 21:27:27 +0000 (22:27 +0100)]
import some q3map2 game options from gtkradiant tree

6 years agoiqmmodel: better format description
Thomas Debesse [Sat, 3 Feb 2018 17:01:15 +0000 (18:01 +0100)]
iqmmodel: better format description

6 years agoremove debug code and useless one
Thomas Debesse [Thu, 1 Feb 2018 23:18:31 +0000 (00:18 +0100)]
remove debug code and useless one

6 years agoplugins/iqmmodel: apply textures on surfaces
Thomas Debesse [Thu, 1 Feb 2018 20:52:09 +0000 (21:52 +0100)]
plugins/iqmmodel: apply textures on surfaces

6 years agouncrustify iqmmodel code
Thomas Debesse [Thu, 1 Feb 2018 19:34:08 +0000 (20:34 +0100)]
uncrustify iqmmodel code

6 years agoreduce more diff noise
Thomas Debesse [Sun, 28 Jan 2018 05:46:54 +0000 (06:46 +0100)]
reduce more diff noise

6 years agosome fixes to issues pointed by @tkoeppe
Thomas Debesse [Sun, 28 Jan 2018 00:34:30 +0000 (01:34 +0100)]
some fixes to issues pointed by @tkoeppe

6 years agoanother way to do 265c42d
Thomas Debesse [Sat, 27 Jan 2018 21:13:14 +0000 (22:13 +0100)]
another way to do 265c42d

6 years agoit's better to close file and return on non-void function
Thomas Debesse [Sat, 27 Jan 2018 21:04:11 +0000 (22:04 +0100)]
it's better to close file and return on non-void function

6 years agotools: reduce diff noise
Thomas Debesse [Tue, 23 Jan 2018 23:15:59 +0000 (00:15 +0100)]
tools: reduce diff noise

6 years agoFix g_ascii_strdown usage
Pan7 [Mon, 7 Aug 2017 23:24:41 +0000 (01:24 +0200)]
Fix g_ascii_strdown usage

6 years ago[q3map2] Unwind script stack in case of script loading error.
Thomas Köppe [Mon, 8 Jan 2018 15:18:29 +0000 (15:18 +0000)]
[q3map2] Unwind script stack in case of script loading error.

Also avoid type punning read into char* variable (even though char* and void* happen to be layout-compatible).

6 years agoMerge branch 'importfixes' into 'master'
Mario [Tue, 23 Jan 2018 03:55:09 +0000 (03:55 +0000)]
Merge branch 'importfixes' into 'master'

q3map2: fix pk3dir/dpk/dpkdir code

See merge request xonotic/netradiant!81

6 years agofix pk3dir/dpk/dpkdir code 81/head
Timothee Besset [Mon, 22 Jan 2018 15:03:45 +0000 (09:03 -0600)]
fix pk3dir/dpk/dpkdir code

6 years agoreformat code! now the code is only ugly on the *inside*
TimePath [Sat, 6 Jan 2018 02:56:39 +0000 (13:56 +1100)]
reformat code! now the code is only ugly on the *inside*

6 years agoDisable CMAKE_CXX_EXTENSIONS
TimePath [Sat, 6 Jan 2018 01:36:16 +0000 (12:36 +1100)]
Disable CMAKE_CXX_EXTENSIONS

6 years agoMerge branch 'pakpath' into 'master'
TimePath [Sat, 6 Jan 2018 01:27:22 +0000 (01:27 +0000)]
Merge branch 'pakpath' into 'master'

Add pakpath support to radiant

See merge request xonotic/netradiant!79

6 years agoradiant/q3map2: add option to disable engine path and home path 79/head
Thomas Debesse [Sun, 31 Dec 2017 17:30:47 +0000 (18:30 +0100)]
radiant/q3map2: add option to disable engine path and home path

- add radiant options to not load assets from
  engine path and home path, it helps people to build
  safe development environment
- add -fs_nobasepath and -fs_nohomepath to q3map2
  to do the same
- make radiant pass these options to q3map2