David Rowe
|
e2ae50362e
|
Add missing JSDoc of Window.interstitialModeEnabled property
|
2018-10-26 19:21:58 +13:00 |
|
Jeff Clinton
|
eb383b1d09
|
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
Quality Improvements to Avatars driven by Vive Trackers
|
2018-10-25 08:51:59 -07:00 |
|
Seth Alves
|
b9f8c59f61
|
Merge pull request #13904 from alexiamandeville/menu-updates
Resorting Developer menu organization
|
2018-10-24 19:41:22 -07:00 |
|
John Conklin II
|
7db7131ef4
|
Merge pull request #14172 from dback2/entityPropertiesRefactor
Entity properties refactor / reorder and merge particle explorer into properties
|
2018-10-24 17:39:17 -07:00 |
|
Jeff Clinton
|
67fe43ebb1
|
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
Small avatars now have a minimum jump height of 0.25 meters
|
2018-10-24 17:08:28 -07:00 |
|
David Back
|
b3e0d51260
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
|
2018-10-24 11:48:56 -07:00 |
|
Luis Cuenca
|
fac9188dfb
|
Merge pull request #14187 from luiscuenca/transitAddAnimation
Add animations to Avatar Transit
|
2018-10-24 10:51:21 -07:00 |
|
Gabriel Calero
|
28c062b842
|
Don't show stats in release builds
|
2018-10-24 11:57:59 -03:00 |
|
unknown
|
06aff231a3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
|
2018-10-23 20:19:06 -07:00 |
|
John Conklin II
|
e21e7d30d7
|
Merge pull request #14126 from amantley/squattyPottyFix
Sit State for the seated user in HMD: Squatty Potty Fix
|
2018-10-23 15:20:49 -07:00 |
|
Kerry Ivan Kurian
|
3cf000a71b
|
Merge pull request #14232 from kkurian/log-resource-requests-2
Display resource-access events in marketplace item tester
|
2018-10-23 15:18:30 -07:00 |
|
Stephen Birarda
|
b789fa96f8
|
Merge pull request #14192 from Atlante45/fix/traits-race
Prevent race on internal client traits members
|
2018-10-23 14:53:11 -07:00 |
|
Alexia Mandeville
|
68ab5475fe
|
Remove duplicate display crash options
|
2018-10-23 14:13:09 -07:00 |
|
Kerry Ivan Kurian
|
e7d1c2873a
|
Merge branch 'master' into log-resource-requests-2
|
2018-10-23 13:46:59 -07:00 |
|
amantley
|
2df9d6c5e9
|
addressed missing changes for luis
|
2018-10-23 13:37:56 -07:00 |
|
David Back
|
9df8ea35bb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
|
2018-10-23 13:28:35 -07:00 |
|
tapalisa
|
7a684081f0
|
Merge pull request #14235 from huffman/feat/edit-copy-paste
Add copy/paste functionality to edit.js
|
2018-10-23 13:18:12 -07:00 |
|
Alexia Mandeville
|
178b8ef37b
|
Removed duplicate menu items
Removed duplicates:
Console...
API Debugger
|
2018-10-23 12:55:02 -07:00 |
|
amantley
|
9bc92cb2a3
|
removed leftover triggers
|
2018-10-23 12:29:04 -07:00 |
|
luiscuenca
|
fa67e1b269
|
Remove logs and magic numbers
|
2018-10-23 11:51:15 -07:00 |
|
amantley
|
0d39343be4
|
changed if statement to switch in preferencesDialog.cpp, also removed print statement
|
2018-10-23 11:19:47 -07:00 |
|
Brad Hefta-Gaub
|
405b1d5725
|
Revert "Better imports for controls and styles"
|
2018-10-23 10:58:28 -07:00 |
|
amantley
|
39a16703e4
|
updated wording for the radio buttons for avatar leaning model
|
2018-10-23 10:52:14 -07:00 |
|
amantley
|
3e8663f8e9
|
removed the dropdown from the avatar app, because it is in settings controls now
|
2018-10-22 22:31:26 -07:00 |
|
amantley
|
8cb09c37ee
|
changed the ui to the settings/controls
|
2018-10-22 21:26:30 -07:00 |
|
amantley
|
472ab1c613
|
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
|
2018-10-22 17:50:56 -07:00 |
|
amantley
|
cce2f295a1
|
fixed conflict in myskeletonmodel.cpp
|
2018-10-22 17:49:30 -07:00 |
|
Alexia Mandeville
|
3cc78896ac
|
Removed duplicate speech control menu item
|
2018-10-22 15:39:23 -07:00 |
|
David Back
|
e8bda1793f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
|
2018-10-22 15:12:45 -07:00 |
|
Zach Fox
|
1023e6d2b9
|
Fix ClipboardScriptingInterface:
|
2018-10-22 14:00:04 -07:00 |
|
Zach Fox
|
f9cc4f5a69
|
Count unique source and url pairs
|
2018-10-22 14:00:01 -07:00 |
|
Zach Fox
|
de93bbb08b
|
Only show unique resources
|
2018-10-22 13:59:59 -07:00 |
|
Zach Fox
|
d44f9e2ccc
|
Tons of improvements
|
2018-10-22 13:59:57 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
55c1a88404
|
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
|
2018-10-22 13:59:50 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Ryan Huffman
|
9cc2add4a0
|
Add copy/paste functionality to edit.js
|
2018-10-22 13:56:07 -07:00 |
|
John Conklin II
|
e40a021339
|
Merge pull request #13401 from ElderOrb/better_imports_for_controls_and_styles
Better imports for controls and styles
|
2018-10-22 11:50:09 -07:00 |
|
John Conklin II
|
bd480bab80
|
Merge pull request #14226 from Atlante45/fix/octree-scene-stats
Only track stats for compatible packets
|
2018-10-22 11:45:16 -07:00 |
|
John Conklin II
|
b3698388ea
|
Merge pull request #14245 from huffman/feat/default-grabbable-setting
Add a 'grabbable' option to the new-model dialog
|
2018-10-22 11:42:40 -07:00 |
|
Stephen Birarda
|
3c79a79487
|
Merge pull request #14163 from Atlante45/fix/bw-recorder
Fix crash with BandwidthRecorder
|
2018-10-22 10:11:26 -07:00 |
|
amantley
|
eb3db9a571
|
added default to case statement
|
2018-10-20 16:13:41 -07:00 |
|
Luis Cuenca
|
e1c760b566
|
Merge branch 'master' into transitAddAnimation
|
2018-10-20 15:30:23 -07:00 |
|
luiscuenca
|
f8d67d124f
|
Hold flickering fixed and refactor
|
2018-10-20 15:22:25 -07:00 |
|
amantley
|
e693275b10
|
Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix
|
2018-10-20 13:42:23 -07:00 |
|
amantley
|
5efb889de5
|
removed unused variables
|
2018-10-20 13:42:17 -07:00 |
|
Seth Alves
|
2ce8ed25f8
|
Merge pull request #14125 from Atlante45/fix/mac-warnings
Fix new Mac warnings
|
2018-10-20 13:40:53 -07:00 |
|
amantley
|
dfdc6aee7e
|
Merge branch 'master' into squattyPottyFix
|
2018-10-20 13:39:55 -07:00 |
|
Brad Hefta-Gaub
|
23ddb7dea6
|
Merge pull request #14207 from Atlante45/fix/white-spheres
Remove pending avatars data structure
|
2018-10-20 12:09:51 -07:00 |
|
Ryan Huffman
|
9d13902cd3
|
Improve paramater names in model dialog window
|
2018-10-20 11:26:12 -07:00 |
|