Drake Arconis
edb144bd1d
Fixed ugly workaround for compiler detection
...
Corrected ugly workaround for compiler detection in code with
correct definition in llpreprocessor.h and updated various #if
to reflect this.
2012-07-10 14:15:59 -04:00
Drake Arconis
bcefad1a97
Massive windlight preset cleanup and updates
...
Cleaned up all duplicate windlight presets
Renamed windlight presets under correct current prefixes
Imported new presets from FS and Alchemy
2012-07-10 14:14:31 -04:00
Drake Arconis
a67fe755cd
Fixed line endings
...
Fixed the line endings of the windlight files to unix
2012-07-09 12:32:34 -04:00
Siana Gearz
e7f8206c96
Merge branch 'AltCompilers'
2012-07-09 00:22:44 +02:00
Siana Gearz
e7a49da774
Correct the parting line between void water patches with shaders
2012-07-08 06:27:50 +02:00
Siana Gearz
81123a80f2
Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer into AltCompilers
2012-07-08 03:34:20 +02:00
Siana Gearz
045caad8f5
Revert "REVERT! Fix for media update commit."
...
This reverts commit 36a95ec36e .
2012-07-08 03:33:05 +02:00
Siana Gearz
a76a77a330
Merge branch 'V2MultiWear' into AltCompilers
2012-07-08 00:51:29 +02:00
Siana Gearz
36a95ec36e
REVERT! Fix for media update commit.
2012-07-08 00:31:18 +02:00
Drake Arconis
4508ea1cc1
Fixup from last commit
...
*grumble* Stupid git gui broke my commit!
Fixed a warning in llpaneleditwearables.cpp
2012-07-07 00:35:46 -04:00
Lirusaito
58ff4a00f1
Some very good points Voodoo had, and some things I noticed and had to correct.
2012-07-06 12:14:55 -04:00
Drake Arconis
525e9d9a8e
Webkit plugin updates
...
Updated the webkit plugin with the latest features
Fixed SSL support in webkit
Other minor cleanup
2012-07-06 11:37:45 +00:00
Drake Arconis
b40a9c7a06
Updated about floater
...
Moved the licensing to its own tab
Updated and added relevant copyright notices
2012-07-06 09:12:42 +00:00
Drake Arconis
0b757aaad5
Merge remote-tracking branch 'liru/V2MultiWear' into AltCompilers
2012-07-06 01:54:57 +00:00
Siana Gearz
d1b6b78206
Fixing windows build
2012-07-05 22:38:24 +02:00
Siana Gearz
30f49526db
Stray settings be gone
2012-07-04 10:44:37 +02:00
Lirusaito
b194d9e012
Sync llpaneleditwearable to Shyotl/V2MultiWear version.
2012-07-04 02:02:50 -04:00
Drake Arconis
5748de1f9d
More changes for lib and packaging update
2012-07-04 04:41:33 +00:00
Drake Arconis
d0c1c4d753
Dos2Unix line endings and a file mode change
2012-07-04 00:29:59 +00:00
Drake Arconis
7af331c50d
First set of changes for new librarys and lib layout support!
...
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
2012-07-04 00:26:42 +00:00
Lirusaito
de26fff525
Changed "Mesh Detail" to "Level of Detail" so people don't see it as "Mesh"
...
Also added in an Advanced button, but it's commented out as it does not function properly, and someone else should code it..
Builds on the previous commit of graphics prefs..
2012-07-03 14:44:13 -04:00
Lirusaito
ca9c99577f
Removed exportFileXML, and importXML, updated indra/test's
...
and generally updated cpp's to V-D look(include order, spelling fixes, and whatnot)
Also, commented out pointless using namespace std.
2012-07-03 10:07:14 -04:00
Lirusaito
b0c28c5eb2
Updated Graphics Preferences, Fixed display resolution combobox not disappearing
...
Now includes Ambient Occlusion and looks more like V3,
and yay everything finally disappears that should nao~
2012-07-03 09:55:19 -04:00
Lirusaito
ded9d1027b
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
2012-07-03 08:44:10 -04:00
Siana Gearz
8a271b9621
HTTP texture fix - the brutal and inefficient way -.-
2012-07-03 13:40:32 +02:00
Siana Gearz
c5f9e8cf68
Revert "HTTP texture fetch endless append fix, by Laika Tungsten"
...
This reverts commit b4bdb7ca36 .
2012-07-03 13:17:01 +02:00
Lirusaito
4e2af85770
Merge branch 'V2MultiWear' of git://github.com/siana/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/llface.cpp
2012-07-03 01:57:55 -04:00
Siana Gearz
5a685febbf
Certificate update
2012-07-03 07:51:03 +02:00
Siana Gearz
cd2dc2f3ca
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/app_settings/settings.xml
indra/newview/llface.cpp
2012-07-03 07:49:22 +02:00
Lirusaito
a9494d1fb0
Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear
2012-07-02 23:42:38 -04:00
Drake Arconis
608417ba6b
Corrected line endings of XML files
2012-07-03 03:32:18 +00:00
Drake Arconis
c5d19cca0b
Finished dead code patrol and cleaned up remnants of long dead feature
2012-07-03 03:31:24 +00:00
Lirusaito
4435e7ade3
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-07-02 21:28:19 -04:00
Drake Arconis
f79a16ef0f
Cleanup of long dead code
2012-07-03 01:10:41 +00:00
Drake Arconis
77948b8ce4
Fixed further warnings reported by clang.
2012-07-03 00:24:15 +00:00
Drake Arconis
2ac4f81424
Prefer FmodEx as the default audio engine if the viewer was built with it.
2012-07-03 00:22:50 +00:00
Drake Arconis
8eb319d3ba
Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers
2012-07-02 21:08:04 +00:00
Shyotl
9ddbc132bf
View->Build menu selection now functions once more.
2012-07-02 15:38:38 -05:00
Drake Arconis
c464a8da30
Merge branch 'V2MultiWear' of bitbucket.org:Lirusaito/singularityviewer into AltCompilers
...
Conflicts:
indra/cmake/00-Common.cmake
indra/newview/llvovolume.cpp
2012-07-02 20:16:56 +00:00
Drake Arconis
ece9dda7b4
Initial support for the Clang compiler and numerous warning fixes
2012-07-02 19:45:41 +00:00
Lirusaito
24db228406
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
...
Conflicts:
indra/llrender/llvertexbuffer.h
indra/newview/llface.cpp
indra/newview/llpaneleditwearable.h
2012-07-02 04:14:52 -04:00
Shyotl
53a570b977
Push drawables into priority queue when their textures change number of components. (Quick and dirty fix for alpha faces not being placed into alpha pool until some other irrelivant rebuild state is set)
2012-07-02 00:50:55 -05:00
Shyotl
4ba1509371
Texcache tweakage.
2012-06-30 20:07:52 -05:00
Shyotl
399d93cc36
Compiler fixes and a crashfix.
2012-06-30 20:06:48 -05:00
Shyotl
67e1a3b004
Lindie viewer-dev catchup regarding rendering pipeline.
2012-06-30 20:05:31 -05:00
Aleric Inglewood
c02834b7e3
Use AIThreadSafeDC and _wat convention to simplify AIEvent.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
15fb0ac3aa
Allow AIStateMachine::cont() to be called from another thread for an idle statemachine.
2012-06-27 04:27:08 +02:00
Aleric Inglewood
4391614d6e
AIThreadSafe* update.
...
Updated/added documentation.
Removed AIThreadSafeWindowsHack that annoyed me (fix your compiler).
Don't use 'static' in anonymous namespace.
Use the AIThreadSafe*DC variants for default constructed objects,
as opposed to the AITHREADSAFE* macro's.
2012-06-27 04:27:07 +02:00
Aleric Inglewood
8f6dbfc399
Compile fix for standalone
2012-06-27 04:27:06 +02:00
Aleric Inglewood
eb7615ad57
Merge branch 'master' into V2MultiWear
2012-06-27 04:26:44 +02:00