anshuman64
|
defc76c9cf
|
Merge pull request #11075 from jherico/tablet_scripting_crash
Fix tablet button crash
|
2017-07-28 11:57:27 -07:00 |
|
Brad Davis
|
3d0c13915a
|
Fix tablet button crash
|
2017-07-28 11:20:57 -07:00 |
|
Andrew Meadows
|
d4e72df928
|
Merge pull request #10711 from burtsloane/midi
Midi support for Entities
|
2017-07-28 10:51:43 -07:00 |
|
utkarshgautamnyu
|
f407bf6f5a
|
Merge pull request #11064 from highfidelity/bug/6513
Enabled multiple selection and deletion in Asset Browser
|
2017-07-28 09:46:34 -07:00 |
|
Chris Collins
|
20513ccf83
|
Merge pull request #11069 from jherico/overlay_deadlocks
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
|
2017-07-28 09:25:26 -07:00 |
|
Brad Hefta-Gaub
|
3e1174a4ca
|
Merge pull request #11070 from kencooke/master
Merge pull request #10987 from SamGondelman/hmd59Crash2
|
2017-07-28 08:27:28 -07:00 |
|
Chris Collins
|
4684b388c7
|
Merge pull request #10987 from SamGondelman/hmd59Crash2
Fix crash when putting on HMD for Qt 5.9
|
2017-07-28 07:41:07 -07:00 |
|
Brad Davis
|
bb57504498
|
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
|
2017-07-27 19:39:22 -07:00 |
|
Brad Hefta-Gaub
|
d572510770
|
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
update EntityItem bounding cube when on changed dimensions
|
2017-07-27 18:21:06 -07:00 |
|
Andrew Meadows
|
6b386000db
|
initialize 'success' and use for return value
|
2017-07-27 17:11:13 -07:00 |
|
burtsloane
|
e557f759b5
|
Update Midi.cpp
|
2017-07-27 16:17:23 -07:00 |
|
utkarshgautamnyu
|
1beec26003
|
Update TabletAssetServer.qml
|
2017-07-27 15:55:55 -07:00 |
|
utkarshgautamnyu
|
a6a4bd5923
|
Update AssetServer.qml
|
2017-07-27 15:55:30 -07:00 |
|
utkarshgautamnyu
|
07fc9a6dc3
|
Indentation fixes
|
2017-07-27 14:53:49 -07:00 |
|
utkarshgautamnyu
|
4680911264
|
Enabled multiple selection and multiple deletion in asset browser
|
2017-07-27 14:47:30 -07:00 |
|
Brad Hefta-Gaub
|
9b3be6d164
|
Merge pull request #10808 from humbletim/21400
WL 21400 -- Setting that lets you switch from cursor to reticle
|
2017-07-27 13:16:58 -07:00 |
|
Brad Hefta-Gaub
|
3aca1e1d84
|
Merge pull request #11004 from highfidelity/express_custom_install
Added a page in installer for express/custom installation
|
2017-07-27 13:14:56 -07:00 |
|
anshuman64
|
bcb819206b
|
Merge pull request #11037 from sethalves/bug-camera-mode-mods
use Qt menu hotkeys to drive camera-mode changes
|
2017-07-27 09:44:53 -07:00 |
|
Chris Collins
|
ef67029837
|
Merge pull request #10912 from amvmoody/21374
WL 21374: Allow lights/particles to be dragged by icon
|
2017-07-26 22:07:36 -07:00 |
|
Chris Collins
|
853101fcbc
|
Merge pull request #10928 from 1P-Cusack/21362
Add point and thumb up gestures to the Vive.
|
2017-07-26 22:07:14 -07:00 |
|
anshuman64
|
2e7f62cbb3
|
Merge pull request #11058 from nimisha20/patch-1
Update BUILD_WIN.md
|
2017-07-26 17:50:33 -07:00 |
|
anshuman64
|
560cccb0df
|
Remove nmake troubleshooting step
|
2017-07-26 17:01:45 -07:00 |
|
anshuman64
|
081d8fbec4
|
More changes
|
2017-07-26 17:00:48 -07:00 |
|
nimisha20
|
c57660c82d
|
Update BUILD_WIN.md
|
2017-07-26 16:52:00 -07:00 |
|
Stephen Birarda
|
c6e640eba8
|
Merge pull request #11052 from highfidelity/bug/2157
added additional collision types to asset browser and new model dialog
|
2017-07-26 16:51:52 -07:00 |
|
Seth Alves
|
9c9cfad4c4
|
use ctrl rather than alt to activate camera-mode shortcuts
|
2017-07-26 15:56:08 -07:00 |
|
Seth Alves
|
71023bcb1b
|
Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods
|
2017-07-26 15:54:57 -07:00 |
|
Melissa Brown
|
e50422d5b9
|
Merge pull request #11034 from MrRoboman/21342-dart
added dart scripts
|
2017-07-26 15:10:58 -07:00 |
|
burtsloane
|
d4ae298a8d
|
Merge branch 'master' into midi
|
2017-07-26 13:59:07 -07:00 |
|
Burt Sloane
|
a960ea5ccb
|
Linux build
|
2017-07-26 13:32:23 -07:00 |
|
Burt Sloane
|
4f7243e444
|
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
|
2017-07-26 13:30:57 -07:00 |
|
utkarshgautamnyu
|
68770a9204
|
Removed conflicts
|
2017-07-26 10:23:37 -07:00 |
|
utkarshgautamnyu
|
71ddf1e7c1
|
Removed Compound Collision type
|
2017-07-26 10:20:17 -07:00 |
|
Burt Sloane
|
c777384d93
|
another comment removal
|
2017-07-26 10:00:19 -07:00 |
|
Burt Sloane
|
215fa7b816
|
removed extra comments
|
2017-07-26 09:34:46 -07:00 |
|
Burt Sloane
|
246a5c9fa4
|
1 more
|
2017-07-26 08:59:48 -07:00 |
|
Brad Hefta-Gaub
|
4a3e3cf777
|
Merge pull request #11045 from huffman/fix/skybox-not-loading
Fix bug where skybox doesn't load and physics takes a long time to engage
|
2017-07-26 08:58:28 -07:00 |
|
Burt Sloane
|
d2975c79c9
|
add midi to 3 CMakeLists.txt for linking
|
2017-07-26 08:41:26 -07:00 |
|
Burt Sloane
|
88838da6e5
|
cleaning up for mac and linux
|
2017-07-25 17:46:08 -07:00 |
|
utkarshgautamnyu
|
29e778323d
|
Update AssetServer.qml
|
2017-07-25 17:24:06 -07:00 |
|
utkarshgautamnyu
|
24f4468fd5
|
added additional collision types to asset browser in tablet mode
|
2017-07-25 17:12:13 -07:00 |
|
utkarshgautamnyu
|
65192aa620
|
added additional collision types to asset browser and new model dialog
|
2017-07-25 17:12:13 -07:00 |
|
utkarshgautamnyu
|
e5ddded464
|
Moved Express/Custom install window just after EULA window
|
2017-07-25 16:16:15 -07:00 |
|
Seth Alves
|
2f004abd81
|
Merge pull request #11050 from birarda/bug/error-decrypting
Reduce erroneous messages about username signature decryption
|
2017-07-25 16:10:02 -07:00 |
|
Stephen Birarda
|
dd3755596c
|
fix typo in comment in DomainGatekeeper header
|
2017-07-25 15:43:34 -07:00 |
|
Stephen Birarda
|
e9845784d5
|
don't return error decrypting for optimistic public keys
|
2017-07-25 15:28:05 -07:00 |
|
Brad Davis
|
8d37e54a4e
|
Merge pull request #11051 from highfidelity/qt59
Changes for Qt 5.9 warnings and build issues
|
2017-07-25 15:05:28 -07:00 |
|
Brad Davis
|
030b54542c
|
Merge pull request #11049 from jherico/qt59_temp
Move hosting for quazip back to hifi S3
|
2017-07-25 13:43:57 -07:00 |
|
Brad Davis
|
b1aa6e1962
|
Move hosting for quazip back to hifi S3
|
2017-07-25 13:43:10 -07:00 |
|
Zach Fox
|
30a571cc48
|
Merge pull request #11041 from amvmoody/wl_21472
WL 21472: restore snails ability to eat sprouts
|
2017-07-25 13:07:58 -07:00 |
|