Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
73483 commits 75 branches 59 tags 1.2 GiB
Commit graph

22481 commits

Author SHA1 Message Date
Anthony Thibault
0283c9fbdc Added CriticallyDampedSpringPoseHelper to help smooth out hips. 2018-10-09 10:51:02 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
unknown
3c25e6d5a8 Increase the linear velocity step when the avatar is small to avoid freezing 2018-10-08 14:40:54 -07:00
Alexander Ivash
19c3f1516f relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables 2018-10-09 00:17:19 +03:00
Clement
3eb7c80af3 Fix BandwidthRecorder storage concurrent accesses 2018-10-08 13:45:34 -07:00
unknown
1172e29d95 Clean up elbow smoothing code 2018-10-08 13:21:47 -07:00
Sam Gondelman
67662df760
Merge branch 'master' into scriptvec3 2018-10-08 12:59:34 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged 
Merged interstitial page/redirect domain improvements
 2018-10-08 10:32:29 -07:00
amantley
3517905435 added getter and setter for sitstandstatechange bool 2018-10-05 16:22:30 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged 
fix for failing to enter domain
 2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
amantley
96872f8412 moved all the state update for sit and stand to myavatar::update() also 
made it so that sit horizontal reset is handled in non-cg recentering.
to do: revisit what should be sent for desired body in prephysics update
call
 2018-10-05 14:55:43 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
amantley
ad46b71966 before moving the step state counting to myavatar::update() 2018-10-05 13:04:14 -07:00
Wayne Chen
8abbd51bb1 removing unused variable 2018-10-04 23:11:27 -07:00
David Rowe
2ba8dc37d0 Miscellanous JSDoc fixes for issues noticed in passing 2018-10-05 16:57:29 +13:00
David Rowe
539c280281 Fill in missing JSDoc stubs in AvatarList and AvatarManager 2018-10-05 15:13:13 +13:00
danteruiz
d285080197 remmoving some debug statements 2018-10-04 18:38:25 -07:00
amantley
cbe638bfdb added flag for vertical recentering that is state change, snap, versus 
the usual .5 second recentering
 2018-10-04 18:17:27 -07:00
David Rowe
ea8e02a84a Fix and fill in JSDoc for MyAvatar flying-related functions 2018-10-05 14:05:33 +13:00
amantley
635300c6d5 changed pre physics to use cg for desired body when in cg mode 2018-10-04 18:05:05 -07:00
Dante Ruiz
5d011bafb2 small tweaks 2018-10-04 17:02:44 -07:00
Dante Ruiz
2a3b4a85c7 debugging 2018-10-04 15:57:05 -07:00
amantley
82f8c67436 put the mode in sensor space for cg 2018-10-04 15:37:01 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
amantley
acce675efc added snap for recentering with sit stand state change. using average height with tipping point for thresholds 2018-10-04 14:53:51 -07:00
divya
7aa715c383
Merge pull request #14141 from luiscuenca/transitFirstPacketFix 
Fix avatars transit on domain enter
 2018-10-04 13:08:59 -07:00
SamGondelman
4024f2a180 fix various resourcecache bugs 2018-10-04 11:29:22 -07:00
Wayne Chen
c785efec84 removing extraneous bool 2018-10-04 10:56:04 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
amantley
809ca0e512 vive hmd input is implemented. not using mode 2018-10-03 18:05:30 -07:00
Sam Gondelman
4e96c3297b
Merge branch 'master' into scriptvec3 2018-10-03 17:14:15 -07:00
luiscuenca
a05e493e06 Long distance avatars should not be new 2018-10-03 17:09:51 -07:00
luiscuenca
bb98457d09 Fix avatars transit on domain enter 2018-10-03 16:23:09 -07:00
Dante Ruiz
b46d2319b1 fix spelling error 2018-10-03 15:22:53 -07:00
Dante Ruiz
78268001c4 reverting logic change 2018-10-03 15:13:42 -07:00
sabrina-shanman
2ef85dfdba Merge branch 'master' into stt_parenting2 2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
Dante Ruiz
b28c375ad3 better loading check logic 2018-10-03 09:57:32 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
amantley
8a0fbc3fe9 changed the height to use the mode . to do fix sensor space bug. 2018-10-02 17:47:56 -07:00
Alexia Mandeville
d769f83cdd
Merge branch 'master' into menu-updates 2018-10-02 16:43:08 -07:00
Brad Hefta-Gaub
6b9842d4da
Merge pull request #14131 from Atlante45/feat/deadlock-backtrace 
Better deadlock crash
 2018-10-02 16:03:20 -07:00
Sam Gondelman
cd947f0a66
Merge pull request #14054 from gcalero/android_signup 
Android signup
 2018-10-02 12:37:57 -07:00
Clement
3c4e543b3c Better deadlock crash 2018-10-02 11:51:15 -07:00
John Conklin II
898ba20f1c
Merge pull request #14068 from hyperlogic/bug-fix/bad-avatar-pointer-static-cast 
Fix for bad static_pointer_cast on exit.
 2018-10-02 11:31:47 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3 2018-10-02 08:58:04 -07:00
Gabriel Calero
13e2b99dfa Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-02 09:24:09 -03:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
 2018-10-02 16:49:16 +13:00
amantley
f0676d796c added constants and tipping point for running average. this should be replaced by the mode 2018-10-01 17:57:00 -07:00
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3ab83731b9
Merge pull request #14087 from sethalves/quiet-asan 
fix several uninitialized reads
 2018-10-01 16:48:54 -07:00
John Conklin II
dd5cd5de82
Merge pull request #14091 from gcalero/fix-case-18465 
Fix case 18465: redirect to domain after login
 2018-10-01 16:48:27 -07:00
John Conklin II
8ad5ca5a67
Merge pull request #14105 from luiscuenca/bookmarkOnFloorFix 
Fix avatar warp into floor when navigating to a saved bookmark
 2018-10-01 16:36:31 -07:00
Gabriel Calero
1422c178a4 Merge remote-tracking branch 'upstream/master' into android_signup 2018-10-01 20:36:27 -03:00
Seth Alves
c144671c97
Merge pull request #14110 from sethalves/fix-clang-7-build 
get interface building and working with clang-7 on ubuntu 18
 2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub
6290b56383
Merge pull request #14079 from luiscuenca/simpleAvatarTransit 
Simple avatar transit
 2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation 
Fix edit rotation handle fidgeting
 2018-10-01 16:15:32 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged 
Interstitial screen updates
 2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2 updating interstitialmode 2018-10-01 15:26:56 -07:00
amantley
90feeffa9d cleaning up. putting squat fix in vertical recenter 2018-10-01 14:21:00 -07:00
Dante Ruiz
652ec2210d fixing loading issues 2018-10-01 13:58:14 -07:00
sabrina-shanman
b988382918 Remove smaller RayPick constructor 2018-10-01 11:07:02 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
sabrina-shanman
7a89f959d1 Fix not mentioning pick parenting in all pick parenting jsdocs for 
parentID
 2018-10-01 09:34:21 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
sabrina-shanman
0cf7e954cc Simplify a RayPick and StylusTip constructor 2018-10-01 09:20:59 -07:00
sabrina-shanman
f0de3ef31c jsdocs: Do not list scaleWithAvatar as separate property, and document 0 as default for parentJointIndex 2018-10-01 09:18:52 -07:00
sabrina-shanman
728f8aeecd Scale Parabola Pick acceleration before rotating it 2018-10-01 09:02:46 -07:00
amantley
1a0e2c6ea1 clean up for pr 2018-10-01 08:30:51 -07:00
amantley
9e40045927 added criteria to stop false positive for sit down 2018-09-30 17:13:34 -07:00
amantley
bdd6befef9 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-09-29 15:39:36 -07:00
David Rowe
9dfbaa9201 Remove "Reset Sensors" button from Settings > Controls 2018-09-29 14:17:55 +12:00
amantley
884ad66a14 added sensor space detection of height of the user in MyAvatar.cpp 1.2 * average sensor space height changes to standing. .833 sensorspace height changes to sitting. there is also a manual override in the avatar app settings now 2018-09-28 17:18:24 -07:00
Anthony Thibault
58df72af60 Merge branch 'master' into bug-fix/bad-avatar-pointer-static-cast 2018-09-28 16:32:12 -07:00
sabrina-shanman
f3f9976cfb Cache ParabolaPick speed 2018-09-28 16:10:17 -07:00
sabrina-shanman
b60a62da8f Move pathWidth variable in PathPointer back down to specialized classes 2018-09-28 16:04:34 -07:00
sabrina-shanman
0c3f55d6ef Code style for floating point literal 2018-09-28 15:39:37 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Gabriel Calero
b7c421ba47 Fixes according to review 2018-09-28 14:39:15 -03:00
sabrina-shanman
8f2d3b17d3 Fix parabola scaling issues and raypick velocity denormalization due to transform affecting direction scale 2018-09-28 09:27:38 -07:00
David Rowe
1c4bde3e84 Fix build warnings 2018-09-28 18:38:38 +12:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
f2c13f193c Don't jump in HMD mode unless option is set 2018-09-28 16:05:20 +12:00
David Rowe
45993ba475 Provide mini tablet details via API instead of messages 2018-09-28 14:23:08 +12:00
sabrina-shanman
e7c70705b2 Actually make the result transform of a collision pick just a position, as documented 2018-09-27 17:33:52 -07:00
sabrina-shanman
44efe648e0 Add scaleWithParent option to collision pick creation 2018-09-27 17:29:42 -07:00
sabrina-shanman
e176143025 Make scaleWithParent true by default for parabola picks 2018-09-27 17:29:42 -07:00
sabrina-shanman
2dd8140158 Make scaleWithAvatar an alias for scaleWithParent in PointerScriptingInterface and make true the default for parabola pointers 2018-09-27 17:29:42 -07:00
sabrina-shanman
bc861c1368 Make path pointers use scaleWithParent behind the scenes instead of scaleWithAvatar 2018-09-27 17:29:37 -07:00
luiscuenca
195df9e0ec compute feet position offset in situ 2018-09-27 17:18:43 -07:00
amantley
42cb8a7ef0 avatar app changes 2018-09-27 16:59:54 -07:00
amantley
52355e53f1 adding the menu item to the avatar app for the sit state. 2018-09-27 16:44:55 -07:00
sabrina-shanman
bfa270375a Simplify PickRay calculations in RayPick::getMathematicalPick 2018-09-27 14:33:29 -07:00
sabrina-shanman
9e0d35e40d Combine PickScriptingInterface::getPickJointState and createTransformNode into one function 2018-09-27 14:28:10 -07:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-27 12:05:21 -07:00
sabrina-shanman
ed987ffe9e Improve style/compatibility for default position/direction when creating parabola pick 2018-09-27 11:42:19 -07:00
sabrina-shanman
12a755310f Fix wrong velocity in ParabolaPick::getMathematicalPick 2018-09-27 11:37:30 -07:00
sabrina-shanman
3ac9478101 Assign _mathPick in the Pick constructor 2018-09-27 11:30:57 -07:00
sabrina-shanman
bb38efa061 Set joint state for the mouse RayPick of the EntityTreeRenderer 2018-09-27 10:58:28 -07:00
sabrina-shanman
b68031b969 Add simpler RayPick constructor with position/direction values set to default 2018-09-27 10:53:10 -07:00
luiscuenca
bbe836ee88 Remove smooth teleport and set/get API methods 2018-09-27 10:38:45 -07:00
Wayne Chen
747aab2097 persisting signed values 2018-09-27 10:16:11 -07:00
Wayne Chen
03d2fa2787 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-09-27 09:47:08 -07:00
Gabriel Calero
fba3b48923 Merge remote-tracking branch 'upstream/master' into android_signup 2018-09-27 11:38:52 -03:00
David Rowe
6ae206677d Add Settings > Controls option for displaying play area 2018-09-27 14:55:53 +12:00
amantley
fa9abf0fff added the floor at 0.0 in sensor space for oculus. to do: vive 2018-09-26 18:08:00 -07:00
Wayne Chen
813defebfc Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged 2018-09-26 16:45:22 -07:00
John Conklin II
7701cfd9c8
Merge pull request #14084 from luiscuenca/appearOnFloorFix 
Fix avatars loading below the ground bug
 2018-09-26 16:00:53 -07:00
Gabriel Calero
3163ae5997 Fix case 18465: redirect to domain after login 2018-09-26 19:41:43 -03:00
John Conklin II
70c7ffcc71
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002 
fix MyAvatar-vs-OtherAvatar collisions
 2018-09-26 15:21:18 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
John Conklin II
c1dc0ff2ec
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only 
Prevent thread issues with PickResults modified by Pointers
 2018-09-26 12:12:58 -07:00
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester 
Marketplace item tester interface
 2018-09-26 11:25:53 -07:00
Dante Ruiz
7e138ebfff update to new enabling method 2018-09-26 10:52:45 -07:00
sabrina-shanman
4011660435 Merge branch 'master' into stt_parenting2 2018-09-26 10:17:45 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master 
fix for deadlock in other avatar entity removal from tree
 2018-09-26 09:58:26 -07:00
Seth Alves
ff2a47e7e6 fix several uninitialized reads 2018-09-26 09:33:12 -07:00
Dante Ruiz
fa5dfb6e28 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-26 09:18:12 -07:00
amantley
4f9de1be1c Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-09-26 08:38:30 -07:00
David Rowe
b98bd741b8 Indent and reword jumping and flying checkbox 2018-09-26 18:14:02 +12:00
David Rowe
053ae0e0ed Use radio buttons for VR advanced movement options 2018-09-26 17:42:44 +12:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect 
Toggle going to 404 redirect domain
 2018-09-25 20:44:57 -07:00
luiscuenca
754653b093 Fix warnings 2018-09-25 17:31:18 -07:00
luiscuenca
82b08f1a93 Wait until skeleton is loaded to locate the avatar 2018-09-25 16:21:05 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test 
Working on Vive shutdown issues
 2018-09-25 15:41:32 -07:00
Roxanne Skelly
cbb4bff2db Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-25 14:16:43 -07:00
sabrina-shanman
55ab0a394b Return std::make_shared 2018-09-25 12:21:22 -07:00
sabrina-shanman
6e83e96d1c Check type in Pointer::getPickResultCopy 2018-09-25 12:05:47 -07:00
amantley
ad6bbc7ff6 latest squatty changes 2018-09-25 11:22:44 -07:00
sabrina-shanman
660bdf36d0 Check if pick result is null when building visual pick result 2018-09-25 09:56:51 -07:00
luiscuenca
1e34d3aa35 Remove not needed code 2018-09-25 09:22:33 -07:00
sabrina-shanman
8dd36e465b Merge branch 'master' into crash_ray-pick-dtor_pointer-only 2018-09-25 09:22:30 -07:00
sabrina-shanman
eca31e7a99 Fix instantiating abstract class when creating visual pick result for pointers 2018-09-25 09:20:57 -07:00
luiscuenca
af2935187b Fix warnings 2018-09-25 08:32:43 -07:00
luiscuenca
0676f25e31 Save transit preferences 2018-09-25 07:42:28 -07:00
luiscuenca
80daf35e77 Animation and particles clean up 2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0 API to configure animation and particle effect 2018-09-25 06:03:29 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
David Rowe
af1b4fef5d Modify layout of rotation mode settings options 2018-09-25 18:03:57 +12:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings 
make settings thread safe
 2018-09-24 17:24:50 -07:00
David Rowe
06b4f51a08 Misc fixes 2018-09-25 11:33:08 +12:00
Andrew Meadows
a3f946dee1 activate OtherAvarar in physics sim on position change 2018-09-24 16:27:37 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
Roxanne Skelly
c1d2f00c9b Fix url.toString() 2018-09-24 15:45:38 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1 Fix timer managmement during shutdown 2018-09-24 14:52:13 -07:00
Roxanne Skelly
16dba169c5 Tray Notifier code review fixes 2018-09-24 14:36:54 -07:00
Wayne Chen
ac5814a1f8 Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect 2018-09-24 13:57:23 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings 
Android settings (AEC)
 2018-09-24 13:55:30 -07:00
Roxanne Skelly
6f4c376d9f Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-24 13:45:24 -07:00
Roxanne Skelly
d5baadbefa Modify --url hifiapp: behavior to trigger through appUI when first 
starting interface.

Also, menu names and order follow UX documentation.
 2018-09-24 13:43:55 -07:00
Andrew Meadows
c1d65f5118 update avatar shape after it loads 2018-09-24 12:07:08 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements 
Small Improvements to Anim Stats
 2018-09-24 11:56:01 -07:00
Anthony Thibault
b467267e40 Fix for bad static_pointer_cast on exit. 
Identified by Address Sanatizer on Linux.

On exit ~Applicaiton calls AvatarManager::deleteAllAvatars.  This iterates over all avatars remaining in the _avatarHash.
Typically this includes the MyAvatar instance.  In this case the previous code would attempt to static cast an AvatarData pointer to an instance
of OtherAvatar.  This might be harmless, but could also lead hard to diagnose issues such as memory corruption.
 2018-09-24 11:47:05 -07:00
luiscuenca
012cd207b3 No data sent during basic transit 2018-09-24 11:39:10 -07:00
Stephen Birarda
b31837168d fix bad lock, optimize some operations, clarify comment 2018-09-24 11:27:20 -07:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
luiscuenca
82b14b6e9b Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport 2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645 lerp myavatar 2018-09-22 05:34:17 -07:00
Seth Alves
86e502637e Make Settings thread safe 2018-09-21 15:46:35 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
Gabriel Calero
f4be767d22 Android sign up 2018-09-21 14:58:11 -03:00
Alexander Ivash
1461fdf350 FB17835 - On clean installs, default avatarbookmarks.json file is read-only; bookmarks reset every launch until replaced or unmarked 2018-09-21 12:19:23 +03:00
luiscuenca
a7a128f1f1 Particle effect and ease movement 2018-09-20 18:37:42 -07:00
Roxanne Skelly
6e051b7431 Checkpoint tray notifications 
* Fix app launch
* refactor notifications code
* fixup wording
 2018-09-20 15:55:35 -07:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
luiscuenca
cad8425c7b Time-based frames, max distance and setting animation from script 2018-09-19 16:43:45 -07:00
Kerry Ivan Kurian
66bf45c3ef Update location only if certificate id 2018-09-19 15:18:18 -07:00
Ryan Huffman
431daecd8e Fix shifting of yaw rotation handle 2018-09-19 14:33:51 -07:00
Wayne Chen
7e796f7e7f committing requested changes 2018-09-19 14:26:30 -07:00
Roxanne Skelly
aba183b165 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-19 13:40:18 -07:00
Ryan Huffman
788c883c02 Fix Circle3DOverlay not rendering solid circle to exact degrees 2018-09-19 13:38:35 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi 
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
 2018-09-19 12:38:28 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola 
Correct transparent parabola shader
 2018-09-19 11:46:24 -07:00
Wayne Chen
a43799fffa moving settings check within slotted functions 2018-09-19 10:40:49 -07:00
Wayne Chen
795580f4e1 adding 404 redirect toggle with interstitial 2018-09-19 09:55:15 -07:00
Stephen Birarda
3a7785d10f fix for deadlock in other avatar entity removal 2018-09-18 17:52:24 -07:00
amantley
42e248ef84 maded more changes to support sitting state to do: add option for stuck pose reset 2018-09-18 17:37:44 -07:00
luiscuenca
96e8b060eb Enable transit animations 2018-09-18 12:42:37 -07:00
amantley
96da9b7e54 cleaned up code for squatty fix 2018-09-18 10:31:19 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
amantley
14fb7e1d44 removed redundant code 2018-09-17 17:53:08 -07:00
amantley
ff0d938d37 initial changes to stop the squatty potty from happening when users are sitting down in vr mode 2018-09-17 16:53:15 -07:00
luiscuenca
f339bbdd7f Fix bug while walking 2018-09-17 13:29:04 -07:00
Zach Fox
23fab0985b Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-17 11:11:21 -07:00
luiscuenca
ff319ebd95 Bypass position updates from mixer 2018-09-17 09:47:22 -07:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android 
Don't popup login dialog in android
 2018-09-14 16:06:03 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Anthony Thibault
b0cde2afcc Small addition to Anim Stats 
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
  * Position - in world coordinate frame.
  * Heading - the facing angle in the world corrdinate frame.
  * Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
 2018-09-14 15:05:17 -07:00
Zach Fox
9e50904376 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-14 14:36:22 -07:00
Gabriel Calero
72eeeac2ba Don't popup login dialog in android 2018-09-14 14:40:30 -03:00
sabrina-shanman
237022d304 Refactor new pick parenting system for use with RayPick, ParabolaPick 2018-09-14 10:28:15 -07:00
sam gateau
b35f09fead Address review comments 2018-09-14 08:43:35 -07:00
SamGondelman
c522d1bc93 merge with master 2018-09-14 00:57:13 -07:00
Sam Gateau
eccca053f9 Clean changes 2018-09-13 23:58:40 -07:00
Sam Gateau
1438643a5f Adding extra sanity checks on all time dependant values to avoid bad behavior maybe 2018-09-13 23:48:50 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
luiscuenca
c5669ef1f5 better property names 2018-09-13 15:22:18 -07:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor 
Fixing Error State for Timeout/localhost Redirection
 2018-09-13 15:19:55 -07:00
luiscuenca
6a9a898b62 make updateCollisionCapsule private 2018-09-13 15:07:34 -07:00
luiscuenca
ceccc6d6ec make getCollisionCapsule thread safe 2018-09-13 14:49:35 -07:00
John Conklin II
8e5f2d0e08
Merge pull request #13983 from danteruiz/disable-interstitial 
disable interstitial by default and fix crash
 2018-09-13 14:01:28 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling 
Performance improvements for Avatar Mixer
 2018-09-13 13:43:18 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
Dante Ruiz
dca34c7cbe remove warning for GCC 2018-09-13 08:32:47 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
Dante Ruiz
d76a2c1add disable interstitial by default and fix crash 2018-09-12 15:31:03 -07:00
Gabriel Calero
2943502c9b Headset plug/unplug detection 2018-09-12 16:36:04 -03:00
Stephen Birarda
b1f44d2ad7 perform avatar entity cleanup in AvatarManager::handleRemovedAvatar 2018-09-12 12:30:15 -07:00
luiscuenca
fa3c6932c6 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-12 11:47:18 -07:00
sabrina-shanman
d2c41f02e5 Avoid unnecessary type conversion in CollisionPick::getHUDIntersection 2018-09-12 10:36:00 -07:00
sabrina-shanman
87b5605d69 Add normalOnPick to CollisionPickResult 2018-09-12 10:36:00 -07:00
luiscuenca
b9fbcce403 init frames per meter 2018-09-12 10:15:00 -07:00
luiscuenca
4d381b9d04 Smooth other avatars positions 2018-09-12 10:01:41 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
30e9d57026 adding pattern for during timeout to put into error state 2018-09-11 18:52:28 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb 
Avatar loading orb now indicates loading status
 2018-09-11 18:01:40 -07:00
Wayne Chen
2267085dbf
removing unused counter variable 2018-09-11 17:46:01 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch 
Pop up login dialog on launch
 2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Wayne Chen
84f95dd4b8
updating typo 2018-09-11 17:03:06 -07:00
Wayne Chen
d4dfaec8ea
updating typo 2018-09-11 17:02:38 -07:00
Wayne Chen
d478fcf027
remove unused signal from domain handler 2018-09-11 17:01:14 -07:00
Wayne Chen
9ee21c9956
removing virtual keyword from destructor 2018-09-11 16:49:11 -07:00
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars 
handle agent avatar clear on avatar mixer disconnect
 2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged 
making requested changes and fixing compile issue for jenkins
 2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908 expose domain connection error to Window 2018-09-11 16:29:39 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Anthony Thibault
23ed314250 Fix for missing return warning 2018-09-11 14:50:50 -07:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Anthony Thibault
bc5d9a46a2 Avatar loading orb now indicates status 
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
 2018-09-11 13:12:46 -07:00
Wayne Chen
e7aef92e99 fixing logout bug from syntax reversion 2018-09-11 12:51:51 -07:00
luiscuenca
fedea6e84d Comply with review comments 2018-09-11 12:23:25 -07:00
Wayne Chen
d69e536120 Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch 2018-09-11 12:18:36 -07:00
Dante Ruiz
cc2c208b12 fix small issue 2018-09-11 12:12:31 -07:00
Dante Ruiz
735ff04fad fixing merge conflicts 2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d first round of requested changes 2018-09-11 12:01:55 -07:00