Commit Graph
1442 Commits
Author SHA1 Message Date
Rudolf Polzer 6aa642ef01 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. 2016-10-19 15:22:12 -04:00
TimePath 766c4da7e0 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
2016-10-07 13:57:13 +00:00
Thomas Debesse b062569fee 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
2016-10-07 14:57:43 +02:00
TimePath c6ffb73b48 Merge branch 'qfusion_updates' into 'master'
-game qfusion updates



See merge request !29
2016-07-24 03:58:46 +00:00
Victor Luchits 3012630575 -game qfusion updates 2016-07-14 02:01:41 +03:00
TimePath de2db34ce7 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
2016-06-30 11:33:02 +00:00
Victor Luchits 82acc96609 Fix default minimum/ambience color for sRGB lightmaps 2016-06-28 12:03:22 +03:00
TimePath f6809bed86 Remove trailing ` in README.md 2016-05-28 12:14:04 +00:00
TimePath 84fe6dcf11 Use RTLD_DEEPBIND
Closes #67
2016-05-19 21:12:08 +10:00
TimePath 3ecc3113ae Merge remote-tracking branch 'illwieckz/lokipaths' 2016-04-14 17:04:11 +10:00
Thomas Debesse 25e4f9e8cf fix undocumented unexpected LokiInitPaths 2016-04-14 08:56:16 +02:00
TimePath ba09e304aa Merge remote-tracking branch 'illwieckz/unvanquished' 2016-04-14 16:06:34 +10:00
Thomas Debesse b81adbf0da add unvanquished game support to q3map2
- import game_unvanquished.h from daemonmap
- tweak default values
2016-04-14 05:20:40 +02:00
TimePath 85351b6e7f Merge remote-tracking branch 'illwieckz/keepshader' 2016-04-14 13:02:09 +10:00
TimePath 8a00fda721 Merge remote-tracking branch 'illwieckz/exportents' 2016-04-14 12:43:26 +10:00
Thomas Debesse 828804e6eb do not delete q3map2_*.shader on minimap generation 2016-04-14 04:38:01 +02:00
Thomas Debesse 7b9faac5a0 add help for -exportents 2016-04-14 04:35:40 +02:00
Chris Brooke 748436778d Added -exportents to q3map2. 2016-04-14 04:35:37 +02:00
TimePath 8bc246a013 Merge remote-tracking branch 'illwieckz/fastallocate' 2016-04-14 12:13:48 +10:00
TimePath 8b22a94541 Merge remote-tracking branch 'illwieckz/pakpath' 2016-04-14 12:06:19 +10:00
TimePath a68115c805 Merge remote-tracking branch 'illwieckz/outoftree' 2016-04-14 12:00:43 +10:00
Thomas Debesse d4fa608be5 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.
2016-04-14 03:55:49 +02:00
Thomas Debesse 3b0aa4834f add -fs_pakpath option to q3map2 to add custom path to assets, fix #29 2016-04-14 03:53:31 +02:00
Thomas Debesse b13a86abcf enable q3map2 out of tree compilation 2016-04-14 03:44:05 +02:00
TimePath 96cdce5ea9 Merge remote-tracking branch 'illwieckz/split' into master 2016-04-14 11:28:59 +10:00
TimePath fec7e30005 Add CMakeLists.txt 2016-04-14 11:10:09 +10:00
Thomas Debesse 3df12612a9 fix -analyze q3map2 help 2016-04-14 01:00:16 +02:00
Thomas Debesse 805a231cdc split fixaas stuff from q3map2 2016-04-14 01:00:15 +02:00
Thomas Debesse 8b4e3c88c3 split bsp analyze/info/scale stuff from q3map2 2016-04-14 01:00:15 +02:00
Thomas Debesse 8658d622ef split help stuff from q3map2 2016-04-14 01:00:15 +02:00
Thomas Debesse f73901765f split bsp conversion stuff from q3map2 2016-04-14 01:00:15 +02:00
Thomas Debesse 10f758e6dd split minimap stuff from q3map2 2016-04-14 01:00:15 +02:00
Mirio e6bf0d774e 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
2016-01-12 04:40:10 +00:00
Mario bf82b14aa0 Update Xonotic wiki URL 2015-12-26 09:40:20 +10:00
Rudolf Polzer 15db7a5ac7 Merge branch 'master' into 'master'
Fix OS X segmentation fault (ericwa). Fix Quetoo game detection.



See merge request !16
2015-12-21 15:09:58 +00:00
Jay Dolan 036f3f6531 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
2015-12-21 00:49:37 +00:00
Jay Dolan 0d902727eb Whoops.. 2015-12-20 19:30:46 -05:00
Jay Dolan 8252376f21 Give credit where credit's due :) 2015-12-20 17:15:53 -05:00
Jay Dolan b76bdbdcb6 Merge remote-tracking branch 'upstream/master' 2015-12-08 09:00:57 -05:00
Jay Dolan cdc622f36f Download QuetooPack instead of Q2W. 2015-12-08 09:00:54 -05:00
Mario c51c744b5f 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
2015-11-15 23:05:24 +00:00
Mario 24bca49fde Merge branch 'SiPlus/tga-grey-rle' into 'master'
Add grayscale RLE TGA support

Closes #6

See merge request !14
2015-11-15 18:58:08 +00:00
Stijn Buys 1be2f04e75 Write an error message to the log instead of showing a messagebox for unsopported Doom 3 entity keys. 2015-10-03 16:59:18 +02:00
Rudolf Polzer daea7eb817 Also include DarkPlaces texture names in the diffuse map filtering. xonotic-v0.8.1 2015-08-03 18:36:59 +02:00
Rudolf Polzer f806ac65b1 Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant 2015-08-03 18:28:42 +02:00
Rudolf Polzer d68faa1fc3 Merge branch 'master' of https://gitlab.com/jdolan/netradiant 2015-08-03 18:28:15 +02:00
Mario 9471f8d699 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
2015-08-02 02:08:23 +00:00
Mario c2d78b9674 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
2015-07-22 01:26:54 +00:00
Mattia Basaglia 2bbbfad1bc 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.
2015-07-21 16:26:18 +02:00
Mario c6378c2c62 Merge branch 'Melanosuchus/q3map2_help' into 'master'
Add help options to q3map2

Closes #9

See merge request !5
2015-07-20 11:19:21 +00:00