Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 08:28:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
83678 commits 69 branches 58 tags 1.2 GiB
Commit graph

1013 commits

Author SHA1 Message Date
Alezia Kurdis
797d18d59d
CSS adjustment for the new field type 'vec3rgb' 
CSS has been adjusted for the new field type 'vec3rgb'.
Part of the fix for issue #593.
 2020-08-08 00:07:33 -04:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -04:00
Kasen IO
ce1a1faf79 Fix copyright headers + some docs. 2020-05-20 15:02:03 -04:00
David Rowe
63ba8400f7 Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-16 11:23:38 +12:00
Alezia Kurdis
74f7b324b8
Reconvert EOL to Unix style. 
Reconvert EOL to Unix style.
 2020-05-08 23:36:05 -04:00
Alezia Kurdis
637352052b
Merge branch 'master' into feature/renderWithZones-Create-UI 2020-05-08 15:20:31 -04:00
David Rowe
c6774016b5 Further fixes 2020-05-08 15:12:09 +12:00
David Rowe
395f950cb3 Fix whitespace and line endings in tabs.css 2020-05-08 14:59:01 +12:00
Alezia Kurdis
f43b0f52f5
Minor code adjustments 
Add missing space between ":" and the value for many class attributes.
 2020-05-06 23:16:56 -04:00
Seth Alves
1c926db2db if hands are tracked, make mini-tablet be just a big open-tablet button (remove mute and goto buttons) 2020-04-26 12:22:53 -07:00
Alezia Kurdis
0338d8a9f4
New classes for the "Multiple Zones Selector" Renderer 
Added:
New CSS classes for the "Multiple Zones Selector" Renderer
(Required for  the new property "renderWithZones" for PR#78)
 2020-04-03 23:27:01 -04:00
Alezia Kurdis
4b4a1bd8c0
Icons for "Multiple Zones Selector" Renderer 
2 new icon added for the "Multiple Zones Selector" Renderer
(required for the new property "renderWithZones" for PR#78):
"Add" and "Remove".
 2020-04-03 23:23:20 -04:00
Alezia Kurdis
e371823896
Move the tabs.css with other css 
Move the tabs.css with other css
 2020-03-18 18:33:09 -04:00
RebeccaStankus
e9777dc40f Merge branch 'master' of github.com:highfidelity/hifi into create 2019-06-25 09:28:43 -07:00
RebeccaStankus
6aca2fcf07 Working on new file structure 2019-06-24 14:01:51 -07:00
Ryan Huffman
1894951f54 Add ignorePickIntersection to Create 2019-05-28 16:15:00 -07:00
unknown
22c2bfc075 fix material target parentIDChanged 2019-04-22 15:03:12 -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
Thijs Wenker
ef7c34eadd addressed more CR feedback 2019-04-15 19:04:24 +02:00
Thijs Wenker
00a024fde2 fixing materialTargets, after the rebase 2019-04-12 20:06:32 +02:00
Thijs Wenker
c283c062c1 CR changes 2019-04-12 19:32:05 +02:00
Thijs Wenker
8b24cf51de enhance the multi editing experience 2019-04-12 19:32:05 +02:00
Thijs Wenker
8e97c4f3f2 multi-editing support for properties 2019-04-12 19:30:12 +02:00
Thijs Wenker
71770e3f4e move entity selection update code to its own function 2019-04-12 19:29:36 +02:00
Thijs Wenker
aef4f28194 unused variables / missing semi-colon 2019-04-12 19:26:03 +02:00
Shannon Romano
13fb3148a5
Merge pull request #15352 from dback2/materialTargetMasterFollowup 
Case 22082, 22101: PR 15325 follow up and PR 15351 RC82 > Master
 2019-04-11 17:53:05 -07:00
Ryan Huffman
f2474b4d2b Fix lack of ranges on numerical types in Create 2019-04-11 14:20:52 -07:00
unknown
1537d4351d CR changes from PR 15325 2019-04-08 14:07:25 -07:00
unknown
b8b9035f9d fix avatar/shape material targets, refresh material target when parent changes 2019-04-08 13:43:22 -07:00
Ryan Huffman
aff80dec26
Merge pull request #15325 from dback2/dynamicMaterialTargetProperties 
Case 20738: add dynamic multiselect for material target property
 2019-04-05 17:55:26 -07:00
Shannon Romano
7e354a953b
Merge pull request #15276 from huffman/fix/new-properties-in-create 
Case 20739: Add new web and base properties to Create
 2019-04-05 16:55:19 -07:00
unknown
f2aa155e1e tweak style, add scrolling 2019-04-05 15:35:37 -07:00
unknown
4f4ec064e4 add dynamic multiselect for material targets 2019-04-05 15:35:37 -07:00
Ryan Huffman
9c4b3f017f
Remove min/max on web entity maxFPS 
Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.
 2019-04-05 15:08:48 -07:00
Sam Gondelman
414a39bd8a
Merge branch 'master' into particleShapes 2019-04-01 22:20:13 -07:00
Ryan Huffman
9abd0943ff Add new web and other properties to Create 2019-03-27 16:29:04 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
Thijs Wenker
20c3a36308
Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed 
Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]
 2019-03-20 19:43:37 +01:00
Roxanne Skelly
640b05304a Case 21392 - Excise unneeded code from marketplacesInject.js 2019-03-19 16:24:07 -07:00
Thijs Wenker
19c51b25d1 don't ignore updates that originate from entityPropertiesTool itself 2019-03-20 00:18:21 +01:00
Thijs Wenker
aeb56ff22a EntityList -> re-focus the rename field rather then re-selecting the text fully 
EntityProperties -> ignore selection updates when nothing is changed and window is focused
 2019-03-14 01:26:06 +01:00
Roxanne Skelly
e4e8a61328 Case 21326 - missing marketplaceInject.js 
The re-addition of marketplaceInject.js didn't merge from 80
for some reason.
 2019-03-11 10:46:51 -07:00
Shannon Romano
37727c8b60
Merge pull request #14938 from dback2/draggableNumberDisabled 
Case 20662: Entity Properties - fix disabling draggable numbers
 2019-03-07 15:33:21 -08:00
Roxanne Skelly
fae6393663 Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42' 2019-03-05 15:11:25 -08:00
Roxanne Skelly
3ef02085ff Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f' 2019-03-05 15:07:49 -08:00
Simon Walton
83c9381575 Convert avatarPriority to trivalued (inherit, crowd, hero) 
Also tweaks from original reviewer comments.
 2019-03-01 17:25:46 -08:00
shanzzam
adb6f559dc Changing twitter handle from inc to VR 2019-02-20 18:31:32 -08:00
Simon Walton
8033e93eda Add avatar-priority boolean to zone entities 
RC-79 version
 2019-02-19 17:38:37 -08:00