Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,910 Commits 20 Branches 51 Tags
e46fc0a805ea50d2c3ee5fa6b0f2b00a1335a2a2
Commit Graph

60 Commits

Author SHA1 Message Date
Lirusaito
cb8cd702e1 [LLMeshRepo sync] Linux compile fixy 
Note to self: Windows compiler does not care about file casing, be more careful.
 2014-04-18 23:51:52 -04:00
Drake Arconis
f5bdb56a7c Crash fixes in model upload 2014-03-01 18:53:51 -05:00
Inusaito Sayori
cb0cc571ee Mats UI. 
Includes Chalice Yao's pause agent on attachment selection in LLSelectMgr::updateSelectionCenter()
Includes some of Cinder Roxley's enhancements to the build floater for materials (flip buttons, sync materials, consistent control hiding)
Includes Ansariel Hiller's fix for FIRE-8298 [BUG-869] [MAINT-1961], since this updates lltexturectrl.* to have related behaviors.
Switches from using MIN_MANHATTAN_DIST for threshold in LLToolDragAndDrop to using the existing DragAndDropDistanceThreshold debug, like upstream.

Translators:
panel_tools_texture.xml should now be translated, floater_tools.xml should have the old panel removed.
strings.xml now has "use_texture" string.
notifications.xml Now has "LivePreviewUnavailable" alert. (don't forget to translate the ignoretext)
 2013-11-06 17:39:04 -05:00
Shyotl
af8f8bb040 Mats. 2013-11-02 01:20:05 -05:00
Latif Khalifa
d98402b13f Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llvotree.h
 2013-10-10 00:03:36 +02:00
Shyotl
f25eb07fab Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation. 2013-10-09 15:43:23 -05:00
Drake Arconis
01bba31c8d Crash fixes to deal with janky FBX to DAE converters 2013-08-25 03:02:40 -04:00
Shyotl
e4da971026 Hooked up underlying material fetching mechanism and added material-related structures. Not integrated into rendering pipeline. 2013-07-12 13:56:31 -05:00
Lirusaito
fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate 
Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp
 2013-06-11 15:32:18 -04:00
Shyotl
ef3e918558 Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)! 2013-05-31 05:33:41 -05:00
Siana Gearz
0f90991533 OS X build fix 2013-05-28 03:24:12 +02:00
Shyotl
03272c8875 Clamp LLMeshSkinInfo::mJointNames to a max of 64 entries. Also checking size in lldrawpoolavatar(Redundant checks added to just match similar logic LLRiggedVolume::update more closely.) 2013-03-30 01:01:53 -05:00
Drake Arconis
0e3a9b28bd CMake cleanup and organization 2013-03-05 12:24:51 -05:00
Drake Arconis
b800320a49 Remove LLMemType and related files 2013-03-04 12:02:01 -05:00
Shyotl
94a0040ddb Sunshine catchup. 2013-02-25 12:53:18 -06:00
Latif Khalifa
5c8e436401 Fix windows build: warnings management 2013-01-30 05:45:00 +01:00
Latif Khalifa
8584e6da4c Merge branch 'master' into meshupload 
Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h
 2013-01-30 00:36:31 +01:00
Aleric Inglewood
0296812e88 Add cmake file for collada and glod. 
This fixes standalone when those libraries are installed
elsewhere. Note that it "breaks" standalone if you just
installed the prebuilt manually. For that to work you
have to add /.../libraries/include to CMAKE_INCLUDE_PATH,
which is not recommended because it would pick up any
other prebuilt over your system installed libraries.

Instead, for standalone, install the libraries somewhere
with some prefix and then add that prefix to the environment
variable CMAKE_PREFIX_PATH.

For example, $prefix/include/collada and $prefix/lib/libcollada4dom.so
 2013-01-22 20:51:43 +01:00
Siana Gearz
d1de4d53fe Merge branch 'meshupload' of git://github.com/LightDrake/SingularityViewer into meshupload 2013-01-13 20:37:04 +01:00
Commander Cupcake
c08c2a55e5 Revert changes that broke bump 2013-01-13 14:30:41 -05:00
Siana Gearz
5b0597ea47 Suppress 400 GCC warnings in Collada DOM headers 2013-01-13 06:27:02 +01:00
Siana Gearz
5f3ca7fda0 Linux64 support, integrated physics/decomposition 2013-01-13 03:23:56 +01:00
Shyotl
d71210e942 Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory) 2013-01-07 14:44:54 -06:00
Drake Arconis
9c1237ca05 Initial work. 2013-01-06 03:59:38 -05:00
Shyotl
776a977824 Completed code migration to LLAvatarAppearance 2013-01-05 17:12:02 -06:00
Shyotl
1b89e5c973 Dragged in a bunch of alignment fixes from LL. Should allow disabling of tcmalloc on windows/linux32 if such is ever implemented. 2012-10-16 02:33:05 -05:00
Siana Gearz
de74443d76 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml
 2012-08-09 00:42:23 +02:00
Shyotl
b847c53395 Implemented basic 'awareness' of objects flagged as permanent. 2012-08-04 20:46:51 -05:00
Shyotl
aca3e8f6c4 Cleanup. Removal of dead code. Added/renamed object flag accessors. 2012-08-04 18:18:22 -05:00
Drake Arconis
0d3fab40e5 Further header cleanup and a few updates 
Updated llstring to current linden
Further linden_common cleanup
Header cleanup
Raised banlines to 5000 as per linden server change
Included missing llmediaentry.cpp file
Minor whitespace changes here and there
 2012-07-21 03:01:42 -04:00
Shyotl
f04aabde96 Updated client tagging system. Client tags only looked up in opensim, and most logic pulled out into its own singleton. 2012-05-30 19:14:11 -05:00
Shyotl
a90d7bbb46 Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables. 2012-02-16 12:00:38 -06:00
Shyotl
f7b2139e81 Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge) 2012-02-09 14:26:21 -06:00
Shyotl
d0c782c7ae A few more translated tidbits. Also converted french strings.xml from BOM with windows lineendings, to non-BOM with unix lineendings. 2012-01-28 22:07:13 -06:00
Lirusaito
61beedd3d9 Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights 
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
 2012-01-09 05:40:03 -05:00
Shyotl
ffb285c6ff Huge renderer update (WIP). Still plenty to do, especially pertaining to UI. 
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
 2011-12-09 14:02:29 -06:00
Shyotl
09f7136cf4 'Preserve texture scaling when animating textures when "size x" and "size y" parameters to llSetTextureAnim are zero.' https://bitbucket.org/davep/shining-fixes/changeset/db8a3f49c250 2011-11-23 23:44:04 -06:00
Shyotl
30a95e7f45 Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes. 2011-10-03 22:45:13 -05:00
Shyotl
7f934f34f1 Minor renderer updates. 2011-09-23 00:55:24 -05:00
Shyotl
5d21e676c6 Added new LSL constants (keywords). OBJECT_SCRIPT_TIME, PARCEL_DETAILS_ID, etc 2011-09-02 04:07:39 -05:00
Shyotl
aaa6417fb7 Tweak related to cubemaps. Missed this earlier. 2011-08-29 03:22:42 -05:00
Shyotl
d2ae02a855 Slight cleanup. Also, index arrays are always non-strided, so now using vectorization. 2011-08-18 00:33:59 -05:00
Shyotl
978424ced0 Cleanup. Also made it so LLModel::setVolumeFaceData hopefully wont explode if it's ever utilized by future code. 2011-08-14 03:56:54 -05:00
Shyotl
550fa0a160 Merge branch 'future' of https://github.com/AlericInglewood/SingularityViewer.git into V2Mesh 
Conflicts:
	indra/newview/llspatialpartition.cpp
 2011-08-05 19:40:35 -05:00
Shyotl
b75a28ec15 Cleanup. Applied http://hg.secondlife.com/mesh-development/changeset/3031f266784a 2011-08-05 01:18:27 -05:00
Siana Gearz
6cfaecf972 GCC buildfixes 2011-08-01 20:42:06 +02:00
Shyotl
b258b71e07 Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head. 2011-07-30 20:30:07 -05:00
Shyotl
1e92e734d8 Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable. 2011-07-23 03:26:30 -05:00
Shyotl
52570a7f61 Simplification of LLPrimitive::setVolume ala davep. Have had this for a while, I just never commited until now. Haven't noticed any misbehavior with this alteration, and I'm tired of it going uncommited. 2011-07-18 04:18:12 -05:00
Shyotl
62e3aa10c1 Reasonably safe changes. 
Using accessor for vertexbuffer in LLFace
Extra occlusion query lookup in llgl (unused)
Const changes.
 2011-05-18 14:35:27 -05:00