Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,808 Commits 20 Branches 51 Tags
37c8ea54ebfe28b0d84756b88fdf97600a096ea4
Commit Graph

2808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drake Arconis
cb0f4f8f10 Added support for Intel c++ Composer Xe 
Added support for building with Intel C++ Composer Xe
Fixed a warning thrown by it
 2012-07-08 10:29:28 -04: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
81242f1b5e Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer into V2MultiWear 2012-07-08 00:34:38 +02:00
Siana Gearz
36a95ec36e REVERT! Fix for media update commit. 2012-07-08 00:31:18 +02:00
Aleric Inglewood
744563a150 Use a newer libcurl version for linux. 2012-07-07 23:22:48 +02:00
Aleric Inglewood
389074d1e9 Fail at configure time when openGL is not found 2012-07-07 23:17:22 +02:00
Aleric Inglewood
93778eccbb Compile fix for g++ 4.7 2012-07-07 18:29:55 +02:00
Aleric Inglewood
5637e89568 Fix for libcwd that is already in curlthreading2. 2012-07-07 14:49:37 +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
Shyotl
2e073f7449 Fixed an annoying discard level assertion that was being fired. 2012-07-06 23:24:00 -05:00
Lirusaito
6b11776fcf Added in Phoenix's building preferences: removed bloat and waste, made positioning less fragile, repositioned parts more sensibly, and suggested courses of action in comments. 2012-07-06 14:45:39 -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
Drake Arconis
7f1d9a01e6 Merge remote-tracking branch 'siana/AltCompilers' into AltCompilers 2012-07-06 00:04:07 +00:00
Aleric Inglewood
f46d8e8a10 Try to be smart about not printing garbage (binary) received from the server. 2012-07-05 23:50:03 +02:00
Siana Gearz
d1b6b78206 Fixing windows build 2012-07-05 22:38:24 +02:00
Drake Arconis
d8c191490f OK HAPPY? ITS FIXED 
MY GOD RAGE RAGE RAGE RAGE RAGE AND MOAR RAGE
Yes I know this looks stupid.
Really.
 2012-07-05 14:19:37 +00:00
Drake Arconis
24ec85febd Merge branch 'AltCompilers' of bitbucket.org:LightDrake/singularityviewer into AltCompilers 2012-07-05 14:04:17 +00:00
Drake Arconis
9565d96006 Fixed a typo in repackage.sh 
So. I was tired and that happened.
 2012-07-05 14:03:53 +00:00
Drake Arconis
822098b5ac Fixed a typo in repackage.sh 
So. I was tired and that happened.
 2012-07-05 13:44:44 +00:00
Drake Arconis
02ae36b427 OpenSSL Updated. 
OpenSSL 1.0.0g
 2012-07-05 12:59:50 +00:00
Siana Gearz
f5bfab139c Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading 2012-07-05 06:06:04 +02:00
Drake Arconis
259a9ff0cc Cleanup and more library work 
Cleaned up unneeded files in LICENSES already provided by the
prebuilt packages themselves

install.xml:
Added in pcre, colladadom, and windows glod library
Corrected, descriptions licenses, and copyrights.
 2012-07-05 02:43:37 +00:00
Drake Arconis
d238cfe753 LibraryWork: Windows Libraries 
Repacked the windows libraries for new package layout.
Cleaned install.xml of unused libraries on windows.
Cleaned install.xml of unused libraries on darwin.
Repacked windows gperftools from Kitty/Catznip.
Updated windows openal.
 2012-07-05 02:08:27 +00:00
Aleric Inglewood
df20f918ba New libcwd channel 'curlio'. 
Enable printing of libcurl 'IO' debug messages when libcwd channel
'curlio' is turned on (added to .libcwdrc). Avoiding a recompile.
 2012-07-05 03:10:16 +02:00
Aleric Inglewood
b8fc1f634e Print the curl library found during configure. 
Prints something like:
-- Found CURL: /usr/lib/x86_64-linux-gnu/libcurl.so (found version "7.25.0")
 2012-07-05 01:41:01 +02:00
Aleric Inglewood
ae9dadb5d8 Improved layout of curl stats print out. 2012-07-04 16:56:33 +02:00
Siana Gearz
d31c062693 Fix building with libcwd 2012-07-04 12:44:05 +02:00
Drake Arconis
31ca817dc0 Removed ReleaseSSE2 
Removed ReleaseSSE2 and moved its options under Release.
 2012-07-04 10:25:04 +00:00
Siana Gearz
544928a039 Merge branch 'curlthreading2' of git://github.com/AlericInglewood/SingularityViewer into curlthreading 2012-07-04 10:45:48 +02:00
Siana Gearz
30f49526db Stray settings be gone 2012-07-04 10:44:37 +02:00
Aleric Inglewood
14276b3cf8 Bug fix 2012-07-04 08:44:22 +02:00
Lirusaito
b194d9e012 Sync llpaneleditwearable to Shyotl/V2MultiWear version. 2012-07-04 02:02:50 -04:00
Aleric Inglewood
07e7eeedd1 Added some windows code. 
Iterating directly over the elements of fd_set::fd_array in
windows is faster than using FD_ISSET.
 2012-07-04 07:32:24 +02: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
Aleric Inglewood
125a10bb44 Code hardening, review, bug fixes, documentation, curl stats and cleanup. 
Bug fixes:
AICurlEasyRequestStateMachine didn't delete itself.
curl_multi_socket_action calls were made for potentional removed sockets.
The curl thread wasn't terminated.
 2012-07-04 00:10:43 +02: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
Drake Arconis
9db7bcde00 Why or why ugly hack :/ 2012-07-03 17:33:37 +00: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
Aleric Inglewood
9b8e5c8719 Merge branch 'V2MultiWear' into curlthreading2 
I picked a few non-curl related patches from curlthreading2
and applied them to V2MultiWear. Now merging back to avoid
collisions for others.
 2012-07-03 14:27:12 +02:00
Siana Gearz
8a271b9621 HTTP texture fix - the brutal and inefficient way -.- 2012-07-03 13:40:32 +02:00