Commit graph

112 commits

Author SHA1 Message Date
Shannon Romano
1aa6221f57
Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips
MS20333: [CreateApp] add missing Material Entity tooltips
2019-01-28 14:18:46 -08:00
Thijs Wenker
b75c4ae3b6 fix spelling 2019-01-28 20:26:04 +01:00
Thijs Wenker
bfb93e67b7 materialRepeat will clamp when disabled. 2019-01-28 16:46:35 +01:00
Thijs Wenker
ef1018c49b - EntityShapeVisualizer.updateSelection -> EntityShapeVisualizer.setEntities (for a more generic use)
- GridPattern -> Material
- Replaced stringified compare with deep compare
- Copied+modified zone icon (consistent color, removed sharp edges)
2019-01-28 16:10:29 +01:00
Thijs Wenker
c1eeab6542 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/showZonesInCreate 2019-01-28 14:32:27 +01:00
Thijs Wenker
e2dc86261e add missing Material Entity tooltips 2019-01-25 05:16:04 +01:00
Thijs Wenker
b2f1657096 grid pattern 2019-01-23 19:28:34 +01:00
David Back
89032698eb newline 2019-01-22 18:24:09 -08:00
David Back
ea5705907b fix shape type and compound shape URL properties/tooltips 2019-01-22 18:22:13 -08:00
Thijs Wenker
24022f0ccc add missing Text properties to Create App 2019-01-08 20:38:31 +01:00
David Back
7581c77be8 update tooltips, use Cube icon for now 2019-01-07 18:20:20 -08:00
Thijs Wenker
26f46e87a3 new property tooltips 2019-01-05 02:16:12 +01:00
Wayne Chen
4c9c785c24 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-10 07:57:44 -08:00
Thijs Wenker
3a259d8525 Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2
# Conflicts:
#	scripts/system/html/js/entityProperties.js
2018-12-07 20:24:21 +01:00
Wayne Chen
4e6f162e01 Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-07 10:12:46 -08:00
Ryan Huffman
3160339551 Improve Create properties for particles + materials
Sizing of input fields is now flexible.
Material scale field labels are no longer obscured.
Material tooltips are corrected.
2018-12-06 09:41:10 -08:00
Thijs Wenker
e193dcbc60 - add missing start/middle/finish tooltips
- style updates
2018-11-27 19:07:04 +01:00
Wayne Chen
51f5942a7f adding sound to login screen 2018-11-21 13:36:36 -08:00
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Thijs Wenker
bb7d1f8afb fix broken and missing tooltips 2018-10-25 02:46:16 +02:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
358b0b76d1 tooltip delay of 500ms 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
Flame Soulis
fcde53fc65 Include black-sphere.fbx and update linked url 2018-10-19 08:22:43 -04:00
Flame Soulis
014c1590dd Made MP3 constistant 128kbps and fixed path resolving 2018-10-19 08:16:14 -04:00
Flame Soulis
e499309c8e Upload interstitial page sound and update link 2018-10-19 06:49:48 -04:00
David Rowe
2bdd8bfdc7 Update play area and sensor overlay models and raise a little 2018-10-03 11:09:04 +13:00
David Rowe
488599dbb0 Update teleport play area FBX model to be visible from below 2018-10-03 09:31:11 +13:00
David Rowe
f7fd76b316 Merge branch 'master' into M18586
# Conflicts:
#	interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
David Rowe
fc78d0582e Tidying 2018-09-28 10:18:00 +12:00
David Rowe
496e0a6304 Update teleport FBX models 2018-09-26 17:20:56 +12:00
David Rowe
8eeed772eb Update button layout 2018-09-08 12:40:36 +12:00
David Rowe
c0a153482a Update mini tablet model 2018-09-08 11:55:47 +12:00
David Rowe
b338c9f6fa Updated tiny table model and layout 2018-08-29 22:10:24 +12:00
David Rowe
f4a8dc49e9 Add button sounds 2018-08-21 10:28:23 +12:00
David Rowe
7a7fca3982 Update tiny tablet model 2018-08-11 05:34:01 +12:00
David Rowe
c89955b416 Use FBX for tablet proxy 2018-08-10 13:53:53 +12:00
David Rowe
fd977a758b Update teleport destination model 2018-08-08 10:49:34 +12:00
David Rowe
653a281482 Use new teleport destination FBX 2018-08-04 10:11:22 +12:00
David Rowe
1cd3869b2c Reinstate FBX file that original version or parabolic branch deleted 2018-08-04 09:42:52 +12:00
David Rowe
07049b9481 Update and tidy play area and Oculus sensor models 2018-08-02 11:08:21 +12:00
David Rowe
981b6fc4c9 Display play area and sensor about teleport target 2018-08-01 17:18:38 +12:00
SamGondelman
19cf2b0a29 mukul's changes, enable parabolic teleport 2018-07-30 11:28:59 -07:00
Alexia Mandeville
b3eec72c90 Removing animations.zip 2018-06-26 15:39:50 -07:00
Alexia Mandeville
92acbdbbd7 Adding sit and love emotes 2018-06-26 14:21:10 -07:00
Alexia Mandeville
a2e2d1bd6f Updating emote app with sit and love emotes. Renaming emotes and adjusting HTML and emote behaviors 2018-04-23 14:05:23 -07:00
Zach Fox
95ee3c82f5 Fix paths to various Snapshot resource files 2018-04-17 14:13:14 -07:00
Alexia Mandeville
700d828b67 Updating away image and image path in away script 2018-03-15 16:46:21 -07:00
Andrew Meadows
82cab5e4a1 add scripted/qml debug UI for render LOD 2018-01-18 08:53:45 -08:00