]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
TimePath [Sat, 29 Jul 2017 03:42:29 +0000 (03:42 +0000)]
Merge branch 'fix-minizip' into 'master'
Fix build for Windows when using CMake
See merge request !68
maek [Thu, 27 Jul 2017 22:22:36 +0000 (23:22 +0100)]
Fix build for Windows when using CMake
TimePath [Sat, 22 Jul 2017 14:22:00 +0000 (00:22 +1000)]
Switch to minizip
Mario [Tue, 18 Jul 2017 14:56:09 +0000 (14:56 +0000)]
Merge branch 'dpkdir' into 'master'
refresh DPK VFS before refreshing textures
Closes #105
See merge request !53
Thomas Debesse [Tue, 18 Jul 2017 11:26:30 +0000 (13:26 +0200)]
refresh VFS on map change instead of restarting VFS, fix #105
Neumond probably thoughts it would be cool to make a file observer
that reloads the VFS each time the map change, was a nice idea.
Badly, it makes the VFS reloading itself before saving a map,
losing the current work done.
Hopefull, since I added a “Refresh” ability that refreshes the VFS
without reloading the map, we can just use that Regresh ability
instead.
TimePath [Sun, 16 Jul 2017 10:00:19 +0000 (20:00 +1000)]
Fix the build on my system
Mario [Sun, 16 Jul 2017 08:14:33 +0000 (08:14 +0000)]
Merge branch 'fixurl' into 'master'
little url fixup
See merge request !52
Mario [Sun, 16 Jul 2017 08:13:00 +0000 (08:13 +0000)]
Merge branch 'export' into 'master'
Name _Export_ option ”Export”
See merge request !54
Thomas Debesse [Sat, 15 Jul 2017 13:48:00 +0000 (15:48 +0200)]
Name _Export_ option ”Export”
It's called “Export” everywhere except in menu!
Thomas Debesse [Sat, 15 Jul 2017 12:08:24 +0000 (14:08 +0200)]
refresh DPK VFS before refreshing textures
DPK VFS allows to add and remove pak dependencies.
Reloading VFS before refreshing textures ensures
added or removed dependencies are handled without
reloading the whole map.
It allows the user to edit the DEPS file while radiant
is running, he just has to reload the VFS asking for
texture refresh.
Mario [Wed, 12 Jul 2017 20:52:35 +0000 (20:52 +0000)]
Merge branch 'fixpk3' into 'master'
[regression] fix pk3 archive loading [currently broken]
See merge request !49
Thomas Debesse [Tue, 11 Jul 2017 11:53:38 +0000 (13:53 +0200)]
little url fixup
Thomas Debesse [Tue, 11 Jul 2017 11:17:43 +0000 (13:17 +0200)]
fix pk3 archive loading
pk3dir/dpkdir directories were working, not pk3/dpk archives because of
wrong extension comparison.
Mario [Tue, 11 Jul 2017 06:29:28 +0000 (06:29 +0000)]
Merge branch 'fixurl' into 'master'
Fix menu and about url, remove “check for update” , use xdg-open, enable https
Closes #28 and #87
See merge request !45
Thomas Debesse [Tue, 11 Jul 2017 03:36:00 +0000 (05:36 +0200)]
use xdg-open to open url on Linux, fix #87
Thomas Debesse [Tue, 11 Jul 2017 03:34:28 +0000 (05:34 +0200)]
remove "Check for updates" menu entry, fix #28"
Thomas Debesse [Tue, 11 Jul 2017 03:08:45 +0000 (05:08 +0200)]
Fix menu and about url
- remove dead url and set usable ones instead
- allow to open https:// urls
Mario [Mon, 10 Jul 2017 17:13:28 +0000 (17:13 +0000)]
Merge branch 'sysfprintf' into 'master'
import sys_fprintf changes by Pan7 from GtkRadiant tree
See merge request !35
Mario [Mon, 10 Jul 2017 17:12:52 +0000 (17:12 +0000)]
Merge branch 'dpkdir' into 'master'
add pk3dir and dpkdir support
See merge request !39
Mario [Mon, 10 Jul 2017 17:08:38 +0000 (17:08 +0000)]
Merge branch 'unvdeluxe' into 'master'
[q3map2] dæmon engine expects model space deluxe maps
See merge request !40
Mario [Mon, 10 Jul 2017 17:08:02 +0000 (17:08 +0000)]
Merge branch 'unvpack' into 'master'
add unvanquished game pack [the real one]
See merge request !41
Mario [Mon, 10 Jul 2017 17:04:11 +0000 (17:04 +0000)]
Merge branch 'fixcflags' into 'master'
[cmake] assign CMAKE_CXX_FLAGS as a string instead of a list
See merge request !44
Mario [Mon, 10 Jul 2017 17:03:47 +0000 (17:03 +0000)]
Merge branch 'importfixes' into 'master'
[q3map2] import fixes from Thomas Köppe
See merge request !33
Mario [Mon, 10 Jul 2017 13:39:47 +0000 (13:39 +0000)]
Merge branch 'libpng16fix' into 'master'
[q3map2] do not copypaste zlib, fix 96
Closes #96
See merge request !42
Thomas Debesse [Sun, 9 Jul 2017 20:01:46 +0000 (22:01 +0200)]
[cmake] assign CMAKE_CXX_FLAGS as a string instead of a list
- fix command line -DCMAKE_CXX_FLAGS expansion
spotted by !43
Thomas Debesse [Tue, 25 Apr 2017 23:02:51 +0000 (01:02 +0200)]
do not copypaste zlib
unzip.c contains many bits from an older zlib which mismatches with newer zlib loaded by libpng.
This fix just make unzip.c relying on zlib like libpng does, without copypasting it.
Thanks to `Ishq who figured out the issue.
Thomas Debesse [Sun, 23 Apr 2017 01:24:27 +0000 (03:24 +0200)]
[q3map2] unvanquished expects white minimap
Thomas Debesse [Tue, 4 Oct 2016 23:21:44 +0000 (01:21 +0200)]
add unvanquished game pack
Thomas Debesse [Thu, 20 Apr 2017 17:28:11 +0000 (19:28 +0200)]
[q3map2] dæmon engine expects model space deluxe maps
Thomas Debesse [Sun, 26 Mar 2017 01:44:21 +0000 (03:44 +0200)]
do not load tex-* dpk by default, only rely on map DEPS
Thomas Debesse [Mon, 13 Mar 2017 02:41:55 +0000 (03:41 +0100)]
introduce dpk / dpkdir support
- do not rely on game name but on new dpk format
to check for DEPS and versions
- pk3 / pk3dir support is for legacy paks only
- add pk4dir support for free (legacy paks)
replace unvanquished references by daemon ones
in function/variable name for versionned vfs code
Thomas Debesse [Mon, 13 Mar 2017 01:52:04 +0000 (02:52 +0100)]
do not crash on missing pak dependency
neumond [Thu, 3 Jul 2014 22:00:21 +0000 (02:00 +0400)]
Add texturebrowser tree updates on vfs restart
neumond [Mon, 30 Jun 2014 22:24:10 +0000 (02:24 +0400)]
load all tex-* paks, remove VFS double start
neumond [Sun, 29 Jun 2014 15:29:26 +0000 (19:29 +0400)]
unvanquished filesystem
Mario [Fri, 7 Apr 2017 04:01:52 +0000 (04:01 +0000)]
Merge branch 'fix-floodentities' into 'master'
Fix FloodEntities origin-less check
Closes #57
See merge request !38
maek [Fri, 24 Mar 2017 10:15:47 +0000 (10:15 +0000)]
Fix FloodEntities origin-less check
Mario [Sun, 12 Mar 2017 22:47:19 +0000 (22:47 +0000)]
Merge branch 'matthiaskrgr/no_store_on_no_bnc' into 'master'
q3map2: don't store lightmap if the last bounce computation ran empty.
See merge request !9
Matthias Krüger [Thu, 3 Sep 2015 00:29:27 +0000 (02:29 +0200)]
q3map2: don't store lightmap if the last bounce computation ran empty.
Mario [Sun, 12 Mar 2017 19:42:42 +0000 (19:42 +0000)]
Merge branch 'Melanosuchus/fix_build' into 'master'
Fix compilation
See merge request !36
Mattia Basaglia [Sun, 12 Mar 2017 19:34:42 +0000 (19:34 +0000)]
Fix compilation
Rudolf Polzer [Wed, 19 Oct 2016 19:22:12 +0000 (15:22 -0400)]
Sorry - nullptr doesn't work with the default Makefile and I don't trust the rest of the code to compile with -std=c++11 yet.
Thomas Debesse [Sat, 15 Oct 2016 18:00:27 +0000 (20:00 +0200)]
More: Using Sys_FPrintf with SYS_WRN and SYS_ERR
This commit do the same as “Using Sys_FPrintf with SYS_WRN and SYS_ERR” commit by @Pan7 (
a288b9c ) for occurrences that were left untouched (tools/ subtree only).
Pan7 [Mon, 16 May 2016 19:20:20 +0000 (21:20 +0200)]
Using Sys_FPrintf with SYS_WRN and SYS_ERR
Timothee Besset [Sun, 24 Apr 2016 20:05:09 +0000 (15:05 -0500)]
phrasing..
Thomas Köppe [Sun, 14 Aug 2016 00:08:28 +0000 (01:08 +0100)]
[tools/quake3/q3map2] Fix memset size bugs
Thomas Köppe [Tue, 16 Aug 2016 21:50:14 +0000 (22:50 +0100)]
[quake3/q3map2/brush.c] Fix misnamed variable
Thomas Köppe [Sun, 14 Aug 2016 11:13:18 +0000 (12:13 +0100)]
[tools/quake3/q3map2/light{,maps}_ydnar.c] Fix float-to-int conversion by preventing NaN values
Thomas Köppe [Sun, 14 Aug 2016 00:21:30 +0000 (01:21 +0100)]
[quake3/common/aselib.c] Remove unused local variables
Thomas Köppe [Sun, 14 Aug 2016 00:14:17 +0000 (01:14 +0100)]
[quake3/q3map2/brush.c] Fix arithmetic bug
Thomas Köppe [Wed, 3 Aug 2016 14:50:54 +0000 (15:50 +0100)]
[unzip.c{,pp}] Change zc{alloc,free} to internal linkage
Thomas Köppe [Wed, 3 Aug 2016 11:12:27 +0000 (12:12 +0100)]
[regression_tests] Convert line endings to Unix style uniformly
TimePath [Fri, 7 Oct 2016 13:57:13 +0000 (13:57 +0000)]
Merge branch 'nobigfirst' into 'master'
revert "allocate bigger first"
partial revert of
d4fa608 ([L2313](https://gitlab.com/xonotic/netradiant/commit/
8bc246a01343d9c9dd3a8b678681710cf04a2953 #416ec0c19ddc04c6485e9853a0c8a125f98dca13_2295_2313))
see #54 ([
13326399 ](https://gitlab.com/xonotic/netradiant/issues/54#note_13326399))
"allocate bigger first" change was meant to save allocation time keeping same lightmap file size, actually wastes both time and size
See merge request !32
Thomas Debesse [Fri, 7 Oct 2016 12:45:36 +0000 (14:45 +0200)]
revert "allocate bigger first"
partial revert of
d4fa608
see #54
"allocate bigger first" change was meant to save allocation time keeping same lightmap file size, actually wastes both time and size
TimePath [Sun, 24 Jul 2016 03:58:46 +0000 (03:58 +0000)]
Merge branch 'qfusion_updates' into 'master'
-game qfusion updates
See merge request !29
Victor Luchits [Wed, 13 Jul 2016 23:00:20 +0000 (02:00 +0300)]
-game qfusion updates
TimePath [Thu, 30 Jun 2016 11:33:02 +0000 (11:33 +0000)]
Merge branch 'default-srgb-color-fix' into 'master'
Fix default minimum/ambience color for sRGB lightmaps
Having _minlight or _ambient set in "worldspawn" without explicitly specifying the respective value resulted in overbright lights if -sRGB mode was specified.
See merge request !27
Victor Luchits [Tue, 28 Jun 2016 09:03:22 +0000 (12:03 +0300)]
Fix default minimum/ambience color for sRGB lightmaps
TimePath [Sat, 28 May 2016 12:14:04 +0000 (12:14 +0000)]
Remove trailing ` in README.md
TimePath [Thu, 19 May 2016 11:12:08 +0000 (21:12 +1000)]
Use RTLD_DEEPBIND
Closes #67
TimePath [Thu, 14 Apr 2016 07:04:11 +0000 (17:04 +1000)]
Merge remote-tracking branch 'illwieckz/lokipaths'
Thomas Debesse [Thu, 18 Feb 2016 11:46:25 +0000 (12:46 +0100)]
fix undocumented unexpected LokiInitPaths
TimePath [Thu, 14 Apr 2016 06:06:02 +0000 (16:06 +1000)]
Merge remote-tracking branch 'illwieckz/unvanquished'
Thomas Debesse [Wed, 17 Feb 2016 22:34:57 +0000 (23:34 +0100)]
add unvanquished game support to q3map2
- import game_unvanquished.h from daemonmap
- tweak default values
TimePath [Thu, 14 Apr 2016 03:02:09 +0000 (13:02 +1000)]
Merge remote-tracking branch 'illwieckz/keepshader'
TimePath [Thu, 14 Apr 2016 02:42:54 +0000 (12:42 +1000)]
Merge remote-tracking branch 'illwieckz/exportents'
Thomas Debesse [Thu, 11 Feb 2016 20:49:13 +0000 (21:49 +0100)]
do not delete q3map2_*.shader on minimap generation
Thomas Debesse [Fri, 12 Feb 2016 21:42:15 +0000 (22:42 +0100)]
add help for -exportents
Chris Brooke [Mon, 15 Jul 2013 03:58:15 +0000 (04:58 +0100)]
Added -exportents to q3map2.
TimePath [Thu, 14 Apr 2016 02:13:48 +0000 (12:13 +1000)]
Merge remote-tracking branch 'illwieckz/fastallocate'
TimePath [Thu, 14 Apr 2016 02:06:19 +0000 (12:06 +1000)]
Merge remote-tracking branch 'illwieckz/pakpath'
TimePath [Thu, 14 Apr 2016 02:00:43 +0000 (12:00 +1000)]
Merge remote-tracking branch 'illwieckz/outoftree'
Thomas Debesse [Sat, 6 Feb 2016 05:35:14 +0000 (06:35 +0100)]
lightmap allocation speed-up, add -fastallocate
- Allocate large lightmaps first to speed up the allocation process
- Add `-fastallocate` option to trade lightmap size against allocation time (useful with hi res lightmaps on large maps: reduce allocation time from days to minutes for only some extra bytes:
- If fast allocation, skip lightmap files that are more than 90% complete
- If fast allocation, do not test allocation on every pixels, especially for large lightmaps
Thanks to Kangz (Corentin Wallez) for his precious help and his kind availability.
Thomas Debesse [Sat, 15 Aug 2015 05:19:13 +0000 (07:19 +0200)]
add -fs_pakpath option to q3map2 to add custom path to assets, fix #29
Thomas Debesse [Mon, 20 Jul 2015 10:39:42 +0000 (12:39 +0200)]
enable q3map2 out of tree compilation
TimePath [Thu, 14 Apr 2016 01:22:00 +0000 (11:22 +1000)]
Merge remote-tracking branch 'illwieckz/split' into master
TimePath [Thu, 14 Apr 2016 00:48:56 +0000 (10:48 +1000)]
Add CMakeLists.txt
Thomas Debesse [Tue, 21 Jul 2015 02:21:21 +0000 (04:21 +0200)]
fix -analyze q3map2 help
Thomas Debesse [Tue, 21 Jul 2015 01:41:24 +0000 (03:41 +0200)]
split fixaas stuff from q3map2
Thomas Debesse [Tue, 21 Jul 2015 01:28:23 +0000 (03:28 +0200)]
split bsp analyze/info/scale stuff from q3map2
Thomas Debesse [Mon, 20 Jul 2015 18:10:23 +0000 (20:10 +0200)]
split help stuff from q3map2
Thomas Debesse [Mon, 20 Jul 2015 11:07:37 +0000 (13:07 +0200)]
split bsp conversion stuff from q3map2
Thomas Debesse [Mon, 20 Jul 2015 10:57:09 +0000 (12:57 +0200)]
split minimap stuff from q3map2
Mirio [Tue, 12 Jan 2016 04:40:10 +0000 (04:40 +0000)]
Merge branch 'ingar/png_icons' into 'master'
Ingar/png icons
Replaces BMP icon images with PNG images, this allows for better icon transparency.
See merge request !8
Mario [Fri, 25 Dec 2015 23:40:20 +0000 (09:40 +1000)]
Update Xonotic wiki URL
Rudolf Polzer [Mon, 21 Dec 2015 15:09:58 +0000 (15:09 +0000)]
Merge branch 'master' into 'master'
Fix OS X segmentation fault (ericwa). Fix Quetoo game detection.
See merge request !16
Jay Dolan [Mon, 21 Dec 2015 00:49:37 +0000 (00:49 +0000)]
Merge branch 'master' into 'master'
Fix crash on launch on OS X. Also describe installing deps with homebrew.
Hi,
I applied this patch to fix the crash after the initial game selection dialog: https://github.com/TTimo/GtkRadiant/issues/289
Also made a small update to COMPILING describing how you can build using dependencies installed with Homebrew.
See merge request !1
Jay Dolan [Mon, 21 Dec 2015 00:30:46 +0000 (19:30 -0500)]
Whoops..
Jay Dolan [Sun, 20 Dec 2015 22:15:53 +0000 (17:15 -0500)]
Give credit where credit's due :)
Jay Dolan [Tue, 8 Dec 2015 14:00:57 +0000 (09:00 -0500)]
Merge remote-tracking branch 'upstream/master'
Jay Dolan [Tue, 8 Dec 2015 14:00:54 +0000 (09:00 -0500)]
Download QuetooPack instead of Q2W.
Mario [Sun, 15 Nov 2015 23:05:24 +0000 (23:05 +0000)]
Merge branch 'ingar/doom3entitywarn' into 'master'
Fixes an annoyance reported by Taoki.
Write an error message to the log instead of showing a messagebox for unsopported Doom 3 entity keys.
See merge request !13
Mario [Sun, 15 Nov 2015 18:58:08 +0000 (18:58 +0000)]
Merge branch 'SiPlus/tga-grey-rle' into 'master'
Add grayscale RLE TGA support
Closes #6
See merge request !14
Stijn Buys [Sat, 3 Oct 2015 14:59:18 +0000 (16:59 +0200)]
Write an error message to the log instead of showing a messagebox for unsopported Doom 3 entity keys.
Rudolf Polzer [Mon, 3 Aug 2015 16:36:59 +0000 (18:36 +0200)]
Also include DarkPlaces texture names in the diffuse map filtering.
Rudolf Polzer [Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)]
Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant
Rudolf Polzer [Mon, 3 Aug 2015 16:28:15 +0000 (18:28 +0200)]
Merge branch 'master' of https://gitlab.com/jdolan/netradiant
Mario [Sun, 2 Aug 2015 02:08:23 +0000 (02:08 +0000)]
Merge branch 'ingar/png_icons' into 'master'
Ingar/png icons
Replaces BMP icon images with PNG images, this allows for better icon transparency.
See merge request !8
Mario [Wed, 22 Jul 2015 01:26:54 +0000 (01:26 +0000)]
Merge branch 'Melanosuchus/q3map2_sucks' into 'master'
Fix a horrible bug in q3map2
This function passed a int* instead of a void** causing local variables to be overwritten,
which in turn caused the program to crash.
See merge request !7
Mattia Basaglia [Tue, 21 Jul 2015 14:26:18 +0000 (16:26 +0200)]
Fix a horrible bug in q3map2
This function passed a int* instead of a void** causing local variables to be overwritten,
which in turn caused the program to crash.