amantley
|
c9db426ce4
|
Merge remote-tracking branch 'upstream/master' into animSplineIK
|
2019-02-21 14:36:13 -08:00 |
|
amantley
|
50bc8d3646
|
added protected function to cubic hermite spline
|
2019-02-21 13:32:28 -08:00 |
|
amantley
|
de10aebbb5
|
removed white space
|
2019-02-21 11:44:18 -08:00 |
|
amantley
|
64ec28ef44
|
added back missing unity meta files
|
2019-02-21 11:37:14 -08:00 |
|
Shannon Romano
|
0b7bdb185e
|
Merge pull request #14949 from SamGondelman/wearables
Case 21300, Case 21301: Group cull all entity descendants of avatars
|
2019-02-20 10:29:40 -08:00 |
|
SamGondelman
|
c8ffb130a3
|
only update sub items on change
|
2019-02-19 17:38:47 -08:00 |
|
Shannon Romano
|
07d084d086
|
Merge pull request #14937 from SamGondelman/pal
Case 21259: Pal textures don't change
|
2019-02-19 17:14:15 -08:00 |
|
SamGondelman
|
6765268998
|
Merge remote-tracking branch 'upstream/master' into wearables
|
2019-02-19 16:52:00 -08:00 |
|
SamGondelman
|
44e70db4cd
|
WE DID IT FOLKS
|
2019-02-19 15:02:36 -08:00 |
|
Dante Ruiz
|
6189aff6b3
|
Merge pull request #14933 from danteruiz/pick-manager-perf
Case 21271: Remove unnessary picks for quest
|
2019-02-19 14:20:56 -08:00 |
|
SamGondelman
|
06ac2b291b
|
attachments and wearables cull with avatar parent
|
2019-02-17 17:52:10 -08:00 |
|
danteruiz
|
b00746c096
|
Trim picks in use during quest:
|
2019-02-15 16:24:17 -08:00 |
|
amantley
|
425413419a
|
fixed merge conflict in avatar.h
|
2019-02-15 08:26:54 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
Bradley Austin Davis
|
d45d87031d
|
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
|
2019-02-14 13:49:47 -08:00 |
|
Andrew Meadows
|
a3567dea3a
|
clean HashKey API, reduce dependency tree
|
2019-02-12 15:37:09 -08:00 |
|
Andrew Meadows
|
17ab0cb92e
|
more robust ShapeManager garbage collector
|
2019-02-12 15:37:09 -08:00 |
|
David Rowe
|
5428bb19dc
|
Add "Avatar Script" JSDoc API classification
|
2019-02-12 11:49:49 +13:00 |
|
SamGondelman
|
d988de4a17
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-11 10:27:12 -08:00 |
|
Anthony Thibault
|
e6cdfe3377
|
Merge pull request #14827 from luiscuenca/FixShapeInfoAssertion
Case 14722: Fix assertion when trying to create multisphere shapeInfo with empty data (80.0/master)
|
2019-02-08 15:10:44 -08:00 |
|
Anthony Thibault
|
d012d07519
|
Merge pull request #14865 from hyperlogic/feature/anim-optimizations
Animation System Optimizations
|
2019-02-08 12:44:10 -08:00 |
|
John Conklin II
|
dda310c0b9
|
Merge pull request #14835 from SamGondelman/textures
Case 20944: Fix Model textures property
|
2019-02-07 14:19:01 -08:00 |
|
SamGondelman
|
e74ff18bef
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:49:27 -08:00 |
|
SamGondelman
|
25ca52d892
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-07 09:48:13 -08:00 |
|
Sam Gateau
|
632d6e8a73
|
Merge pull request #14863 from danteruiz/android-apps-directories
Case 20877: Support CMake time configuration of QmlFileSelectors
|
2019-02-07 09:30:49 -08:00 |
|
Shannon Romano
|
6a91b54261
|
Merge pull request #14856 from AndrewMeadows/fix-crash-on-early-shutdown-redux
case 21042: fix interface crash on early shutdown, 0.80.0 redux
|
2019-02-06 11:53:49 -08:00 |
|
Shannon Romano
|
30a6f25b69
|
Merge pull request #14851 from AndrewMeadows/myAvatar-unmovable-until-floor
case 20048: don't allow MyAvatar to move until physics enabled
|
2019-02-06 11:52:42 -08:00 |
|
danteruiz
|
d0fecac0d8
|
+android -> +android_interface
|
2019-02-06 11:37:52 -08:00 |
|
John Conklin II
|
3ee412faf7
|
Merge pull request #14854 from danteruiz/quest-default
Case 21037: Allow the script engine to use FileSeclector when loading scriopts
|
2019-02-06 07:21:03 -08:00 |
|
Anthony Thibault
|
708309fa63
|
CubicHermiteSplineWithArcLength optimization
|
2019-02-05 18:11:30 -08:00 |
|
Andrew Meadows
|
16ef30ced0
|
don't flushRepeatedMessages() in LogHandler dtor
|
2019-02-05 17:14:25 -08:00 |
|
John Conklin II
|
ec0bdba7fb
|
Merge pull request #14814 from sethalves/fix-edit-in-releaseGrab
case 20919: Fix edit in release grab
|
2019-02-05 14:48:59 -08:00 |
|
danteruiz
|
30bd9774b2
|
script engine to load platform specific files
|
2019-02-05 13:11:54 -08:00 |
|
Jeff Clinton
|
35608c35de
|
Merge pull request #14808 from danteruiz/webengine-fileselector
Case 20879: Migrate webEngine referencing QML into +webengine folder
|
2019-02-05 12:57:38 -08:00 |
|
Andrew Meadows
|
5a4960b300
|
add crash::doAssert() for debug purposes
|
2019-02-05 09:00:48 -08:00 |
|
SamGondelman
|
b80d2a9b06
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-01 13:33:04 -08:00 |
|
amantley
|
61b019d176
|
added new constructor for cubichermitespline that takes quat and vec3. this means we don't need computeSplineFromTipAndBase to be declared in multiple files
|
2019-01-31 14:13:51 -08:00 |
|
SamGondelman
|
ee1552661c
|
fix textures
|
2019-01-31 12:04:46 -08:00 |
|
amantley
|
f68ee4e7ce
|
merged with master
|
2019-01-31 09:56:46 -08:00 |
|
luiscuenca
|
5438bddc84
|
Fix assertion on shapeInfo when creating multisphere with empty data
|
2019-01-31 09:43:30 -07:00 |
|
amantley
|
2e1a4545c6
|
cache the spine2 spline default offset and ratio
|
2019-01-30 14:47:03 -08:00 |
|
Seth Alves
|
3ab2db96b6
|
deactivate grab action when grab is released
|
2019-01-30 14:43:11 -08:00 |
|
Seth Alves
|
0846eb8ec6
|
attempt to allow position edits in releaseGrab entity-method
|
2019-01-30 14:43:11 -08:00 |
|
Dante Ruiz
|
93a91cdba2
|
webengine fileselector
|
2019-01-30 13:57:49 -08:00 |
|
Antonina Savinova
|
5d49a3f6df
|
Merge pull request #14732 from kencooke/audio-distattn-improvements
Bug fixes and improvements to audio distance attenuation
|
2019-01-29 14:02:29 -08:00 |
|
Jamil Akram
|
f4ead69549
|
Merge pull request #14722 from luiscuenca/multiSphereAvatar04
Multi-sphere avatar detailed collisions
|
2019-01-29 10:10:04 -08:00 |
|
SamGondelman
|
0d1e4bed66
|
merge with master
|
2019-01-28 18:13:05 -08:00 |
|
Sam Gondelman
|
faeb5b36dc
|
Merge pull request #14764 from SamGondelman/NOverlays12
Case 20722: Ring Gizmo Entities to replace Circle Overlays
|
2019-01-28 18:09:23 -08:00 |
|
luiscuenca
|
a6dce5dd84
|
Merge branch 'master' into multiSphereAvatar04
|
2019-01-28 17:48:22 -07:00 |
|
Shannon Romano
|
d8f781deae
|
Merge pull request #14719 from jherico/feature/quest_frame_serialization
case 20883: GPU frame serialization and related tools
|
2019-01-28 15:47:55 -08:00 |
|