Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 09:12:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
78484 commits 67 branches 56 tags 1.2 GiB
Commit graph

7789 commits

Author SHA1 Message Date
Brad Hefta-Gaub
4e86948c25
Merge pull request #15580 from MiladNazeri/simplifiedUINametag 
changed size of always on overlays to be smaller
 2019-05-17 14:42:29 -07:00
Zach Fox
e40e34856b Remove some extra menus from top bar; Only show VR button if headset connected 2019-05-17 13:28:59 -07:00
milad
0d80761cf0 added larger distance for on 2019-05-17 13:23:03 -07:00
milad
06056b9531 updated location in main UI 2019-05-17 13:00:26 -07:00
milad
df098cab2f changed size of always on overlays to be smaller 2019-05-17 12:36:03 -07:00
Zach Fox
90a5b25600 A bunch of changes here 2019-05-16 14:18:04 -07:00
Zach Fox
966965af5b
Merge pull request #15538 from zfox23/simplifiedUI 
Simplified UI v1
 2019-05-14 17:45:30 -07:00
Brad Hefta-Gaub
7440ef3cf3
Merge pull request #15506 from SaracenOne/unify_primitives 
Case 19510: Unify cube and sphere edit menu entries into one.
 2019-05-14 15:31:06 -07:00
Zach Fox
f9b51df296 Reduce size of output muted overlay; restore scroll to 0 on settings tab switch 2019-05-14 15:05:26 -07:00
Zach Fox
c57ddf969a Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI 2019-05-14 09:32:07 -07:00
Zach Fox
89006cd9c5 Hide controls in top left; don't remove certain menus; fixup slider UIT 2019-05-13 17:26:19 -07:00
Shannon Romano
32d3014d0d
Merge pull request #15301 from SaracenOne/disable_away_on_focus_loss_push_2 
case 22190: Disable triggering away state when interface focus lost
 2019-05-13 13:22:28 -07:00
Shannon Romano
b1060bcb83
Merge pull request #15508 from dback2/materialTargetTooltip 
Case 22467: Fix material target tooltip
 2019-05-13 13:08:28 -07:00
milad
51cbadcad1 Removed Selection related logic 2019-05-10 14:41:55 -07:00
Zach Fox
112e13383b Dock it! 2019-05-10 12:03:29 -07:00
Zach Fox
314c04ab96 Simplified UI v1 2019-05-10 10:49:25 -07:00
SamGondelman
2bb522eea6 entity icons ignorePickIntersection when not visible 2019-05-09 14:16:59 -07:00
Saracen
b730c457ca Replace tabs with spaces 2019-05-09 18:08:36 +01:00
Saracen
fd3c69a905 Replace tabs with spaces. 2019-05-09 02:14:00 +01:00
Shannon Romano
4c31c6f6e5
Merge pull request #15453 from SimonWalton-HiFi/avatar-verification 
Avatar verification
 2019-05-06 08:04:06 -07:00
unknown
0da318f2cd fix material target tooltip 2019-05-03 10:37:35 -07:00
Saracen
43ddf7ca23 Unify cube and sphere edit menu entries into one. 2019-05-02 22:40:11 +01:00
Angus Antley
c0da46453b made correction 2019-04-30 14:34:10 -07:00
Angus Antley
5c6ea082db changed away script to make you active if you turn on your mic 2019-04-30 14:06:18 -07:00
Simon Walton
ae68478aea Remove avatarTheftPrototype.js 2019-04-27 23:42:28 -07:00
Simon Walton
1fe8f4332f Fixes to banner; swap out avatar on client; reviewer comments; other WIP 2019-04-26 18:45:48 -07:00
Simon Walton
f3efee56c0 Merge remote-tracking branch 'upstream/master' into avatar-verification 2019-04-25 13:40:27 -07:00
Simon Walton
de97af5c02 Minimal working version for avatar's client 
Also merge of Wayne's proof-of-concept
 2019-04-24 17:42:51 -07:00
Sam Gondelman
1540c5d203
Merge pull request #15401 from SamGondelman/grid 
Case 22229: Create Grid ignorePickIntersection
 2019-04-24 12:24:27 -07:00
Shannon Romano
42fb23ed5d
Merge pull request #15435 from samcake/blackProp 
Case 22327: Add a qml library to represent and interact with the engine configs, enhance Luci
 2019-04-24 09:22:11 -07:00
Shannon Romano
a6ff19c4ee
Merge pull request #15377 from sethalves/remove-unwanted-view-menuitems 
case 22175: remove view/Independent-Mode and view/Entity-Mode menu items
 2019-04-24 09:13:59 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -07:00
Sam Gateau
6539482cc2 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-22 08:46:34 -07:00
Sam Gateau
ba02aa7098 making luci2 better 2019-04-19 16:56:55 -07:00
Sam Gateau
af3d981ad1 Bringing the Luci interface into the new Prop framework and moving some tools there too 2019-04-18 17:44:08 -07:00
Thijs Wenker
386d392144 The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = > 2019-04-18 19:05:40 +02:00
Sam Gateau
3d78592bb8 Adding more style widgets andbringing luci1 into the panels of luci2 2019-04-18 00:19:19 -07:00
Sam Gateau
9873c10353 Better canvas ICon qml and activation of the jobs 2019-04-17 17:58:48 -07:00
Thijs Wenker
dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2019-04-18 00:21:11 +02:00
SamGondelman
54d7bde91a grid ignorePickIntersection 2019-04-17 10:56:55 -07:00
Sam Gateau
92c1fd69c1 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-17 10:09:20 -07:00
Sam Gateau
4ce7d75720 FInding a path 2019-04-16 23:38:40 -07:00
Sam Gateau
f6001c178d Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp 2019-04-16 18:43:30 -07:00
Sam Gateau
f2b747a68d Adding indentation of the folder in the header and refining background color 2019-04-16 18:15:00 -07:00
unknown
2839879657 Merge branch 'master' of https://github.com/highfidelity/hifi into undoEditOrderFix 2019-04-16 15:26:47 -07:00
Shannon Romano
ec22f7847e
Merge pull request #15367 from dback2/editContinualTranslateRC82ToMaster 
Case 22130: PR 15366 changes from v82 to Master
 2019-04-16 15:17:08 -07:00
Sam Gateau
1fd88e8269 Merge branch 'master' of github.com:highfidelity/hifi into blackProp 2019-04-15 14:05:33 -07:00
Thijs Wenker
ef7c34eadd addressed more CR feedback 2019-04-15 19:04:24 +02:00
Sam Gateau
e7e9715e10 merging up 2019-04-15 09:16:59 -07:00
unknown
d342d93ec9 fix material targets when re-opening properties to same entity 2019-04-12 14:49:59 -07:00