luiscuenca
|
2a1f1a4855
|
Remove debug logging
|
2019-01-28 12:55:36 -07:00 |
|
amantley
|
f8bfef6dbd
|
cleaning up the _hipsIndex references, cleaning in general
|
2019-01-28 11:50:23 -08:00 |
|
Roxanne Skelly
|
d3cffa50d6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-01-28 11:11:28 -08:00 |
|
Roxanne Skelly
|
8357f1f9b5
|
CR fixes
|
2019-01-28 11:10:35 -08:00 |
|
luiscuenca
|
cc73649ef8
|
Merge branch 'master' into multiSphereAvatar04
|
2019-01-28 11:57:04 -07:00 |
|
luiscuenca
|
49659f0039
|
Fix error on exit and jointsToFilter param removed
|
2019-01-28 11:55:53 -07:00 |
|
SamGondelman
|
e2bdac1bdd
|
working on polylines
|
2019-01-28 10:52:30 -08:00 |
|
Jeff Clinton
|
f9b63b975d
|
Merge pull request #14781 from danteruiz/script-print-log
Case: 20770 allow debug prints in the log by default
|
2019-01-28 10:49:18 -08:00 |
|
Jamil Akram
|
bcaad3092b
|
Merge pull request #14695 from amantley/trumpFix
Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar
|
2019-01-28 10:12:55 -08:00 |
|
Seth Alves
|
15aa574afd
|
Merge pull request #14774 from danteruiz/window-ontop
case 20705: Allow log window to stay on top
|
2019-01-28 10:05:48 -08:00 |
|
Angus Antley
|
2679a3a30d
|
changed the naming of the middle joint from secondary target to midJoint, also generalized the handling of the neck head rotation after the middle spline is updated
|
2019-01-27 16:30:13 -08:00 |
|
SamGondelman
|
70b1e17a8c
|
more wip
|
2019-01-27 00:05:25 -08:00 |
|
SamGondelman
|
0dd729232b
|
simplify keyboard focus highlight
|
2019-01-26 22:49:12 -08:00 |
|
SamGondelman
|
8f0bd2449b
|
pointerevents are working!
|
2019-01-26 21:53:46 -08:00 |
|
SamGondelman
|
abd7d6bddf
|
some stuff is working!
|
2019-01-26 01:39:13 -08:00 |
|
SamGondelman
|
bb5c556657
|
working on conversion
|
2019-01-25 19:15:53 -08:00 |
|
amantley
|
0b6d0b4baf
|
renamed json to reflect spline node
|
2019-01-25 18:17:15 -08:00 |
|
Shannon Romano
|
a2b2f3f67c
|
Merge pull request #14742 from hyperlogic/bug-fix/user-recenter-model-pref
Settings > Controls > User Recenter Model now saves properly
|
2019-01-25 17:34:33 -08:00 |
|
Shannon Romano
|
f084021fdf
|
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type
Added HMD Avatar Alignment Type
|
2019-01-25 17:32:41 -08:00 |
|
Shannon Romano
|
fe874ca5b1
|
Merge pull request #14511 from danteruiz/spinbox-fixes
case 20100: fix SpinBox.qml in ControlsUit and adjusting OpenVrConfiguration SpinBoxes
|
2019-01-25 17:30:16 -08:00 |
|
amantley
|
f2a7f37950
|
got rid of the lag in the spline code by setting the flex coeffs to 1.0
|
2019-01-25 17:11:07 -08:00 |
|
Roxanne Skelly
|
dfac0d88a2
|
QmlMarketplace - Add 'logged out' behavior, fix issue with search scope
display
|
2019-01-25 16:41:13 -08:00 |
|
Jeff Clinton
|
f78fdffeda
|
Merge pull request #14727 from wayne-chen/oculusLoginFeature
MS20311: Oculus login feature
|
2019-01-25 16:16:32 -08:00 |
|
amantley
|
91fddf783f
|
increased the threshold to stop vertical recentering
|
2019-01-25 16:09:45 -08:00 |
|
SamGondelman
|
becc9f4f8d
|
DELETE IT ALL
|
2019-01-25 16:06:59 -08:00 |
|
Dante Ruiz
|
db58173977
|
fix mac issue
|
2019-01-25 15:10:53 -08:00 |
|
amantley
|
cc4d9e2ae2
|
Merge remote-tracking branch 'upstream/master' into trumpFix
|
2019-01-25 15:05:00 -08:00 |
|
amantley
|
bcbd9323c0
|
Merge remote-tracking branch 'upstream/master' into animSplineIK
|
2019-01-25 14:42:24 -08:00 |
|
amantley
|
446d7b9514
|
added the flex coeff for the primary and secondary spline targets to the json
|
2019-01-25 14:41:18 -08:00 |
|
Roxanne Skelly
|
49e6120e73
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-01-25 14:06:44 -08:00 |
|
SamGondelman
|
a2083d949e
|
IT'S BUILDING (but still wip)
|
2019-01-25 14:04:52 -08:00 |
|
Adam Smith
|
f651ad2f67
|
Merge pull request #14711 from SamGondelman/NOverlays10
Case 20585: Add missing Web Overlay functionality to Web Entities
|
2019-01-25 14:00:52 -08:00 |
|
Wayne Chen
|
1c6521486e
|
fixing compile errors
|
2019-01-25 13:56:56 -08:00 |
|
Dante Ruiz
|
4ed54f63ea
|
allow debug prints in the log by default
|
2019-01-25 13:56:54 -08:00 |
|
Roxanne Skelly
|
6123c4ec96
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-01-25 13:45:04 -08:00 |
|
Roxanne Skelly
|
ff2d51701e
|
QML Marketplace
Add keyboard while in search
General cleanup
|
2019-01-25 13:41:16 -08:00 |
|
luiscuenca
|
f54f9e5bfd
|
Merge branch 'master' into multiSphereAvatar04
|
2019-01-25 13:54:01 -07:00 |
|
luiscuenca
|
df4be641eb
|
More fixes
|
2019-01-25 13:42:18 -07:00 |
|
Wayne Chen
|
6f49914167
|
Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature
|
2019-01-25 12:19:20 -08:00 |
|
Wayne Chen
|
635c7533b9
|
more code review feedback
|
2019-01-25 12:15:38 -08:00 |
|
Wayne Chen
|
c136f24181
|
Merge branch 'master' into oculusLoginFeature
|
2019-01-25 11:44:14 -08:00 |
|
Wayne Chen
|
0928b1bff1
|
code review feedback
|
2019-01-25 11:36:58 -08:00 |
|
Shannon Romano
|
90c7423dfb
|
Merge pull request #14772 from wayne-chen/loginScreenPreserveRatio
MS20825: Login Screen Aspect/Crop with resizing
|
2019-01-25 11:16:10 -08:00 |
|
Brad Davis
|
81a7fa17bf
|
PR feedback
|
2019-01-25 11:14:40 -08:00 |
|
SamGondelman
|
5ce8f566cc
|
more overlay wip
|
2019-01-25 11:10:11 -08:00 |
|
Shannon Romano
|
28edb472fc
|
Merge pull request #14713 from raveenajain/collideWithOtherAvatars_scale
20565 Avatar::_collideWithOtherAvatars does not scale
|
2019-01-25 11:06:36 -08:00 |
|
Shannon Romano
|
552729abe7
|
Merge pull request #14759 from Atlante45/feat/gltf
Enable "Add To World" Asset Browser button for glTF
|
2019-01-25 09:56:40 -08:00 |
|
amantley
|
2574e82184
|
cleaned up print statements
|
2019-01-24 19:47:27 -08:00 |
|
Dante Ruiz
|
2c22fb82b1
|
keep log window on top option
|
2019-01-24 18:16:07 -08:00 |
|
Roxanne Skelly
|
cfaf01b22a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
|
2019-01-24 17:21:16 -08:00 |
|
Roxanne Skelly
|
c1ff51a02d
|
QML Marketplace
Checkpoint full functionality
|
2019-01-24 17:20:42 -08:00 |
|
amantley
|
37f92d2319
|
added code to read tip and base var info from the json
|
2019-01-24 17:02:30 -08:00 |
|
Wayne Chen
|
4880c7081e
|
adding blurred images
|
2019-01-24 16:00:24 -08:00 |
|
Wayne Chen
|
5c55761e4d
|
adding fill mode for aspect/crop
|
2019-01-24 15:57:04 -08:00 |
|
Wayne Chen
|
9da7465698
|
readding render session, adding newlines for oculus failure
|
2019-01-24 15:33:50 -08:00 |
|
SamGondelman
|
ca8d64bc05
|
removing overlays wip
|
2019-01-24 14:59:45 -08:00 |
|
Andrew Meadows
|
09fe9735fa
|
plug grab leak, more correct names
|
2019-01-24 14:57:54 -08:00 |
|
Andrew Meadows
|
ee3fde9df1
|
unravel spaghetti, prefer std over Qt containers
|
2019-01-24 14:39:00 -08:00 |
|
Adam Smith
|
dadd49f535
|
Merge pull request #14667 from SamGondelman/NOverlays9
Case 20535: renderLayer, primitiveMode, groupCulled Entity properties
|
2019-01-24 14:36:27 -08:00 |
|
SamGondelman
|
0bfcde67ea
|
remove overlays from application.cpp
|
2019-01-24 14:11:24 -08:00 |
|
Andrew Meadows
|
160bef8f23
|
cleanup and minor optimizations
|
2019-01-23 23:18:52 -08:00 |
|
SamGondelman
|
a75fe4b48b
|
cloneOverlay, deleteOverlay, findOverlays
|
2019-01-23 18:54:39 -08:00 |
|
SamGondelman
|
217ff2b1b2
|
keyboardFocusOverlay
|
2019-01-23 18:33:35 -08:00 |
|
SamGondelman
|
5d19666f60
|
merge with master
|
2019-01-23 17:58:56 -08:00 |
|
SamGondelman
|
9a734b2011
|
merge with master
|
2019-01-23 17:48:24 -08:00 |
|
amantley
|
cdd03646c2
|
latest spline code with ik node removed started cleanup
|
2019-01-23 17:22:13 -08:00 |
|
luiscuenca
|
7a0f3ea7ef
|
Fix error
|
2019-01-23 18:04:13 -07:00 |
|
luiscuenca
|
a947c894c2
|
Suggested changes
|
2019-01-23 17:23:36 -07:00 |
|
Anthony Thibault
|
a7a71e4286
|
Merge branch 'master' into feature/hmd-avatar-alignment-type
|
2019-01-23 15:52:20 -08:00 |
|
Jeff Clinton
|
49fa2dc75d
|
Merge pull request #14715 from ctrlaltdavid/M20052
Case 20052: Fix tablet sometimes not working after domain change
|
2019-01-23 15:29:20 -08:00 |
|
Dante Ruiz
|
df34d8dcc0
|
fix spinbox and adjusting OpenVrConfiguration spin boxes
|
2019-01-23 14:59:37 -08:00 |
|
Wayne Chen
|
049282e2b3
|
fixing text alignment issues, adding some oculus user log
|
2019-01-23 14:38:06 -08:00 |
|
Brad Davis
|
e18e3fc138
|
Gpu Frame serialization
|
2019-01-23 13:21:34 -08:00 |
|
Jeff Clinton
|
b9f9766b01
|
Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd
Fix security-image display in HMD
|
2019-01-23 13:18:45 -08:00 |
|
Wayne Chen
|
e6426cb680
|
fixing bug with cancel button
|
2019-01-23 10:26:51 -08:00 |
|
Simon Walton
|
77293150b7
|
Const declarations to enforce singleton capability
|
2019-01-22 18:05:47 -08:00 |
|
Simon Walton
|
3a5d550fa5
|
Treat QmlCommerce as a singleton class
|
2019-01-22 17:13:36 -08:00 |
|
Clement
|
61be5a3cc4
|
Enable "Add To World" Asset Browser button for glTF
|
2019-01-22 17:01:06 -08:00 |
|
Jeff Clinton
|
3776472550
|
Merge pull request #14731 from AndrewMeadows/fix-mexico-hats
cases 20709 and 20715: wear and see mexico hats
|
2019-01-22 12:58:56 -08:00 |
|
amantley
|
dbd03e2eb4
|
got the spline arms and legs working without any inverse kinematic node in the json, using _withIKnode.json
|
2019-01-22 11:53:18 -08:00 |
|
Gabriel Calero
|
f67d98f296
|
Merge remote-tracking branch 'upstream/master' into display_name_and_avatar
|
2019-01-22 14:17:52 -03:00 |
|
Gabriel Calero
|
6c431996c7
|
Allow to set a display name and choose an avatar
|
2019-01-22 12:21:06 -03:00 |
|
amantley
|
8d88c627b0
|
nearly have the arms legs and back working with out the ik node
|
2019-01-21 17:41:08 -08:00 |
|
raveenajain
|
2393db5e12
|
collision logic
|
2019-01-21 16:24:32 -08:00 |
|
Roxanne Skelly
|
8010d86210
|
QML Marketplace support
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
|
2019-01-21 13:39:16 -08:00 |
|
raveenajain
|
3f2aa56187
|
feedback changes
|
2019-01-21 13:24:07 -08:00 |
|
Simon Walton
|
c3a8c71f60
|
Add TabletMenu to list of pages that trigger the QmlCommerce bridge
|
2019-01-21 12:27:14 -08:00 |
|
amantley
|
6680ca53ad
|
added updateHands2 which deals with two bone hands animvars
|
2019-01-20 08:56:39 -08:00 |
|
raveenajain
|
379f98b26d
|
just using change
|
2019-01-18 18:20:28 -08:00 |
|
amantley
|
3a2697fa8c
|
working on the two bone ik for the hands
|
2019-01-18 17:55:19 -08:00 |
|
Anthony Thibault
|
205e375d36
|
Settings > Controls > User Recenter Model now saves properly
|
2019-01-18 16:58:26 -08:00 |
|
raveenajain
|
d2e37d0c90
|
my and other avater changes, if setting toggled can pass through other avatar
|
2019-01-18 16:50:44 -08:00 |
|
Andrew Meadows
|
9a854291af
|
supress spurious not important AvatarEntity updates
|
2019-01-18 15:36:38 -08:00 |
|
amantley
|
7777162351
|
got the spine2 rotationa and the head spline working
|
2019-01-18 15:28:41 -08:00 |
|
Adam Smith
|
da7cd6b2f7
|
Merge pull request #14691 from SamGondelman/multifrustum
Case 20394: Fix multi-frustum view updating
|
2019-01-18 15:23:58 -08:00 |
|
Antonina Savinova
|
8c4c488676
|
Merge pull request #14721 from Atlante45/feat/upstream-limitter
Limit upstream bandwidth to the Avatar Mixer
|
2019-01-18 13:32:03 -08:00 |
|
Jeff Clinton
|
09b16d2d7a
|
Merge pull request #14735 from SamGondelman/snap
Case 20724: Fix Snap app settings issue
|
2019-01-18 13:00:18 -08:00 |
|
Shannon Romano
|
11b8ae6d44
|
Merge pull request #14710 from sethalves/mouse-grab-with-traits
case 15962: case 20481: Mouse grab with traits
|
2019-01-18 11:56:41 -08:00 |
|
luiscuenca
|
43244193e8
|
Mesh picking against default pose with transformed ray
|
2019-01-18 12:46:18 -07:00 |
|
SamGondelman
|
d6f0fbd17b
|
fix snap app issue
|
2019-01-18 10:48:20 -08:00 |
|
Anthony Thibault
|
0ab13f1e48
|
Merge pull request #14705 from luiscuenca/changeCollisionDesignOnAvatarApp
Change Avatar App design for avatar collisions
|
2019-01-17 16:06:17 -08:00 |
|
Shannon Romano
|
c764f5182f
|
Merge pull request #14717 from roxanneskelly/Case20277
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
|
2019-01-17 15:36:31 -08:00 |
|
Wayne Chen
|
238f020392
|
remove trailing whitespace
|
2019-01-17 14:20:47 -08:00 |
|
Wayne Chen
|
2859784e17
|
Merge branch 'master' into oculusLoginFeature
|
2019-01-17 14:20:00 -08:00 |
|
Andrew Meadows
|
74f9a415d3
|
move _cauterizationNeedsUpdate back to MyAvatar
|
2019-01-17 13:58:34 -08:00 |
|
luiscuenca
|
007e3ac577
|
Fix warning and wrong ID
|
2019-01-17 14:53:06 -07:00 |
|
Seth Alves
|
4fbc257be0
|
don't cauterize head-children when they are grabbed
|
2019-01-17 13:34:36 -08:00 |
|
luiscuenca
|
2158e084d4
|
Add avatar joints filter to intersection calculation
|
2019-01-17 14:01:36 -07:00 |
|
John Conklin II
|
19e4a7389b
|
Merge pull request #14676 from wayne-chen/updateLoginUserLogging
case 20654: Updating user activity logging for login experience
|
2019-01-17 12:59:12 -08:00 |
|
Wayne Chen
|
123f2d71e5
|
dismissing login dialog on popup if bad linking
|
2019-01-17 11:38:42 -08:00 |
|
John Conklin II
|
45ec44423b
|
Merge pull request #14694 from danteruiz/delete-only-domain-entities
case 20595: case 20563: Do not delete local entities when switching domains.
|
2019-01-17 11:25:58 -08:00 |
|
Adam Smith
|
f955313afc
|
Merge pull request #14687 from SamGondelman/cancel
Case 20580: Trying to fix wearables and avatar app
|
2019-01-17 11:25:30 -08:00 |
|
Wayne Chen
|
79ffc311e1
|
code cleanup + adding password error
|
2019-01-17 10:19:40 -08:00 |
|
Wayne Chen
|
ef63213d28
|
fixing linking account problems on oculus/steam, changing callback
|
2019-01-16 21:07:54 -08:00 |
|
amantley
|
e5b16ef174
|
implemented the splineIK in animSplineIK.cpp, todo: disable animinversekinematic.cpp
|
2019-01-16 18:31:52 -08:00 |
|
Wayne Chen
|
bb61334c0d
|
Merge branch 'master' into oculusLoginFeature
|
2019-01-16 17:24:22 -08:00 |
|
Wayne Chen
|
673c4ad434
|
fixing error message spacing
|
2019-01-16 17:22:00 -08:00 |
|
Wayne Chen
|
3ad0f60dd5
|
fixing error message spacing
|
2019-01-16 17:20:01 -08:00 |
|
Wayne Chen
|
116a15afe8
|
removing oculus userID to server - no need
|
2019-01-16 17:15:40 -08:00 |
|
Wayne Chen
|
8e916ea41b
|
linking oculus acct creation to spinner
|
2019-01-16 17:05:59 -08:00 |
|
Wayne Chen
|
f4d4220e58
|
adding final create failure message handling, ui improvements
|
2019-01-16 17:05:56 -08:00 |
|
Wayne Chen
|
c54bce3953
|
fixing desktop login page crash
|
2019-01-16 17:05:55 -08:00 |
|
Wayne Chen
|
d38a657c54
|
filling username with oculus username, checking create error
|
2019-01-16 17:05:54 -08:00 |
|
Wayne Chen
|
671f15b63c
|
removing isLogIn
|
2019-01-16 17:05:53 -08:00 |
|
Wayne Chen
|
3b3b86888e
|
adding blur to login bg
|
2019-01-16 17:05:53 -08:00 |
|
Wayne Chen
|
fbc2dc5103
|
adding changes to forms
|
2019-01-16 17:05:52 -08:00 |
|
Wayne Chen
|
5c54930910
|
adding tablet close upon login
|
2019-01-16 17:05:52 -08:00 |
|
Wayne Chen
|
2d16e71e74
|
adding sending oculus ID including username
|
2019-01-16 17:05:52 -08:00 |
|
Wayne Chen
|
7e674ba3c4
|
better check for if oculus is running
|
2019-01-16 17:05:51 -08:00 |
|
Wayne Chen
|
ca0916886a
|
adding more qml for oculus login
|
2019-01-16 17:05:51 -08:00 |
|
Wayne Chen
|
39a68a88f0
|
fixing typos in callback implementation
|
2019-01-16 17:05:51 -08:00 |
|
Wayne Chen
|
ed39b43d3b
|
changing request to have a callback function passed
|
2019-01-16 17:05:51 -08:00 |
|
Wayne Chen
|
6bc1164d58
|
more wip on oculus login
|
2019-01-16 17:05:50 -08:00 |
|
Wayne Chen
|
4320f4cbe4
|
migrating platform plugin
|
2019-01-16 17:05:50 -08:00 |
|
Wayne Chen
|
a905310a58
|
more staging
|
2019-01-16 17:05:49 -08:00 |
|
Wayne Chen
|
a24ebe2718
|
oculus functions live in the display plugin; display plugins update
|
2019-01-16 17:05:49 -08:00 |
|
Wayne Chen
|
970798705c
|
improving flow from Oculus API to login dialog wip
|
2019-01-16 17:05:48 -08:00 |
|
Wayne Chen
|
1af57bdba6
|
staging
|
2019-01-16 17:05:48 -08:00 |
|
Wayne Chen
|
db06533018
|
adding more staging
|
2019-01-16 17:05:48 -08:00 |
|
Wayne Chen
|
1fc51445d0
|
adding files for staging login
|
2019-01-16 17:05:47 -08:00 |
|
SamGondelman
|
9727c8fd38
|
CR
|
2019-01-16 14:14:01 -08:00 |
|
luiscuenca
|
67cc5bd7f2
|
Fix warnings and wrong shapes position for myAvatar
|
2019-01-16 10:52:34 -07:00 |
|
Seth Alves
|
fd09180776
|
Merge pull request #14645 from ctrlaltdavid/M19774-d
Make mouselook directly proportional to right-click mouse
|
2019-01-16 09:09:38 -08:00 |
|
Roxanne Skelly
|
6cb12daf74
|
CR Fixes
|
2019-01-15 17:49:13 -08:00 |
|
luiscuenca
|
a7f143dbce
|
Merge branch 'master' into multiSphereAvatar04
# Resolved Conflicts:
# interface/src/avatar/MyAvatar.h
# interface/src/avatar/OtherAvatar.cpp
|
2019-01-15 18:27:04 -07:00 |
|
luiscuenca
|
71e7023a3e
|
Refactor and optimizations
|
2019-01-15 18:07:50 -07:00 |
|
SamGondelman
|
1d2270e9c7
|
web entity fixes
|
2019-01-15 16:51:36 -08:00 |
|
Seth Alves
|
b1c34eb9ec
|
update queryAACube during grab rather than only when grab is released
|
2019-01-15 16:01:44 -08:00 |
|
Wayne Chen
|
3b913db609
|
fixing typo
|
2019-01-15 14:21:37 -08:00 |
|
Clement
|
8480624797
|
Limit upstream data to avatar mixer
|
2019-01-15 14:18:53 -08:00 |
|
Roxanne Skelly
|
6317ceb9b3
|
Case20277 - Ignoring user causes loading orb to appear at /0,0,0
Loading orb was created for all other avatars upon OtherAvatar object
creation without checking the ignore list.
|
2019-01-15 13:34:29 -08:00 |
|
David Rowe
|
184c11ca44
|
Fix tablet sometimes not working after domain change
|
2019-01-16 08:54:29 +13:00 |
|
Clement
|
6bd6c45b60
|
Remove dead IdentityRequest code
|
2019-01-15 11:40:08 -08:00 |
|
Shannon Romano
|
eed53f60ba
|
Merge pull request #14556 from vladest/avatar_app_warnings
Fix Avatar apps warnings.
|
2019-01-15 11:03:43 -08:00 |
|
Shannon Romano
|
0089b91eea
|
Merge pull request #14609 from sethalves/fb-20280
fix a couple shutdown crashes and a class of asan warning
|
2019-01-15 10:59:08 -08:00 |
|
SamGondelman
|
9803043512
|
web entity fixes
|
2019-01-15 09:51:55 -08:00 |
|
Antonina Savinova
|
6499c4f0ea
|
Merge pull request #14700 from SimonWalton-HiFi/update-icons
New icons for interface and server-console
|
2019-01-14 16:04:55 -08:00 |
|
SamGondelman
|
68e15c6c07
|
fixes from 78
|
2019-01-14 13:36:21 -08:00 |
|
luiscuenca
|
824a93f900
|
Fix menu update on app reopened
|
2019-01-14 12:27:59 -07:00 |
|
Dante Ruiz
|
e7d3844620
|
making pre review requests
|
2019-01-14 11:14:57 -08:00 |
|
SamGondelman
|
6fd34bf1f0
|
setup qml surface contexts
|
2019-01-14 09:26:57 -08:00 |
|
luiscuenca
|
43d967329c
|
Change Avatar App design for avatar collisions
|
2019-01-14 10:13:12 -07:00 |
|
luiscuenca
|
65896b3b6f
|
Fix shape LOD
|
2019-01-13 11:30:39 -07:00 |
|
Dante Ruiz
|
8252481ce7
|
Delete domain entities only
|
2019-01-11 16:00:10 -08:00 |
|
Seth Alves
|
6589db628a
|
fix a couple shutdown crashes and a class of asan warning
|
2019-01-11 15:53:49 -08:00 |
|
Seth Alves
|
6cd5770505
|
Merge pull request #14690 from sethalves/plugin-versioning
Plugin versioning
|
2019-01-11 15:20:05 -08:00 |
|
Simon Walton
|
d271bcd6f4
|
New icons for interface and server-console
|
2019-01-11 14:50:13 -08:00 |
|
luiscuenca
|
19701ef333
|
Fix scale and add rayTest
|
2019-01-11 15:36:07 -07:00 |
|
SamGondelman
|
4b67a79561
|
more web entity wip
|
2019-01-11 09:57:42 -08:00 |
|
amantley
|
8cba72743e
|
changed the value for the top threshold that triggers a vertical reset, this stops unwanted recentering
|
2019-01-11 08:46:20 -08:00 |
|
SamGondelman
|
6d12f5704e
|
fix multi-frustum view updating
|
2019-01-10 15:47:19 -08:00 |
|
Seth Alves
|
0603431ac8
|
initialize _logger with null pointer
|
2019-01-10 15:16:33 -08:00 |
|
Seth Alves
|
c8db50cb20
|
start up logger before loading plugins.
put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.
|
2019-01-10 15:06:22 -08:00 |
|
Andrew Meadows
|
16da42723e
|
use glm::abs() instead of absf()
|
2019-01-10 10:15:39 -08:00 |
|
Andrew Meadows
|
f7b7db5ab4
|
fix warning on OSX, use correct format for float literals
|
2019-01-10 09:14:37 -08:00 |
|
Andrew Meadows
|
9ea6968e35
|
fix bug where attached AvatarEntities do not update in timely fashion
|
2019-01-09 17:40:18 -08:00 |
|
Andrew Meadows
|
8206daf1a6
|
send update when loading AvatarEntity from Settings
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
e2d6e6f3dc
|
more correct AvatarEntityData settings when switching domains
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
27318a3f17
|
update AvatarEntitData blobs before writing to JSON during recordings
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
c998ddbb9e
|
ScriptableAvatar::setAvatarEntityData() works
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
63ed0a3a98
|
move blob conversion recipes to EntityItemProperties
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
855497e604
|
MyAvatar.updateAvatarEntity(id, data) works in theory
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
a4be4fb6c0
|
MyAvatar.setAvatarEntityData() works
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
cbda905e3b
|
fix typo
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
329ec84104
|
MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
cbcd70aee6
|
namechanges and comments to help clarify necessary fixes
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
9f404ef006
|
Agent bots can manipulate AvatarEntities again
|
2019-01-09 17:28:00 -08:00 |
|
Andrew Meadows
|
43fc86fe54
|
restore non-human-readable avatarEntityDataSettings format
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
dedc14434b
|
fix compile warnings on windows
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
320ba9177c
|
remove cruft
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
121a591023
|
delete old AvatarEntities on domain reset on login
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
1815d71158
|
fix data corruption bug
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
6da8c5545e
|
remove debug code
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
ce660bee9b
|
fix compile errors after rebase
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
61b8d005b5
|
scripts can edit AvatarEntities again
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
6c81e8845b
|
cleanup
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
fe2ee68b79
|
add EntityItemProperties::copyFromJSONString()
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
ec384d7dbb
|
more correct reload AvatarEntityData from settings
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
0ed936520d
|
MyAvatar saving to settings works again
|
2019-01-09 17:27:14 -08:00 |
|
Andrew Meadows
|
e37b5b52f0
|
correctly load AvatarEntities from settings redux
|
2019-01-09 17:27:14 -08:00 |
|