Commit Graph
1395 Commits
Author SHA1 Message Date
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
Mattia Basaglia 13d728bd47 Add help options to q3map2
Closes #9
2015-07-20 11:37:51 +02:00
Mario 900e47627c 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
2015-07-20 02:35:04 +00:00
Mario 0a4c208a30 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
2015-07-20 02:32:55 +00:00
Mattia Basaglia c11289095a Don't call Cancel from OK in the Arbitrary rotation and scale dialogs 2015-07-19 21:07:02 +02:00
Mattia Basaglia fb845827ed Add an option for the fixed size texture thumbnails 2015-07-19 17:16:51 +02:00
Mattia Basaglia b5fda86f65 Change some default settings to give a nicer presentation of the texture browser 2015-07-19 16:26:13 +02:00
Mattia Basaglia 0b1005aa39 Group purely visual options in the menu 2015-07-19 15:43:08 +02:00
Mattia Basaglia fa6fee469f Option to show transparency in the texture browser 2015-07-19 15:29:40 +02:00
Mattia Basaglia ac5c07b82c Reload textures in the currently selected directory when shaders are reloaded 2015-07-19 12:42:16 +02:00
Mario 5a3278ffdf 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
2015-07-19 09:54:20 +00:00
Mario 176fd0fa08 Ignore games folder 2015-07-19 19:53:07 +10:00
Mario 2d1587ebf8 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
2015-07-19 09:43:52 +00:00
Mattia Basaglia 92b301a7f2 Re-align patch texture dialog 2015-07-19 11:18:47 +02:00
Mattia Basaglia f3e01fbe74 Apply auto cap textures to make caps 2015-07-19 10:31:22 +02:00
Mattia Basaglia c311c99f37 Auto cap button 2015-07-19 10:21:42 +02:00
Mattia Basaglia 50a295176a Now that the dialog has the flip buttons, the menu is no longer needed 2015-07-19 09:41:06 +02:00
Mattia Basaglia f60794f035 Add flip buttons to the patch texture dialog 2015-07-19 09:36:05 +02:00
Mattia Basaglia d5b7f85152 Clean up and fix actions, menus and dialogs for patch meshes 2015-07-19 09:05:59 +02:00
Rudolf Polzer e38c7bff16 Merge commit 'refs/pull/1/head' of https://github.com/xonotic/netradient 2015-06-01 10:45:24 +02:00
SiPlus 5bd5f58ca8 Remove an unused field of KTX_Decoder 2015-05-31 10:04:54 +03:00
SiPlus c39d9bef62 KTX support - something Git didn't want to commit 2015-05-30 22:06:19 +03:00
SiPlus 6eeb0fe907 Add KTX and ETC1 texture support 2015-05-30 21:55:04 +03:00
Jay Dolan 5a29db47f6 Filter non-diffuse textures (bump, glow, local, spec, etc) from texture browser. 2015-02-17 09:34:32 -05:00
Jay Dolan d9a21ba865 Update Quake2WorldPack source URL. 2015-02-17 09:03:16 -05:00
Jay Dolan 85332bd850 .gitignore, .cproject 2015-02-15 10:13:54 -05:00
Jay Dolan c359b728f6 Try ~/.{prefix} on Apple OS X if /Library/Application Support/{prefix+1} fails. 2015-02-15 10:13:20 -05:00
Jay Dolan 5ad8b3a43e Update .gitignore to include games directory. 2015-02-14 10:25:30 -05:00
Jay Dolan af443b859d 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. 2015-02-14 10:25:03 -05:00
Jay Dolan 4c4bffc86c Move osx directory from setup/data/osx to setup/apple. 2015-02-14 10:21:49 -05:00
Jay Dolan 77c538c0c7 Eclipse .project files. 2015-02-14 09:38:48 -05:00
Jay Dolan bdd8d5af58 Add gitignore for target directory. 2015-02-14 09:38:13 -05:00
Jay Dolan f16cac36d6 New Apple OS X application bundle based on work done for GtkRadiant 1.6.4. Produces a functioning application on Yosemite. 2015-02-14 09:37:38 -05:00
Jay Dolan f9bd26c040 Kill old Radiant Apple skeleton. 2015-02-14 08:53:52 -05:00
Rudolf Polzer e995cc897b Include unistd.h on POSIX, not just on __linux__.
Should fix use of fork() on OS X.
xonotic-v0.8.0
2014-10-28 14:37:21 +00:00
Rudolf Polzer ac4581fd4a More clang fixes. 2014-02-13 17:19:13 +01:00
Rudolf Polzer e3251259ad Some clang fixes. Not all yet. 2014-02-13 17:13:24 +01:00
Rudolf Polzer dc9f838f57 Fix touchpad scrolling on Linux. 2013-12-10 06:54:15 +01:00
Rudolf Polzer 214d4c94ce Found why RadSubdivideDiffuseLight happens with !bouncing. Trying
another one now.
2013-09-24 14:51:54 +02:00
Rudolf Polzer a78573e0e9 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. 2013-09-24 12:45:47 +02:00
Rudolf Polzer f0df907b19 BUILD=native 2013-09-13 12:48:56 +02:00
Rudolf Polzer 6ead1aa8fc lazy hack to make make work 2013-08-02 13:27:43 +02:00
Rudolf Polzer 694955af8e rework symlink creation logic 2013-08-02 12:49:17 +02:00
Rudolf Polzer 32201f62a3 Merge remote-tracking branch 'origin/ingar/alphahack_crashfix', fixes #1714 2013-07-06 18:59:03 +02:00