Commit graph

67960 commits

Author SHA1 Message Date
Dante Ruiz
82422edb59 fixinig the controller settings page and have menu option on by default 2018-05-14 18:51:39 -07:00
Zach Fox
a54ce96ac2 Clement's CR 2018-05-14 17:46:58 -07:00
Zach Fox
e607c68bea Thanks Mukul! 2018-05-14 16:48:40 -07:00
David Rowe
9040e45be7 RayPick API JSDoc stubs 2018-05-15 11:43:49 +12:00
NissimHadar
d4d2f3c957 Moved ownership of test location into the Test Scripting class. 2018-05-14 16:32:04 -07:00
NissimHadar
8e3844a235 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 16:23:36 -07:00
David Rowe
36752ee701 PickType API JSDoc fix up 2018-05-15 11:23:29 +12:00
David Rowe
3fb6fd1afb Picks API JSDoc stubs 2018-05-15 11:22:47 +12:00
Zach Fox
e15a800639
Merge pull request #13166 from zfox23/showInvalidItemsInPurchases
Show invalidated items in My Purchases
2018-05-14 15:42:29 -07:00
David Rowe
8ea3a733ca Resource API JSDoc stub 2018-05-15 10:32:36 +12:00
Zach Fox
0c76659324 Starting changes per Mukul! 2018-05-14 15:28:53 -07:00
Simon Walton
454978a9c2 Add more locking of _conicalViews vector 2018-05-14 15:15:58 -07:00
Zach Fox
43254e2981 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-14 15:12:44 -07:00
Howard Stearns
d7121265d0
Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal
fix lastEdited vs pal
2018-05-14 15:12:07 -07:00
Thijs Wenker
50f76dd4df added more missing globals 2018-05-15 00:11:34 +02:00
David Rowe
a1de44310f tabletInterface API JSDoc 2018-05-15 10:02:38 +12:00
vladest
2a3004079e About UI 2018-05-14 23:22:06 +02:00
Anthony J. Thibault
ed726c9d77 OpenVR: Remove reference to HMD Standing Mode menu item
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
2018-05-14 13:51:13 -07:00
John Conklin II
c57b0a957d
Merge pull request #13138 from AndrewMeadows/avoid-div-by-zero
avoid div by zero when measuring RigidBody effective acceleration
2018-05-14 13:41:08 -07:00
Zach Fox
83cae54601 Show 'invalidated' label for valid = false 2018-05-14 13:34:20 -07:00
Zach Fox
fbec285923 Merge branch 'master' of github.com:highfidelity/hifi into showInvalidItemsInPurchases 2018-05-14 13:17:46 -07:00
Zach Fox
a881d07e59 MS15090: Fix gifting when running marketplaces.js separately 2018-05-14 13:12:58 -07:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
2018-05-14 13:00:15 -07:00
David Back
ac78e14585 fix unequipping with capital U 2018-05-14 11:44:25 -07:00
Cristian Luis Duarte
e7abf3c7be Android - Display Names - Use my avatar uuid directly when finding ray intersection 2018-05-14 15:26:57 -03:00
Thijs Wenker
20fb9034f8 no magic numbers, except -1, 0, 1 2018-05-14 20:11:55 +02:00
NissimHadar
b5096758fb Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 10:44:57 -07:00
Cristian Luis Duarte
97a493d113 Android - Delay workaround to avoid joystick/controls issues 2018-05-14 14:41:31 -03:00
Sam Gateau
d57ddbd3bf
Merge pull request #13139 from NissimHadar/missingImagesMDfiles
Autotester: Now remembers the previous folder.
2018-05-14 10:40:00 -07:00
NissimHadar
5f219e27f7 Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1 2018-05-14 10:35:48 -07:00
Andrew Meadows
a30e06d594 don't blend avatar position when far from target 2018-05-14 09:58:16 -07:00
Zach Fox
2a1c2ba7b1 PurchasedItem logic 2018-05-14 09:54:05 -07:00
Zach Fox
81ebb681bb Show invalidated items in My Purchases 2018-05-14 09:35:34 -07:00
NissimHadar
a9a783588b Fixed typo. 2018-05-14 09:25:17 -07:00
NissimHadar
e69871f499 Merge branch 'master' of github.com:highfidelity/hifi into missingImagesMDfiles 2018-05-14 09:23:38 -07:00
David Rowe
77021f3236 Fix up Stats JSDoc 2018-05-14 17:32:18 +12:00
David Rowe
d0596f8205 Fix Wallet JSDoc stubs 2018-05-14 10:43:55 +12:00
David Rowe
c97d7c9d73 Expand and fix ToolbarProxy and ToolbarButtonProxy JSDoc stubs 2018-05-14 10:43:38 +12:00
David Rowe
71355840b9 Expand OverlayWindow and OverlayWebWindow JSDoc stubs 2018-05-14 09:57:35 +12:00
David Rowe
cad5b3fb15 Expand AudioEffectOptions JSDoc stubs 2018-05-14 09:28:50 +12:00
David Rowe
5378d64913 Remove erroneously added function declarations 2018-05-13 18:06:30 +12:00
David Rowe
9fdce4df65 OverlayWindow and OverlayWebWindow API JSDoc stubs 2018-05-13 16:38:38 +12:00
David Rowe
7cef329939 Render API JSDoc stubs 2018-05-13 11:53:57 +12:00
David Rowe
176dbb5557 Wallet API JSDoc stubs 2018-05-13 11:02:09 +12:00
David Rowe
46ebb0457e Toolbars API JSDoc stubs 2018-05-13 10:56:21 +12:00
David Rowe
fb1f7fea90 Steam API JSDoc stubs 2018-05-13 10:32:46 +12:00
vladest
f8ebe7e669 remoed no more used LOD dialogs. Fixed Slider properties min and max settings 2018-05-12 16:01:43 +02:00
vladest
0a67fc3b36 Merge conflicts 2018-05-12 11:24:35 +02:00
David Rowe
81a621890a Stats API JSDoc stubs 2018-05-12 18:01:55 +12:00
David Rowe
74617822fa Snapshot API JSDoc stubs 2018-05-12 16:32:33 +12:00