]> git.rm.cloudns.org Git - xonotic/netradiant.git/log
xonotic/netradiant.git
8 years agoenable q3map2 out of tree compilation 20/head
Thomas Debesse [Mon, 20 Jul 2015 10:39:42 +0000 (12:39 +0200)]
enable q3map2 out of tree compilation

8 years agofix -analyze q3map2 help 15/head
Thomas Debesse [Tue, 21 Jul 2015 02:21:21 +0000 (04:21 +0200)]
fix -analyze q3map2 help

8 years agosplit fixaas stuff from q3map2
Thomas Debesse [Tue, 21 Jul 2015 01:41:24 +0000 (03:41 +0200)]
split fixaas stuff from q3map2

8 years agosplit bsp analyze/info/scale stuff from q3map2
Thomas Debesse [Tue, 21 Jul 2015 01:28:23 +0000 (03:28 +0200)]
split bsp analyze/info/scale stuff from q3map2

8 years agosplit help stuff from q3map2
Thomas Debesse [Mon, 20 Jul 2015 18:10:23 +0000 (20:10 +0200)]
split help stuff from q3map2

8 years agosplit bsp conversion stuff from q3map2
Thomas Debesse [Mon, 20 Jul 2015 11:07:37 +0000 (13:07 +0200)]
split bsp conversion stuff from q3map2

8 years agosplit minimap stuff from q3map2
Thomas Debesse [Mon, 20 Jul 2015 10:57:09 +0000 (12:57 +0200)]
split minimap stuff from q3map2

8 years agoMerge branch 'ingar/png_icons' into 'master'
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

8 years agoUpdate Xonotic wiki URL
Mario [Fri, 25 Dec 2015 23:40:20 +0000 (09:40 +1000)]
Update Xonotic wiki URL

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

8 years agoMerge branch 'master' into 'master' 16/head
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

8 years agoWhoops..
Jay Dolan [Mon, 21 Dec 2015 00:30:46 +0000 (19:30 -0500)]
Whoops..

8 years agoGive credit where credit's due :)
Jay Dolan [Sun, 20 Dec 2015 22:15:53 +0000 (17:15 -0500)]
Give credit where credit's due :)

8 years agoMerge remote-tracking branch 'upstream/master'
Jay Dolan [Tue, 8 Dec 2015 14:00:57 +0000 (09:00 -0500)]
Merge remote-tracking branch 'upstream/master'

8 years agoDownload QuetooPack instead of Q2W.
Jay Dolan [Tue, 8 Dec 2015 14:00:54 +0000 (09:00 -0500)]
Download QuetooPack instead of Q2W.

8 years agoMerge branch 'ingar/doom3entitywarn' into 'master'
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

8 years agoMerge branch 'SiPlus/tga-grey-rle' into 'master'
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

9 years agoWrite an error message to the log instead of showing a messagebox for unsopported... 13/head
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.

9 years agoAlso include DarkPlaces texture names in the diffuse map filtering. xonotic-v0.8.1
Rudolf Polzer [Mon, 3 Aug 2015 16:36:59 +0000 (18:36 +0200)]
Also include DarkPlaces texture names in the diffuse map filtering.

9 years agoMerge branch 'master' of ssh://gitlab.com/xonotic/netradiant
Rudolf Polzer [Mon, 3 Aug 2015 16:28:42 +0000 (18:28 +0200)]
Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant

9 years agoMerge branch 'master' of https://gitlab.com/jdolan/netradiant
Rudolf Polzer [Mon, 3 Aug 2015 16:28:15 +0000 (18:28 +0200)]
Merge branch 'master' of https://gitlab.com/jdolan/netradiant

9 years agoMerge branch 'ingar/png_icons' into 'master'
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

9 years agoMerge branch 'Melanosuchus/q3map2_sucks' into 'master'
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

9 years agoFix a horrible bug in q3map2
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.

9 years agoMerge branch 'Melanosuchus/q3map2_help' into 'master'
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

9 years agoAdd help options to q3map2
Mattia Basaglia [Mon, 20 Jul 2015 09:37:51 +0000 (11:37 +0200)]
Add help options to q3map2

Closes #9

9 years agoMerge branch 'Melanosuchus/rotate_scale_dialogs' into 'master'
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

9 years agoMerge branch 'Melanosuchus/texture_browser' into 'master'
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

9 years agoDon't call Cancel from OK in the Arbitrary rotation and scale dialogs
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

9 years agoAdd an option for the fixed size texture thumbnails
Mattia Basaglia [Sun, 19 Jul 2015 15:13:53 +0000 (17:13 +0200)]
Add an option for the fixed size texture thumbnails

9 years agoChange some default settings to give a nicer presentation of the texture browser
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

9 years agoGroup purely visual options in the menu
Mattia Basaglia [Sun, 19 Jul 2015 13:43:08 +0000 (15:43 +0200)]
Group purely visual options in the menu

9 years agoOption to show transparency in the texture browser
Mattia Basaglia [Sun, 19 Jul 2015 13:29:40 +0000 (15:29 +0200)]
Option to show transparency in the texture browser

9 years agoReload textures in the currently selected directory when shaders are reloaded
Mattia Basaglia [Sun, 19 Jul 2015 10:42:16 +0000 (12:42 +0200)]
Reload textures in the currently selected directory when shaders are reloaded

9 years agoMerge branch 'Melanosuchus/patch_ui' into 'master'
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

9 years agoIgnore games folder
Mario [Sun, 19 Jul 2015 09:52:30 +0000 (19:52 +1000)]
Ignore games folder

9 years agoMerge branch 'Melanosuchus/patch_ui' into 'master'
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

9 years agoRe-align patch texture dialog
Mattia Basaglia [Sun, 19 Jul 2015 09:18:47 +0000 (11:18 +0200)]
Re-align patch texture dialog

9 years agoApply auto cap textures to make caps
Mattia Basaglia [Sun, 19 Jul 2015 08:31:22 +0000 (10:31 +0200)]
Apply auto cap textures to make caps

9 years agoAuto cap button
Mattia Basaglia [Sun, 19 Jul 2015 08:21:42 +0000 (10:21 +0200)]
Auto cap button

9 years agoNow that the dialog has the flip buttons, the menu is no longer needed
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

9 years agoAdd flip buttons to the patch texture dialog
Mattia Basaglia [Sun, 19 Jul 2015 07:36:05 +0000 (09:36 +0200)]
Add flip buttons to the patch texture dialog

9 years agoClean up and fix actions, menus and dialogs for patch meshes
Mattia Basaglia [Sun, 19 Jul 2015 07:05:59 +0000 (09:05 +0200)]
Clean up and fix actions, menus and dialogs for patch meshes

9 years agoAdd grayscale RLE TGA support 14/head
SiPlus [Thu, 2 Jul 2015 12:20:51 +0000 (15:20 +0300)]
Add grayscale RLE TGA support

9 years agoMerge commit 'refs/pull/1/head' of https://github.com/xonotic/netradient
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

9 years agoRemove an unused field of KTX_Decoder
SiPlus [Sun, 31 May 2015 07:04:54 +0000 (10:04 +0300)]
Remove an unused field of KTX_Decoder

9 years agoKTX support - something Git didn't want to commit
SiPlus [Sat, 30 May 2015 19:06:19 +0000 (22:06 +0300)]
KTX support - something Git didn't want to commit

9 years agoAdd KTX and ETC1 texture support
SiPlus [Sat, 30 May 2015 18:55:04 +0000 (21:55 +0300)]
Add KTX and ETC1 texture support

9 years agoupdate COMPILING with instructions for Homebrew
Eric Wasylishen [Wed, 27 May 2015 06:20:09 +0000 (00:20 -0600)]
update COMPILING with instructions for Homebrew

9 years agoHack around segfault at launch, patch from danfe: https://github.com/TTimo/GtkRadiant...
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

9 years agoFix detection of Quetoo install.
Jay Dolan [Sun, 8 Mar 2015 17:54:53 +0000 (13:54 -0400)]
Fix detection of Quetoo install.

9 years agoFilter non-diffuse textures (bump, glow, local, spec, etc) from texture browser.
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.

9 years agoUpdate Quake2WorldPack source URL.
Jay Dolan [Tue, 17 Feb 2015 14:03:16 +0000 (09:03 -0500)]
Update Quake2WorldPack source URL.

9 years ago.gitignore, .cproject
Jay Dolan [Sun, 15 Feb 2015 15:13:54 +0000 (10:13 -0500)]
.gitignore, .cproject

9 years agoTry ~/.{prefix} on Apple OS X if /Library/Application Support/{prefix+1} fails.
Jay Dolan [Sun, 15 Feb 2015 15:13:20 +0000 (10:13 -0500)]
Try ~/.{prefix} on Apple OS X if /Library/Application Support/{prefix+1} fails.

9 years agoUpdate .gitignore to include games directory.
Jay Dolan [Sat, 14 Feb 2015 15:25:30 +0000 (10:25 -0500)]
Update .gitignore to include games directory.

9 years agoUpdate Makefile to remove OSX build diretives. We build for OSX just like its Linux...
Jay Dolan [Sat, 14 Feb 2015 15:25:03 +0000 (10:25 -0500)]
Update Makefile to remove OSX build diretives. We build for OSX just like its Linux now. Those wishing to build the app bundle should use setup/apple/Makefile.

9 years agoMove osx directory from setup/data/osx to setup/apple.
Jay Dolan [Sat, 14 Feb 2015 15:21:49 +0000 (10:21 -0500)]
Move osx directory from setup/data/osx to setup/apple.

9 years agoEclipse .project files.
Jay Dolan [Sat, 14 Feb 2015 14:38:48 +0000 (09:38 -0500)]
Eclipse .project files.

9 years agoAdd gitignore for target directory.
Jay Dolan [Sat, 14 Feb 2015 14:38:13 +0000 (09:38 -0500)]
Add gitignore for target directory.

9 years agoNew Apple OS X application bundle based on work done for GtkRadiant 1.6.4. Produces...
Jay Dolan [Sat, 14 Feb 2015 14:37:38 +0000 (09:37 -0500)]
New Apple OS X application bundle based on work done for GtkRadiant 1.6.4. Produces a functioning application on Yosemite.

9 years agoKill old Radiant Apple skeleton.
Jay Dolan [Sat, 14 Feb 2015 13:53:52 +0000 (08:53 -0500)]
Kill old Radiant Apple skeleton.

10 years agoInclude unistd.h on POSIX, not just on __linux__. xonotic-v0.8.0
Rudolf Polzer [Tue, 28 Oct 2014 14:37:21 +0000 (14:37 +0000)]
Include unistd.h on POSIX, not just on __linux__.

Should fix use of fork() on OS X.

10 years agoMore clang fixes.
Rudolf Polzer [Thu, 13 Feb 2014 16:19:13 +0000 (17:19 +0100)]
More clang fixes.

10 years agoSome clang fixes. Not all yet.
Rudolf Polzer [Thu, 13 Feb 2014 16:13:24 +0000 (17:13 +0100)]
Some clang fixes. Not all yet.

10 years agoFix touchpad scrolling on Linux.
Rudolf Polzer [Tue, 10 Dec 2013 05:54:15 +0000 (06:54 +0100)]
Fix touchpad scrolling on Linux.

11 years agoFound why RadSubdivideDiffuseLight happens with !bouncing. Trying
Rudolf Polzer [Tue, 24 Sep 2013 12:51:54 +0000 (14:51 +0200)]
Found why RadSubdivideDiffuseLight happens with !bouncing. Trying
another one now.

11 years agoHAHA. Fix a bug that prevented ANY non-sRGB builds with the current default build...
Rudolf Polzer [Tue, 24 Sep 2013 10:45:12 +0000 (12:45 +0200)]
HAHA. Fix a bug that prevented ANY non-sRGB builds with the current default build menu. For ages now. Also addd some attempt to track down a bounce issue.

11 years agoBUILD=native
Rudolf Polzer [Fri, 13 Sep 2013 10:48:56 +0000 (12:48 +0200)]
BUILD=native

11 years agolazy hack to make make work
Rudolf Polzer [Fri, 2 Aug 2013 11:27:43 +0000 (13:27 +0200)]
lazy hack to make make work

11 years agorework symlink creation logic
Rudolf Polzer [Fri, 2 Aug 2013 10:49:17 +0000 (12:49 +0200)]
rework symlink creation logic

11 years agoMerge remote-tracking branch 'origin/ingar/alphahack_crashfix', fixes #1714
Rudolf Polzer [Sat, 6 Jul 2013 16:59:03 +0000 (18:59 +0200)]
Merge remote-tracking branch 'origin/ingar/alphahack_crashfix', fixes #1714

11 years agoMerge remote-tracking branch 'origin/ingar/texture_layout_defaults', fixes #1711
Rudolf Polzer [Sat, 6 Jul 2013 16:58:56 +0000 (18:58 +0200)]
Merge remote-tracking branch 'origin/ingar/texture_layout_defaults', fixes #1711

11 years agoalso add an unsuffixed symlink, fixes #1710
Rudolf Polzer [Sat, 6 Jul 2013 16:54:44 +0000 (18:54 +0200)]
also add an unsuffixed symlink, fixes #1710

11 years agoFix an invalid pointer reference in the alphahack image loader, print filename on...
Stijn Buys [Tue, 2 Jul 2013 17:23:35 +0000 (19:23 +0200)]
Fix an invalid pointer reference in the alphahack image loader, print filename on LoadJPGBuff error messages.

11 years agoConvert icons to RGBA, remove duplicate files, rename curve_cap icon.
Stijn Buys [Sun, 30 Jun 2013 10:07:20 +0000 (12:07 +0200)]
Convert icons to RGBA, remove duplicate files, rename curve_cap icon.

11 years agoDisabled pink to alpha conversion for icons.
Stijn Buys [Fri, 28 Jun 2013 21:17:38 +0000 (23:17 +0200)]
Disabled pink to alpha conversion for icons.

11 years agoReplaced bmp icons in contrib/ with png files.
Stijn Buys [Fri, 28 Jun 2013 19:32:26 +0000 (21:32 +0200)]
Replaced bmp icons in contrib/ with png files.

11 years agoReplaced bmp icons in bitmaps/ with png files, changed the code accordingly.
Stijn Buys [Thu, 27 Jun 2013 19:32:37 +0000 (21:32 +0200)]
Replaced bmp icons in bitmaps/ with png files, changed the code accordingly.

11 years agoOn Linux, set the default executable suffix to 'uname -m'
Stijn Buys [Tue, 25 Jun 2013 21:40:55 +0000 (23:40 +0200)]
On Linux, set the default executable suffix to 'uname -m'

11 years agoCleaned up comments.
Stijn Buys [Tue, 25 Jun 2013 20:00:02 +0000 (22:00 +0200)]
Cleaned up comments.

11 years agoMakes the texture layout dialog remember last used values, corrects x entry not havin...
Stijn Buys [Tue, 25 Jun 2013 19:32:49 +0000 (21:32 +0200)]
Makes the texture layout dialog remember last used values, corrects x entry not having its value selected when showing the dialog.

11 years agofix some easy warnings
Rudolf Polzer [Wed, 19 Jun 2013 16:50:07 +0000 (18:50 +0200)]
fix some easy warnings

11 years agoFix a possible bug in floodlighting/dirtmapping in conjunction with alphashadow surfaces xonotic-v0.7.0
Rudolf Polzer [Thu, 28 Mar 2013 11:26:46 +0000 (12:26 +0100)]
Fix a possible bug in floodlighting/dirtmapping in conjunction with alphashadow surfaces

11 years agogtk is retarded. Nevertheless, the warping CAN be platform independent.
Rudolf Polzer [Sat, 16 Mar 2013 19:02:31 +0000 (20:02 +0100)]
gtk is retarded. Nevertheless, the warping CAN be platform independent.

11 years agoalso kill the win32 specific path (gtk should handle this anyway)
Rudolf Polzer [Sat, 16 Mar 2013 18:51:14 +0000 (19:51 +0100)]
also kill the win32 specific path (gtk should handle this anyway)

11 years agoget rid of some REALLY stupid code (generic pointer READ, but x11 specific pointer...
Rudolf Polzer [Sat, 16 Mar 2013 18:43:33 +0000 (19:43 +0100)]
get rid of some REALLY stupid code (generic pointer READ, but x11 specific pointer WARP?!?)

11 years agoupdates to install-dlls-fedora.sh by maci and me
Rudolf Polzer [Tue, 15 Jan 2013 10:13:32 +0000 (11:13 +0100)]
updates to install-dlls-fedora.sh by maci and me

11 years agoOops, forgot this file
Rudolf Polzer [Mon, 14 Jan 2013 20:22:41 +0000 (21:22 +0100)]
Oops, forgot this file

11 years agoFedora support patch by maci (make DLL finding work with Fedora's mingw)
Rudolf Polzer [Mon, 14 Jan 2013 20:21:37 +0000 (21:21 +0100)]
Fedora support patch by maci (make DLL finding work with Fedora's mingw)

11 years agomore pointers
Rudolf Polzer [Mon, 14 Jan 2013 11:03:08 +0000 (12:03 +0100)]
more pointers

11 years agoadd a missing cast
Rudolf Polzer [Mon, 14 Jan 2013 10:59:24 +0000 (11:59 +0100)]
add a missing cast

11 years agodebugging.h: use int 3 on amd64 too
Rudolf Polzer [Mon, 14 Jan 2013 10:55:49 +0000 (11:55 +0100)]
debugging.h: use int 3 on amd64 too

11 years agosplit up mingw-Makefile.inc into mingw-Makefile.inc, mingw-radiantdeps-Makefile.inc
Rudolf Polzer [Mon, 14 Jan 2013 10:52:27 +0000 (11:52 +0100)]
split up mingw-Makefile.inc into mingw-Makefile.inc, mingw-radiantdeps-Makefile.inc

11 years agoadd a mingw-fedora-Makefile.conf (my maci)
Rudolf Polzer [Mon, 14 Jan 2013 08:00:10 +0000 (09:00 +0100)]
add a mingw-fedora-Makefile.conf (my maci)

11 years agoFix bug #1356: .obj loading bug in picolib
Nodenum [Mon, 17 Dec 2012 08:32:19 +0000 (09:32 +0100)]
Fix bug #1356: .obj loading bug in picolib

There's a bug in picolib when parsing the first group in an .obj file.

The library tries to set the surface name to a surface pointer
that is still NULL.

This gets silently ignored but the problem reappears later
in a warning message when the material or a face is parsed.

12 years agofix compile error
Rudolf Polzer [Thu, 25 Oct 2012 07:57:05 +0000 (09:57 +0200)]
fix compile error

12 years agol_net: don't segfault of gethostbyname(gethostname()) fails
Rudolf Polzer [Wed, 24 Oct 2012 13:55:42 +0000 (15:55 +0200)]
l_net: don't segfault of gethostbyname(gethostname()) fails

Can happen on Linux with misconfigured /etc/hosts.

12 years agofix Q1pack URL
Rudolf Polzer [Tue, 12 Jun 2012 15:09:26 +0000 (17:09 +0200)]
fix Q1pack URL

12 years agoMerge branch 'master' into divVerent/farplanedist-sky-fix
Rudolf Polzer [Tue, 15 May 2012 09:56:17 +0000 (11:56 +0200)]
Merge branch 'master' into divVerent/farplanedist-sky-fix

Conflicts:
tools/quake3/q3map2/prtfile.c
tools/quake3/q3map2/vis.c
tools/quake3/q3map2/visflow.c