Nissim Hadar
|
f742ab7952
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-05 23:14:51 -08:00 |
|
Nissim Hadar
|
9e5eba4d3a
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-05 23:11:40 -08:00 |
|
Bruce Brown
|
f233c93aaa
|
Requested updates
|
2018-01-05 19:50:16 -08:00 |
|
David Rowe
|
673bc7de38
|
Update Window JSDoc
|
2018-01-06 16:05:55 +13:00 |
|
Liv Erickson
|
4e582975b6
|
cleanup
|
2018-01-05 18:03:20 -08:00 |
|
Liv Erickson
|
f563b8ca2e
|
Make zones and lights not default grabbable
|
2018-01-05 17:49:43 -08:00 |
|
Anthony Thibault
|
1a97d1de0f
|
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter
Added exponential smoothing filter for vive pucks.
|
2018-01-05 16:50:55 -08:00 |
|
Anthony J. Thibault
|
243dcb88ee
|
Bug fix for sit script.
|
2018-01-05 16:20:44 -08:00 |
|
Zach Fox
|
0c38a5598f
|
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection
Fix bugs related to inspecting entities with hand controllers
|
2018-01-05 15:50:00 -08:00 |
|
luiscuenca
|
4f6a804fd1
|
Fix magic numbers
|
2018-01-05 16:27:48 -07:00 |
|
Andrew Meadows
|
4745a0e32d
|
Merge pull request #12093 from AndrewMeadows/simulation-ownership-004
more stable simulation ownership for system of constraints
|
2018-01-05 14:17:53 -08:00 |
|
Andrew Meadows
|
b28684f15e
|
Merge pull request #12087 from ctrlaltdavid/21661
Laser auto-on with tablet and Web overlays
|
2018-01-05 14:08:01 -08:00 |
|
samcake
|
5a5d475c6c
|
Reinstall the packing of the qrc in the executable in DEV_build
|
2018-01-05 14:03:52 -08:00 |
|
Brad Hefta-Gaub
|
aebd098e6e
|
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting
WL#21654: Make the Asset Browser Sort Case Insensitive
|
2018-01-05 13:34:39 -08:00 |
|
Brad Hefta-Gaub
|
7a3835eb33
|
Merge pull request #11945 from jherico/android_nov
Updating android toolchain for QML
|
2018-01-05 13:34:03 -08:00 |
|
Brad Hefta-Gaub
|
6a3609093d
|
Merge pull request #12051 from dback2/polyobjimportfixes
Poly obj import fixes
|
2018-01-05 13:33:29 -08:00 |
|
Seth Alves
|
3cd0ec3336
|
default run speed is faster, advanced movement on by default
|
2018-01-05 13:20:41 -08:00 |
|
Nissim Hadar
|
d645163294
|
Fixed gcc warning.
|
2018-01-05 13:16:02 -08:00 |
|
Nissim Hadar
|
635fd2d0cf
|
Use older C++ version for Ubuntu
|
2018-01-05 12:48:21 -08:00 |
|
Seth Alves
|
487dab641f
|
Merge pull request #12090 from AndrewMeadows/simulation-ownership-003
more stable simulation ownership
|
2018-01-05 12:27:52 -08:00 |
|
samcake
|
4fc8a8ea08
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2018-01-05 12:27:41 -08:00 |
|
Sam Gateau
|
91eb718074
|
Merge pull request #12091 from SamGondelman/overlayFix
Update model render items on texture load and fix no haze issue
|
2018-01-05 12:26:56 -08:00 |
|
Nissim Hadar
|
3963c0a5a1
|
Code review improvements.
|
2018-01-05 12:22:20 -08:00 |
|
samcake
|
daa9136b34
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2018-01-05 11:50:35 -08:00 |
|
David Back
|
ac1c398b9d
|
Merge pull request #11669 from dback2/mergeAccountGlobalServices
merge AccountScriptingInterface into GlobalServicesScriptingInterface
|
2018-01-05 11:34:53 -08:00 |
|
David Rowe
|
5431b7137b
|
Code review
|
2018-01-06 08:27:24 +13:00 |
|
luiscuenca
|
d0bc881bb2
|
Load script manually
|
2018-01-05 12:20:41 -07:00 |
|
Nissim Hadar
|
820d80eaad
|
Reverted auto-tester.
|
2018-01-05 11:20:20 -08:00 |
|
David Back
|
76f278f899
|
Merge branch 'master' into mergeAccountGlobalServices
|
2018-01-05 10:56:12 -08:00 |
|
David Back
|
b165eac6a0
|
Merge branch 'master' into mergeAccountGlobalServices
|
2018-01-05 10:54:59 -08:00 |
|
Melissa Brown
|
933720fb10
|
Merge pull request #12012 from Delanir/Case10633
Cases 10632 and 10633 Particle Explorer UI
|
2018-01-05 10:46:41 -08:00 |
|
Melissa Brown
|
eb83c68d46
|
Merge pull request #12094 from ctrlaltdavid/resolution-removed
Delete web3d overlay "resolution" property JSDoc
|
2018-01-05 10:38:07 -08:00 |
|
vladest
|
02972c92f0
|
Merge branch 'master' into tablet_pagination_magnify
|
2018-01-05 19:12:13 +01:00 |
|
Seth Alves
|
2071d42d25
|
Merge pull request #12088 from ElderOrb/FB11008
11008 GoTo app does not focus on address bar when opened
|
2018-01-05 10:07:36 -08:00 |
|
Andrew Meadows
|
c33c637f07
|
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
|
2018-01-05 09:07:54 -08:00 |
|
luiscuenca
|
108748ca96
|
smooth transitions and slower back to default
|
2018-01-05 09:55:50 -07:00 |
|
Ryan Downe Karpf
|
a3245aec57
|
Merge pull request #12079 from RebeccaStankus/log-filtering
Log filtering
|
2018-01-05 08:40:41 -08:00 |
|
Seth Alves
|
fd8b521c50
|
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)
|
2018-01-05 08:15:48 -08:00 |
|
Alexander Ivash
|
437b78dce5
|
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
|
2018-01-05 13:35:19 +03:00 |
|
Olivier Prat
|
413ea99916
|
Merge branch 'master' of git://github.com/highfidelity/hifi into roughness_metal
|
2018-01-05 08:30:26 +01:00 |
|
Sam Gondelman
|
5cf25a20c9
|
use correct model ptr
|
2018-01-04 21:21:58 -08:00 |
|
Nissim Hadar
|
cf7d6a2eab
|
Added correct use of legacy background combo.
|
2018-01-04 20:30:10 -08:00 |
|
David Rowe
|
5463f1ae6b
|
Merge branch 'master' into 21646
|
2018-01-05 16:58:58 +13:00 |
|
Nissim Hadar
|
033aa11aa2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-04 19:48:41 -08:00 |
|
David Rowe
|
d6a0457ee5
|
Delete web3d overlay "resolution" property JSDoc
|
2018-01-05 16:48:37 +13:00 |
|
Nissim Hadar
|
c10d2a5461
|
Added correct use of legacy background combo.
|
2018-01-04 19:48:25 -08:00 |
|
David Rowe
|
69dff9ac09
|
Remove unused code
|
2018-01-05 16:16:55 +13:00 |
|
David Rowe
|
4b2ed44322
|
Reduce incidence of tablet screen being rotated w.r.t. model
|
2018-01-05 16:16:42 +13:00 |
|
David Rowe
|
936b5f3571
|
Laser on tablet bezel as well as screen and "x" button
|
2018-01-05 16:15:59 +13:00 |
|
Bruce Brown
|
7476de60ce
|
Merge branch 'master' of https://github.com/1st-BrainStormer/hifi
|
2018-01-04 18:44:08 -08:00 |
|