]>
git.rm.cloudns.org Git - xonotic/netradiant.git/log
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
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 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.
Mario [Mon, 20 Jul 2015 11:19:21 +0000 (11:19 +0000)]
Merge branch 'Melanosuchus/q3map2_help' into 'master'
Add help options to q3map2
Closes #9
See merge request !5
Mattia Basaglia [Mon, 20 Jul 2015 09:37:51 +0000 (11:37 +0200)]
Add help options to q3map2
Closes #9
Mario [Mon, 20 Jul 2015 02:35:04 +0000 (02:35 +0000)]
Merge branch 'Melanosuchus/rotate_scale_dialogs' into 'master'
Don't call Cancel from OK in the Arbitrary rotation and scale dialogs
Effects:
* Pressing enter applies the transformation before closing the dialog
* Pressing OK doesn't clear the values
See merge request !4
Mario [Mon, 20 Jul 2015 02:32:55 +0000 (02:32 +0000)]
Merge branch 'Melanosuchus/texture_browser' into 'master'
Melanosuchus/texture_browser
Some improvements to the texture browser:
* "Fixed Size" enabled by default (makes it easier to select textures and looks nicer)
* Option (in the menu) to show the transparency (over the commonly used gray checkerboard, transparent images look much nicer)
* When shaders are refreshed, forces reloading the textures as well. Previously it would at best only display shaders, at worst mess up some textured objects.
* Option (in the preferences dialog) to change the texture thumbnail size when they are displayed with a fixed size
See merge request !3
Mattia Basaglia [Sun, 19 Jul 2015 19:07:02 +0000 (21:07 +0200)]
Don't call Cancel from OK in the Arbitrary rotation and scale dialogs
Mattia Basaglia [Sun, 19 Jul 2015 15:13:53 +0000 (17:13 +0200)]
Add an option for the fixed size texture thumbnails
Mattia Basaglia [Sun, 19 Jul 2015 14:26:13 +0000 (16:26 +0200)]
Change some default settings to give a nicer presentation of the texture browser
Mattia Basaglia [Sun, 19 Jul 2015 13:43:08 +0000 (15:43 +0200)]
Group purely visual options in the menu
Mattia Basaglia [Sun, 19 Jul 2015 13:29:40 +0000 (15:29 +0200)]
Option to show transparency in the texture browser
Mattia Basaglia [Sun, 19 Jul 2015 10:42:16 +0000 (12:42 +0200)]
Reload textures in the currently selected directory when shaders are reloaded
Mario [Sun, 19 Jul 2015 09:54:20 +0000 (09:54 +0000)]
Merge branch 'Melanosuchus/patch_ui' into 'master'
Melanosuchus/patch ui
Various changes related to patch meshes.
* Global commands
* Cleaned up some duplicate commands.
* Patch dialog
* Added buttons to flip the texture
* Added a button that select the proper axis for cap texture on the selected objects
* Cap selection
* Now it generate caps with sensible texture coordinates (for axis-aligned patches)
* Surface dialog
* Fixed patch texture buttons that didn't create undoable actions
* Removed code duplication with the patch dialog
See merge request !2
Mario [Sun, 19 Jul 2015 09:52:30 +0000 (19:52 +1000)]
Ignore games folder
Mario [Sun, 19 Jul 2015 09:43:52 +0000 (09:43 +0000)]
Merge branch 'Melanosuchus/patch_ui' into 'master'
Melanosuchus/patch ui
Various changes related to patch meshes.
* Global commands
* Cleaned up some duplicate commands.
* Patch dialog
* Added buttons to flip the texture
* Added a button that select the proper axis for cap texture on the selected objects
* Cap selection
* Now it generate caps with sensible texture coordinates (for axis-aligned patches)
* Surface dialog
* Fixed patch texture buttons that didn't create undoable actions
* Removed code duplication with the patch dialog
See merge request !2
Mattia Basaglia [Sun, 19 Jul 2015 09:18:47 +0000 (11:18 +0200)]
Re-align patch texture dialog
Mattia Basaglia [Sun, 19 Jul 2015 08:31:22 +0000 (10:31 +0200)]
Apply auto cap textures to make caps
Mattia Basaglia [Sun, 19 Jul 2015 08:21:42 +0000 (10:21 +0200)]
Auto cap button
Mattia Basaglia [Sun, 19 Jul 2015 07:41:06 +0000 (09:41 +0200)]
Now that the dialog has the flip buttons, the menu is no longer needed
Mattia Basaglia [Sun, 19 Jul 2015 07:36:05 +0000 (09:36 +0200)]
Add flip buttons to the patch texture dialog
Mattia Basaglia [Sun, 19 Jul 2015 07:05:59 +0000 (09:05 +0200)]
Clean up and fix actions, menus and dialogs for patch meshes
SiPlus [Thu, 2 Jul 2015 12:20:51 +0000 (15:20 +0300)]
Add grayscale RLE TGA support
Rudolf Polzer [Mon, 1 Jun 2015 08:45:24 +0000 (10:45 +0200)]
Merge commit 'refs/pull/1/head' of https://github.com/xonotic/netradient
SiPlus [Sun, 31 May 2015 07:04:54 +0000 (10:04 +0300)]
Remove an unused field of KTX_Decoder
SiPlus [Sat, 30 May 2015 19:06:19 +0000 (22:06 +0300)]
KTX support - something Git didn't want to commit
SiPlus [Sat, 30 May 2015 18:55:04 +0000 (21:55 +0300)]
Add KTX and ETC1 texture support
Eric Wasylishen [Wed, 27 May 2015 06:20:09 +0000 (00:20 -0600)]
update COMPILING with instructions for Homebrew
Eric Wasylishen [Wed, 27 May 2015 06:19:11 +0000 (00:19 -0600)]
Hack around segfault at launch, patch from danfe: https://github.com/TTimo/GtkRadiant/issues/289
Jay Dolan [Sun, 8 Mar 2015 17:54:53 +0000 (13:54 -0400)]
Fix detection of Quetoo install.
Jay Dolan [Tue, 17 Feb 2015 14:34:32 +0000 (09:34 -0500)]
Filter non-diffuse textures (bump, glow, local, spec, etc) from texture browser.