Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 08:19:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58840 commits 25 branches 0 tags 1.1 GiB
Commit graph

3852 commits

Author SHA1 Message Date
David Rowe
9f9a0b0c58 Hide UI if hand is inside entity that camera is outside of 2017-09-02 19:09:36 +12:00
David Rowe
296d270098 Enable entities inside an entity to be manipulated 2017-09-02 19:06:43 +12:00
David Rowe
269f1769be Merge branch 'master' into vr-edit-a 2017-09-01 14:45:59 +12:00
David Rowe
110413b025 Fix action after color picker failure 2017-09-01 14:36:44 +12:00
David Rowe
734ce66df3 Add audio and haptic feedback 2017-09-01 14:30:22 +12:00
druiz17
98b1fe6138 Merge pull request #11266 from ElderOrb/case6819 
6819 - Create button not disabled
 2017-08-31 12:36:08 -07:00
Zach Fox
164eeaae64 Fix the duplicated buy buttons for admins on Marketplace 2017-08-31 10:41:44 -07:00
David Rowe
8205b0d9d2 Merge branch 'master' into vr-edit-a 2017-08-31 15:45:15 +12:00
David Rowe
652fbaa9b7 Refactoring 2017-08-31 15:30:04 +12:00
David Rowe
3dacd1fcda Tidy options settings code 2017-08-31 13:55:00 +12:00
David Rowe
5299596254 Code tidying 2017-08-31 13:36:48 +12:00
David Rowe
3f0872465f Rename new code items 2017-08-31 13:20:37 +12:00
David Rowe
c6f987c00c Remove old code 2017-08-31 13:05:50 +12:00
David Rowe
63074ad928 Fix button press distance 2017-08-31 11:44:52 +12:00
David Rowe
e8af4bdb2d Fix up hover state of toggle button after pressing 2017-08-31 10:54:20 +12:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
David Rowe
59505b4334 Fix up colors and highlighting of group/ungroup and toggle buttons 2017-08-31 09:30:11 +12:00
David Rowe
db27b97ec7 Add zero indicators to Physics options' sliders 2017-08-31 08:24:38 +12:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
1b48319a3f Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 
Commerce: Zachs Punchlist 01
 2017-08-30 10:10:56 -07:00
David Rowe
13ac963bcc Default collisions to on 2017-08-30 20:51:25 +12:00
David Rowe
5cf40fd208 Style Physics options toggle buttons 2017-08-30 20:47:33 +12:00
David Rowe
42d2045bae Style Physics options presets pick list 2017-08-30 17:20:32 +12:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
David Rowe
e18e11a07b Style Physics options sliders 2017-08-30 09:01:46 +12:00
beholder
180acbc188 6819 - Create button not disabled 2017-08-29 23:49:44 +03:00
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
David Rowe
33765e14fa Update general layout of Physics options 2017-08-29 21:06:29 +12:00
David Rowe
666c163637 Fix Color tool's "Swatches" label 2017-08-29 20:30:04 +12:00
David Rowe
758442999d When picking a color highlight only single entity in a group 2017-08-29 18:03:31 +12:00
David Rowe
78876d39b4 Make all buttons raise when hovered 2017-08-29 17:58:37 +12:00
David Rowe
04a545da37 Style color slider 2017-08-29 16:54:45 +12:00
David Rowe
62e3c211eb Style color circle 2017-08-29 15:46:43 +12:00
David Rowe
67eb92da8f Style color swatches 2017-08-29 10:51:36 +12:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
David Rowe
9abcf9525c Use Settings values to determine whether or not swatches are populated 2017-08-28 15:51:11 +12:00
David Rowe
8dd06bc270 Style color picker button 2017-08-28 12:06:26 +12:00
David Rowe
c8381f32bb Style current color indicator 2017-08-27 21:15:27 +12:00
David Rowe
64821ccd76 Update general Color options layout 2017-08-26 17:09:04 +12:00
David Rowe
b0ef570ce0 Style Group options 2017-08-26 14:20:37 +12:00
David Rowe
c29a900588 Fix button hovering and pressing problems 2017-08-26 12:08:37 +12:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
David Rowe
2899d51835 Fix "Finish" buttons not clearing tool action 2017-08-26 11:18:25 +12:00
Zach Fox
d19377d2d4 Saving 2017-08-25 15:56:30 -07:00
David Rowe
73a6f1f278 Style Delete options 2017-08-26 10:47:41 +12:00
David Rowe
7e817652a7 Style Clone options 2017-08-26 09:51:51 +12:00
Zach Fox
e606e3dfb3 Squashed commit of the following: 
commit 453897b9e2
Author: Zach Fox <fox@highfidelity.io>
Date:   Fri Aug 25 10:56:53 2017 -0700

    Huge cleanup!
 2017-08-25 11:45:37 -07:00