Commit Graph

189 Commits

Author SHA1 Message Date
Liru Færs
b7086a993d Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
# Conflicts:
#	indra/llmath/lloctree.h
#	indra/newview/llsurface.cpp
2020-03-01 03:39:30 -05:00
Shyotl
c340dde03d Speculative fixes. 2020-02-29 22:15:27 -06:00
Liru Færs
b08b597397 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
# Conflicts:
#	indra/llcommon/llsd.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/newview/llspeakers.cpp
#	indra/newview/llviewermessage.cpp
2020-02-25 06:51:41 -05:00
Shyotl
5c2c2a8c01 Minor cleanup. Octree vfunc reduction. Range-based for loops with map/array llsd types. 2020-02-25 01:50:50 -06:00
Liru Færs
19ad64cc96 AlchSync: Change dynamic_casts to LLVOVolume to asVolume() 2020-01-04 23:31:15 -05:00
Shyotl
4043130f75 Update texturelist/volumetexture management with changes from upstream. Note: TEX_LIST_SCALE not utilized in singu... yet. 2019-10-19 04:05:34 -05:00
Shyotl
835083a741 Added a few missing BoM pieces. 2019-10-19 04:00:51 -05:00
Liru Færs
1b52b3e685 Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh
# Conflicts:
#	indra/llcommon/llindexedvector.h
2019-08-15 20:50:36 -04:00
Shyotl
d2b28f60ff Speed up object param lookups. 2019-08-07 22:50:08 -05:00
Lirusaito
2580ca7afd Fix paused frame overflow, thanks Rye! 2019-07-31 14:22:27 -04:00
Lirusaito
07569d008d Fix compile issues, thanks Router! 2019-04-18 09:19:20 -04:00
Shyotl
7f776c0d53 Fixed geom never generating in some scenarios. 2019-04-17 00:49:46 -05:00
Shyotl
1351a2695e Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer.git into animesh
# Conflicts:
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvovolume.cpp
2019-04-11 02:02:05 -05:00
Shyotl
e49b484c2f Updated rigged mesh selection/cursor hover handling. 2019-04-11 01:16:50 -05:00
Lirusaito
8f0bda3dab Missed change for rigged picking 2019-03-29 05:57:23 -04:00
Lirusaito
84da9d4758 Hold shift to select rigged mesh with SGAllowRiggedMeshSelection = 1
Old behavior + shift with = 2
Thanks for the contribution, Router!
2019-03-29 00:56:01 -04:00
Shyotl
3a031e9364 Fix build. 2019-03-27 02:35:59 -05:00
Shyotl
a90cdd9c7e Experimental SHOverrideRiggedBounds setting to generate more accurate avatar bboxes. Defaults to off, for now. 2019-03-26 14:59:44 -05:00
Shyotl
b81373366b Animesh test changes. Also stop screwing with my commit messages, github. 2019-03-17 02:35:07 -05:00
Shyotl
aa37a0b539 Intermediary commit #3 2019-03-17 01:08:34 -05:00
Shyotl
3a78568a6f Intermediary commit #2. 2019-03-16 21:35:33 -05:00
Shyotl
2d8fbb89c9 Intermiediary commit. 2019-03-16 17:51:00 -05:00
Shyotl
50007bbc62 Matrix mul is expensive. Affine transform is not. Do the latter instead. 2019-03-10 03:48:07 -05:00
Shyotl
5d75b3b223 Prep for animesh. 2019-03-09 01:51:50 -06:00
Shyotl
55ad048b3a Bring specular behavior back in line with LL viewer. 2018-10-12 01:40:31 -05:00
Shyotl
38c6302f11 Attempt to make mesh loading a little less choppy. 2018-08-11 01:09:04 -05:00
Shyotl
5d2eb3e4cf Fixed hot spot in volume generation. 2018-08-10 23:07:13 -05:00
Shyotl
0e08d7d703 Explicitly alphamasked faces on HUD attached prims were not going into correct drawpool. 2017-11-25 19:20:11 -06:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Shyotl
f62fded4bd Use avatar-relative transforms when skinning via software, and translate to world coordinates after. 2017-01-12 23:47:58 -06:00
Shyotl
98516a2a22 Bento hell and back, and back to hell, and back. 2017-01-11 03:55:36 -06:00
Shyotl
8e7574b9ae Propogate correct mats shader mask for rigged alpha faces. 2016-08-09 00:24:28 -05:00
Shyotl
f26a5e9d62 Added FTType to texture fetch methods. Baked texture fetch now uses dynamic retry policy. 2016-05-01 19:44:06 -05:00
Shyotl
55b5f60b68 V3 mesh, texture, and hover merge. 2016-04-26 13:36:39 -05:00
Shyotl
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05:00
Shyotl
9214750a90 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 2016-04-03 13:22:36 -05:00
Lirusaito
e62261edb2 Sync with Alchemy, includes much awaited lib updates for Linux
Applies ALCH-420 - Replace all invisiprims with fully transparent texture and remove dead code paths
-ARC no longer takes invisis into consideration.

Syncs some script keywords updates.

Changes all "\n" in llfloaterabout.cpp to '\n' because screw.dat
2016-03-27 23:24:17 -04:00
Shyotl
bd26be78a9 Server occlusion prep. 2016-01-18 17:31:35 -08:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Inusaito Sayori
ed701f9c88 Compiler fixies 2015-10-05 15:08:47 -04:00
Inusaito Sayori
e9429b382d Alchemy's "Temp fix some breakage and a crash" by Drake Arconis
Fixes that mesh issue.
2015-09-11 17:26:46 -04:00
Shyotl
dbd1eb0d68 Apply occlusion refactor. 2015-07-23 01:24:12 -05:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
283f5298d5 Missed a line. This assert should only be evaluated when running in deferred. 2015-06-03 12:46:37 -05:00
Shyotl
d140d28af9 Tangent vecs aren't needed for non-deferred bump pas. Omit unless deferred is enabled. 2015-06-01 16:53:29 -05:00
Shyotl
d4a56c6d94 Toss attachments into their own bridge that sets their type to TYPE_AVATAR, and use generic bridge for plain old 'active' volumes. Resolves issue where non-attached ACTIVE flagged linksets would be included in the avatar render type, and thus would vanish when such type was disabled. 2015-05-22 16:14:57 -05:00
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
Shyotl
966c5aa409 Remove redundant methods of checking if shaders are enabled. Just use LLGLSLShader::sNoFixedFunction. 2015-05-16 02:31:06 -05:00
Inusaito Sayori
72080e79e9 Sync llcommon with Alchemy a bit.
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
2015-03-20 22:04:04 -04:00
Drake Arconis
5059d5e2da Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2014-08-30 14:29:32 -04:00