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

772 commits

Author SHA1 Message Date
David Back
4bc046187a fix searching case-sensitivity 2018-09-13 15:06:14 -07:00
David Back
34afe7a69a remove fixing search cases (for separate PR) 2018-09-13 15:01:49 -07:00
David Back
56ddafed26 fix deleting scroll-away items, fix searching case sensitivity, comments 2018-09-13 14:56:12 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
David Back
70d427f852 more fixes for resizing, deleting, selecting etc 2018-09-12 09:43:14 -07:00
Zach Fox
6d345e506b Marketplaces.js WIP 2018-09-11 19:42:12 -07:00
David Back
7eb05a3cc8 merge changes, fix various issues 2018-09-11 16:34:21 -07:00
David Rowe
a1c49bd2b6 Hide mini tablet if lasering or grabbing something else 2018-09-12 11:18:26 +12:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
David Back
50fed873d1 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-11 09:52:25 -07:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
Ryan Huffman
0fadfd2f4c Remove list.js in entityList.html 2018-09-10 12:14:07 -07:00
David Rowe
66f75e856e Fix goto and expand displaying as hovered when redisplay mini tablet 2018-09-08 16:41:36 +12:00
David Rowe
5fcb69c724 Remove extraneous CSS 2018-09-08 16:13:36 +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
Ryan Huffman
9b9785d250 Fix entity list not handling deleted entities 2018-09-07 12:04:14 -07:00
David Rowe
f3cbca6cee Change "bubble" button to "goto" 2018-09-07 16:43:21 +12:00
David Back
b82f6d0bad lines/spacing 2018-09-06 16:54:58 -07:00
David Back
0a67c49ef9 remove separate new entity list with option, fix row clicking 2018-09-06 16:50:36 -07:00
David Back
82ed57e41f triple list structure, added columns, sorting 2018-09-05 17:59:03 -07:00
Ryan Huffman
335f66d165 Add filtering support to entity list 2018-09-05 14:30:48 -07:00
Ryan Huffman
a9a5bf1e97 Replace entity list UI with custom, brute-force solution 2018-09-05 14:30:19 -07:00
Ryan Huffman
f2cc2f1485 Update entity list UI to be updated in a single batch 2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae Add profiling to edit.js fof the entity list 2018-09-05 14:30:19 -07:00
David Back
40d4f581f5 working scrolling 2018-09-05 13:16:23 -07:00
unknown
f941026a62 new entity list view wip 2018-09-04 19:11:09 -07:00
David Rowe
a5c3450bfc Tweak mini tablet UI layout 2018-08-30 13:43:31 +12:00
David Rowe
15fcafa2f5 Use SVGs for buttons 2018-08-29 22:13:09 +12:00
David Rowe
b338c9f6fa Updated tiny table model and layout 2018-08-29 22:10:24 +12:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
David Rowe
335eb98bb7 Increase size of the "..." button 2018-08-23 11:14:21 +12:00
David Rowe
f4a8dc49e9 Add button sounds 2018-08-21 10:28:23 +12:00
David Rowe
4268297769 Mini tablet button actions 2018-08-21 09:17:53 +12:00
David Rowe
6791d3f1b6 Mini tablet button icons and states 2018-08-21 08:36:04 +12:00
David Rowe
aca343330f Base UI elements 2018-08-20 16:00:02 +12:00
David Rowe
94041291d5 Add web3d overlay for UI surface 2018-08-20 10:58:01 +12:00
David Back
1d0da4042a
Merge pull request #13771 from dback2/entityListCtrlReselection 
Reselecting same entity in list will unselect it
 2018-08-10 10:41:57 -07:00
John Conklin II
6c647c8185
Merge pull request #13768 from thoys/fix/create/triggerable-reset 
MS17413 Triggerable value does not reset on entity deselect
 2018-08-09 17:13:34 -07:00
David Back
a04ffd969e deselect when reselecting same entity, fix indents 2018-08-08 13:32:38 -07:00
SamGondelman
fb75b42059 working on enabling bloom 2018-08-07 22:26:30 -07:00
David Back
d88615219c CR changes 2018-08-07 10:19:48 -07:00
David Back
174519e86e fix reselecting same entity in list 2018-08-07 09:56:51 -07:00
Thijs Wenker
95c32c8e45 fix reset triggerable checkbox 2018-08-07 17:23:49 +02:00
David Back
f9e25d36e7 use wrapper emitScriptEvent, change to Fetching 2018-08-06 17:52:27 -07:00
David Back
e5abd9d57d fix server script status event, use [ Getting status ] 2018-08-06 17:03:32 -07:00
Ryan Huffman
431cbf2694
Merge pull request #13699 from thoys/fix/create/triggerable 
MS16809: handle both triggerable and wantsTrigger in CreateApp
 2018-07-31 10:34:31 -07:00
David Back
ff6ed971d8 comments, re-org, submesh number 2018-07-26 15:40:27 -07:00
Thijs Wenker
6e23caca0d handle both wantsTrigger and triggerable in CreateApp 2018-07-26 20:25:42 +02:00
David Back
cb8e9f218b reset all property fields when no selection 2018-07-26 11:23:28 -07:00
Seth Alves
62ec693280
Merge pull request #13526 from wayne-chen/fixStillOnlySnap-case-15860 
fixing still only snap in snap app
 2018-07-03 11:36:25 -07:00
Wayne Chen
aefa52b4c9 fixing still only snap in snap app 2018-07-02 17:00:31 -07:00
John Conklin II
e9d2797573
Merge pull request #13472 from alexiamandeville/sittingUpdate69 
Restoring Emote app to stable build state, adding sit and love emotes
 2018-06-27 16:00:53 -07:00
John Conklin II
a38859e4da
Merge pull request #13397 from ctrlaltdavid/21893 
Fix Create app selection updating when entities are deleted
 2018-06-26 17:06:43 -07:00
Alexia Mandeville
92acbdbbd7 Adding sit and love emotes 2018-06-26 14:21:10 -07:00
David Back
39b3e5a711 tabs 2018-06-22 18:15:16 -07:00
David Back
09ccd3acf0 fix multi-selection color setting visible/locked to false 2018-06-22 18:13:40 -07:00
David Rowe
d43be5ce19 Code review 2018-06-21 16:35:37 +12:00
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
5de451e8e0 Update entity list upon entity deletion 2018-06-19 14:52:49 +12:00
John Conklin II
4f561b00da
Merge pull request #13003 from alexiamandeville/sittingUpdates 
Adding sitting and love to emote app
 2018-06-14 11:52:47 -07:00
Zach Fox
a5ef3fa729 Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state 2018-06-11 12:00:51 -07:00
howard-stearns
a84829392f Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-29 16:14:22 -07:00
Zach Fox
0021af8714 Merge in in-progress changes from old commerce_paginationAndFiltering branch 2018-05-16 12:28:52 -07:00
David Back
1e2d2819d5 tweaks 2018-05-15 17:36:39 -07:00
David Back
f8fc7bedd7 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 17:31:43 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
David Back
1aa653c5db tabs 2018-05-09 18:20:07 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
David Rowe
3c2bee757a Remove calls to function that's been removed 2018-05-05 12:14:40 +12:00
David Rowe
dd8eac8cb2 Remove superfluous keyboardControl.js file and references 
The raiseAndLowerKeyboard.js script is automatically injected into these pages, instead.
 2018-05-04 16:14:42 +12: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
4e48008ba1 Don't allow users to spam Still Only snapshot capture 2018-04-17 12:39:46 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -07:00
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
NissimHadar
317d9a8dbc Correct can cast shadow flag being visible on entities that can't cast shadows. 2018-03-09 11:45:39 -08:00
Zach Fox
08b2be85d2 Don't pass isUpdating around 2018-03-07 11:44:54 -08:00
Zach Fox
d07d02b2bc Take certID from backend instead of query params; Better loading; Uninstall app before updating 2018-03-07 11:10:47 -08:00
Zach Fox
91e0af9b46 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-07 10:16:10 -08:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
NissimHadar
05e9aa52c9 Moved can-cast-shadow checkbox to behaviour section. 2018-03-06 16:22:54 -08:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
Zach Fox
ee28983334 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-06 11:13:40 -08:00
Zach Fox
35b23cc954 It's working! 2018-03-05 15:54:17 -08:00
Thijs Wenker
d7725f1d73 make the grabbable checkbox again, respect default true setting 2018-03-05 20:54:08 +01:00
Dante Ruiz
1997cd27bd correctly use default values 2018-03-05 11:26:37 -08:00
Zach Fox
4046c873bd Still need to send correct thing to metaverse 2018-03-05 11:24:59 -08:00
Zach Fox
f10f9aa939 Continued progress 2018-03-05 10:01:40 -08:00
Zach Fox
f53aba2a32 Initial progress 2018-03-02 15:53:06 -08:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
NissimHadar
bb04f3f533 CR corrections. 2018-02-22 13:57:46 -08:00
NissimHadar
c6580f642a Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-22 13:45:00 -08:00
tapalisa
1f958c247f
Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final 
[Case 4315] Fixes ColorPicker Color Preview functionality
 2018-02-21 16:09:47 -08:00