David Rowe
|
87ff6dd56d
|
Fix play area sizing and positioning for different base avatar sizes
|
2018-10-02 10:53:31 +13:00 |
|
David Rowe
|
6ccd73ea47
|
Merge branch 'master' into M18586
|
2018-10-02 10:17:24 +13:00 |
|
David Rowe
|
7560a2a923
|
Short circuit unnecessary repetition
|
2018-09-29 16:00:44 +12:00 |
|
David Rowe
|
9dfbaa9201
|
Remove "Reset Sensors" button from Settings > Controls
|
2018-09-29 14:17:55 +12:00 |
|
John Conklin II
|
130e8dfbe9
|
Merge pull request #14023 from dback2/selectEntityEveryFrameFix
Only call selectEntity once triggered when using edit handles
|
2018-09-28 16:38:10 -07:00 |
|
John Conklin II
|
1135228b3b
|
Merge pull request #14095 from kencooke/audio-hrtf-reset
Audio-mixer optimizations
|
2018-09-28 16:34:38 -07:00 |
|
John Conklin II
|
789062d0b9
|
Merge pull request #14103 from howard-stearns/shorter-handshake
minimal time handshake
|
2018-09-28 16:29:38 -07:00 |
|
John Conklin II
|
11492ce8ee
|
Merge pull request #14045 from sethalves/enterEntity-wait-for-script
don't call enterEntity before the entity's script is loaded
|
2018-09-28 16:07:08 -07:00 |
|
John Conklin II
|
5d00aa0bdb
|
Merge pull request #14009 from sethalves/fix-worn-shape-double-scale
fix scaling of worn shape entities
|
2018-09-28 13:08:46 -07:00 |
|
John Conklin II
|
b4abaabe5e
|
Merge pull request #14107 from kkurian/hotfix-marketplace-item-tester
Fix application uninstall in marketplace item tester
|
2018-09-28 12:58:33 -07:00 |
|
David Rowe
|
1c4bde3e84
|
Fix build warnings
|
2018-09-28 18:38:38 +12:00 |
|
Kerry Ivan Kurian
|
440e2062f5
|
Fix application uninstall in marketplace item tester
|
2018-09-27 22:14:02 -07:00 |
|
David Rowe
|
545c2591e3
|
Merge branch 'master' into M18586
|
2018-09-28 16:19:44 +12:00 |
|
David Rowe
|
7f518d0aa1
|
Make teleport parabolas semi-transparent
|
2018-09-28 16:13:25 +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
|
868a3a9219
|
Tweak vertical spacing
|
2018-09-28 15:42:48 +12:00 |
|
John Conklin II
|
cd18578061
|
Merge pull request #14002 from roxanneskelly/sysTray
Tray Notifier updates
|
2018-09-27 18:08:25 -07:00 |
|
David Rowe
|
4813f4d042
|
Show/hide jumping & flying checkbox depending on movement mode
|
2018-09-28 13:02:27 +12:00 |
|
Howard Stearns
|
f96c7f4db4
|
minimal time handshake
|
2018-09-27 17:05:18 -07:00 |
|
Roxanne Skelly
|
eec565e7f4
|
Revert "Checkpoint sysTray Installer"
This reverts commit 7257a99414.
|
2018-09-27 12:58:33 -07:00 |
|
Roxanne Skelly
|
af6db93b70
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
|
2018-09-27 12:05:21 -07:00 |
|
Roxanne Skelly
|
330789471d
|
Fix merge conflict and set proper polling times
|
2018-09-27 12:03:37 -07:00 |
|
John Conklin II
|
0b185c6890
|
Merge pull request #14031 from zfox23/notificationsForFourApps
Discovery Notifications Project: Notifications for PEOPLE, WALLET, MARKET, and GOTO
|
2018-09-27 11:34:05 -07:00 |
|
David Rowe
|
5ab22a1f40
|
Change play area option text for Oculus
|
2018-09-27 17:07:42 +12:00 |
|
David Rowe
|
3284b2a90e
|
Immediately hide fading overlays if other hand starts teleporting
|
2018-09-27 15:20:43 +12:00 |
|
David Rowe
|
6ae206677d
|
Add Settings > Controls option for displaying play area
|
2018-09-27 14:55:53 +12:00 |
|
David Rowe
|
b9c6811fdc
|
Restructure post-teleport fading code
|
2018-09-27 14:44:30 +12:00 |
|
Ken Cooke
|
9dc0aa5c8d
|
HRTF starts in silent state
|
2018-09-26 18:23:26 -07:00 |
|
Ken Cooke
|
a8f7ff7d8a
|
Add HRTF reset()
|
2018-09-26 18:18:20 -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 |
|
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 |
|
Zach Fox
|
6a3fa28fad
|
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
|
2018-09-26 15:12:04 -07:00 |
|
John Conklin II
|
b02e2c8123
|
Merge pull request #14081 from SamGondelman/blendshapes
Improve ModelBlender queuing
|
2018-09-26 15:10:02 -07:00 |
|
Zach Fox
|
9a21354c27
|
Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps
|
2018-09-26 15:08:20 -07:00 |
|
Zach Fox
|
6877af04f1
|
Fix GOTO notifs; fix WALLET notifs (pending backend change)
|
2018-09-26 14:57:32 -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 |
|
John Conklin II
|
6c47ba0dc7
|
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
Use C++ chrono system_clock for timestamps
|
2018-09-26 11:22:49 -07:00 |
|
John Conklin II
|
d1771b2928
|
Merge pull request #14058 from danteruiz/fix-dispacther-module-order
fix equip while keeping new functionality
|
2018-09-26 11:06:45 -07:00 |
|
Roxanne Skelly
|
7257a99414
|
Checkpoint sysTray Installer
|
2018-09-26 10:46:19 -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 |
|
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 |
|
David Rowe
|
496e0a6304
|
Update teleport FBX models
|
2018-09-26 17:20:56 +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 |
|
Kerry Ivan Kurian
|
28ec98be9e
|
Uninstall marketplace item tester on wallet shutdown
|
2018-09-25 19:24:46 -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
|
3d71dfc467
|
Merge pull request #14072 from SamGondelman/highlight
Fix avatar highlighting
|
2018-09-25 16:13:14 -07:00 |
|
Kerry Ivan Kurian
|
e6249e690e
|
Remove duplicate line
|
2018-09-25 15:52:26 -07:00 |
|