Shyotl 690f3614c1 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git ...

Conflicts:
	indra/llrender/llpostprocess.cpp

2015-05-16 02:53:19 -05:00

..

GL

…

CMakeLists.txt

Remove self dependency of llwindow.

2014-07-11 16:32:55 +02:00

lldragdropwin32.cpp

…

lldragdropwin32.h

…

lldxhardware.cpp

Verify CoInitialize call was successful (on Windows only).

2015-05-16 02:31:32 -05:00

lldxhardware.h

…

llkeyboard.cpp

Missed a spot.

2014-05-15 00:42:22 -04:00

llkeyboard.h

Sync with Upstream Alchemy

2014-09-04 17:32:03 -04:00

llkeyboardheadless.cpp

…

llkeyboardheadless.h

…

llkeyboardmacosx.cpp

…

llkeyboardmacosx.h

…

llkeyboardsdl.cpp

…

llkeyboardsdl.h

…

llkeyboardwin32.cpp

Sync llcommon with Alchemy a bit.

2015-03-20 22:04:04 -04:00

llkeyboardwin32.h

Sync llcommon with Alchemy a bit.

2015-03-20 22:04:04 -04:00

llmousehandler.cpp

…

llmousehandler.h

…

llpreeditor.h

…

llwindow.cpp

Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel).

2014-03-28 02:34:03 -05:00

llwindow.h

Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel).

2014-03-28 02:34:03 -05:00

llwindowcallbacks.cpp

…

llwindowcallbacks.h

…

llwindowheadless.cpp

Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel).

2014-03-28 02:34:03 -05:00

llwindowheadless.h

Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel).

2014-03-28 02:34:03 -05:00

llwindowmacosx-objc.h

…

llwindowmacosx-objc.mm

…

llwindowmacosx.cpp

Launch transcripts in external text editor on mac too

2014-04-21 18:05:45 -04:00

llwindowmacosx.h

Launch transcripts in external text editor on mac too

2014-04-21 18:05:45 -04:00

llwindowmesaheadless.cpp

Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel).

2014-03-28 02:34:03 -05:00

llwindowmesaheadless.h

Removed glh_linear and glu dependencies from viewer.

2014-07-03 02:11:45 -05:00

llwindowsdl.cpp

Uncomment use of etc/ for spawnWebBrowser on Linux, now that we use etc/ for scripts.

2015-04-19 18:08:49 -04:00

llwindowsdl.h

Added adaptive vsync support (selectable in preferences->graphics->hardware, provided the driver supports it). Also hide 16x fsaa on amd hardware, as it is not supported on said hardware (unsure about intel).

2014-03-28 02:34:03 -05:00

llwindowwin32.cpp

Fix some 64bit-unsafe windows code

2015-05-12 09:11:59 -04:00

llwindowwin32.h

Fix some 64bit-unsafe windows code

2015-05-12 09:11:59 -04:00