唐鳳
|
1ec145298f
|
Update BUILD_OSX.md
Qt5.6 removed QTWebKit which hifi depends on. Before we complete the migration listed in https://wiki.qt.io/Porting_from_QtWebKit_to_QtWebEngine the build instruction need to tap into qt55 in historical brew versions.
|
2016-06-12 21:07:49 +08:00 |
|
Brad Hefta-Gaub
|
27c6df660c
|
Merge pull request #8009 from sethalves/permissions-grid
Permissions grid
|
2016-06-10 20:39:26 -07:00 |
|
Seth Alves
|
4c45d081cd
|
merge from upstream
|
2016-06-10 19:57:46 -07:00 |
|
Chris Collins
|
006eb8fe64
|
Merge pull request #8031 from birarda/api-recheck-on-fail
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
|
2016-06-10 15:26:42 -07:00 |
|
Stephen Birarda
|
3c4f336e72
|
re-instate NodeList reset on limit of check ins reached
|
2016-06-10 09:11:25 -07:00 |
|
Brad Hefta-Gaub
|
fda91677f8
|
Merge pull request #8049 from kencooke/master
Use shared CPUDetect.h for CPU detection
|
2016-06-10 08:25:27 -07:00 |
|
Brad Hefta-Gaub
|
426d67f5bf
|
Merge pull request #8038 from jherico/pure_virtual
Attempt to get better logging from pure virtual call crashes
|
2016-06-10 08:25:10 -07:00 |
|
Ken Cooke
|
dd0d594524
|
cleanup
|
2016-06-09 16:31:09 -07:00 |
|
Stephen Birarda
|
e4ebafa0d8
|
add a menu option to force the wrong DS connect version
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
12e5851ba4
|
fix connection denial message, put version back
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
f963adb5dd
|
send connection denial for connect version mismatch
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
4b5a554122
|
remove check in version downgrading from NodeList
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
c5a4a72a84
|
trigger domain API refresh from DomainHandler
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
e39c708bf6
|
require two triggers for API refresh, fix check for ICE domain
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
f59335ceff
|
don't thrash API re-check when connection denied
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
8318e9ccc8
|
Revert "additional revert related change"
This reverts commit 3119b654dc.
|
2016-06-09 15:53:19 -07:00 |
|
Stephen Birarda
|
1e9e264124
|
Revert "Revert "refresh API info during re-connect - case 570""
This reverts commit b8c80e2222.
|
2016-06-09 15:53:19 -07:00 |
|
David Rowe
|
d54247da8d
|
Format hover popups
|
2016-06-10 10:13:54 +12:00 |
|
Ken Cooke
|
d7079fce8c
|
Use shared CPUDetect.h for CPU detection
|
2016-06-09 15:07:24 -07:00 |
|
David Rowe
|
786c74d7f9
|
Vertically center table headings, reduce font size in subheadings
|
2016-06-10 08:57:52 +12:00 |
|
Seth Alves
|
441b5a20d8
|
merge from upstream
|
2016-06-09 13:23:41 -07:00 |
|
Brad Davis
|
cd7c6be590
|
Fix formatting
|
2016-06-09 12:25:21 -07:00 |
|
Brad Hefta-Gaub
|
ae9b8696d4
|
Merge pull request #8013 from zzmp/feat/add-metadata
add basic metadata to domains
|
2016-06-09 12:18:28 -07:00 |
|
Brad Hefta-Gaub
|
3c5af56421
|
Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property
Added MyAvatar.hmdLeanRecenterEnabled property
|
2016-06-09 12:17:51 -07:00 |
|
Brad Hefta-Gaub
|
020077b6cb
|
Merge pull request #8045 from ctrlaltdavid/load-dfaults-button
fix height of Load Defaults button in Running Scripts dialog
|
2016-06-09 12:06:01 -07:00 |
|
Seth Alves
|
bade215907
|
maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour
|
2016-06-09 10:41:30 -07:00 |
|
Brad Davis
|
eee1ba0906
|
trying to get buildability
|
2016-06-09 10:19:38 -07:00 |
|
Seth Alves
|
203ea5ddc7
|
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
|
2016-06-09 09:53:33 -07:00 |
|
Anthony J. Thibault
|
1aae22f5a5
|
Optimized MyAvatar.getCharacterControllerEnabled()
Instead of doing a blocking queued invokeMethod, it just calls into CharacterController.isEnabled() which is now thread-safe.
|
2016-06-09 09:35:19 -07:00 |
|
Brad Davis
|
ff8d4883b1
|
Attempt to get better logging from pure virtual call crashes
|
2016-06-08 22:35:39 -07:00 |
|
David Rowe
|
5352bd4b76
|
Fix height of Load Defaults button
|
2016-06-09 17:15:17 +12:00 |
|
Brad Hefta-Gaub
|
262e0262fc
|
Merge pull request #7889 from samcake/color
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
|
2016-06-08 17:38:45 -07:00 |
|
Zach Pomerantz
|
9926c80917
|
Only check user metadata before sending
|
2016-06-08 18:45:01 -05:00 |
|
Brad Hefta-Gaub
|
fc5214c938
|
Merge pull request #8033 from SamGondelman/xboxFix
Game pads work after falling asleep and being reactivated
|
2016-06-08 16:27:26 -07:00 |
|
Brad Hefta-Gaub
|
8434aa9416
|
Merge pull request #8027 from SamGondelman/exposeHaptics
Expose haptics to JS
|
2016-06-08 16:17:04 -07:00 |
|
Anthony Thibault
|
05ca715074
|
Merge pull request #7974 from hyperlogic/tony/daz3d-model-fix
Fix for models exported from Daz3D.
|
2016-06-08 15:44:50 -07:00 |
|
Brad Hefta-Gaub
|
69ae33ad9a
|
Merge pull request #7997 from SamGondelman/touchFixes
Corrected Oculus Touch coordinate system so that hands track properly
|
2016-06-08 15:39:17 -07:00 |
|
Brad Hefta-Gaub
|
4e418f328f
|
Merge pull request #7924 from imgntn/moreshelfstuff
[Home] Add More Content
|
2016-06-08 13:53:26 -07:00 |
|
James B. Pollack
|
65e2cdbbf3
|
clear dead code
|
2016-06-08 13:44:53 -07:00 |
|
Brad Hefta-Gaub
|
0df72548f8
|
Merge pull request #8024 from kencooke/audio-src-avx2
AVX2 optimized audio resampler
|
2016-06-08 12:43:52 -07:00 |
|
Seth Alves
|
1977efae4f
|
Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid
|
2016-06-08 10:36:52 -07:00 |
|
Seth Alves
|
8085266c1d
|
cause names in permissions tables to be alpha-sorted
|
2016-06-08 10:36:44 -07:00 |
|
Brad Hefta-Gaub
|
d0e946c907
|
Merge pull request #8034 from ctrlaltdavid/20953
fix colors of buttons in Asset Browser dialog
|
2016-06-08 07:47:34 -07:00 |
|
Brad Hefta-Gaub
|
338557358d
|
Merge pull request #8035 from Atlante45/master
Fix OS X warning
|
2016-06-07 18:17:58 -07:00 |
|
Brad Hefta-Gaub
|
80100b1d34
|
Merge pull request #8000 from Atlante45/feat/plugins
Select/Disable plugins via command line args
|
2016-06-07 18:17:29 -07:00 |
|
SamGondelman
|
2c1d20bd1a
|
removed _deviceCounts, cache joystick available inputs, added deadzone to gamepad thumbsticks
|
2016-06-07 17:12:24 -07:00 |
|
Brad Hefta-Gaub
|
9a0076d4f1
|
Merge pull request #8028 from ctrlaltdavid/20949
add "Load Defaults" button to Running Scripts dialog
|
2016-06-07 17:09:29 -07:00 |
|
Brad Hefta-Gaub
|
6603289de9
|
Merge pull request #8029 from SamGondelman/constantTurn
Fixed constant turn of 22.5 degrees in comfort mode
|
2016-06-07 17:09:07 -07:00 |
|
Anthony J. Thibault
|
30d8ae36e8
|
Added MyAvatar.characterControllerEnabled property
|
2016-06-07 16:55:32 -07:00 |
|
Atlante45
|
71fb0e665f
|
Fix OSX warning
|
2016-06-07 16:46:32 -07:00 |
|