Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 20:30:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72999 commits 25 branches 0 tags 1.1 GiB
Commit graph

5256 commits

Author SHA1 Message Date
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll 
MS19054: [CreateApp/EntityList] auto scroll
 2018-10-24 10:36:21 -07:00
Brad Hefta-Gaub
f8e38e98e1
Merge pull request #14214 from huffman/feat/edit-defaults 
Update default entity properties in Create
 2018-10-24 10:00:46 -07:00
Brad Hefta-Gaub
5e27a5930e
Merge pull request #14186 from thoys/feat/create/entityList-contextMenu 
MS19056: [CreateApp/Entity List] Context Menu
 2018-10-24 09:58:32 -07:00
Thijs Wenker
5f35a32480 remove duplicate calls to refresh footer 2018-10-24 17:58:07 +02:00
Thijs Wenker
8e1cfb5a06 fix double click selection 2018-10-24 17:58:07 +02:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
Thijs Wenker
27e0c85b01 entity list auto scroll 2018-10-24 17:58:06 +02:00
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2 
Display resource-access events in marketplace item tester
 2018-10-23 15:18:30 -07:00
Brad Hefta-Gaub
04d251c321
Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes 
Merged interstitial bug fixes
 2018-10-23 14:30:55 -07:00
Kerry Ivan Kurian
e7d1c2873a Merge branch 'master' into log-resource-requests-2 2018-10-23 13:46:59 -07:00
Thijs Wenker
4e9f9b3edf comply with copy/paste update 2018-10-23 22:42:56 +02:00
Thijs Wenker
3fa4ee0e1d enable duplicate copy cut paste functionality of context menu 2018-10-23 22:42:55 +02:00
Thijs Wenker
4069ca2e0c CR feedback 2018-10-23 22:42:55 +02:00
Thijs Wenker
e5ef589a3c style 2018-10-23 22:42:54 +02:00
Thijs Wenker
4c3f5b3bbc Entity List Context Menu 2018-10-23 22:42:54 +02:00
tapalisa
7a684081f0
Merge pull request #14235 from huffman/feat/edit-copy-paste 
Add copy/paste functionality to edit.js
 2018-10-23 13:18:12 -07:00
Brad Hefta-Gaub
447bfae828
Merge pull request #13884 from ctrlaltdavid/M17853 
Highlight tablet when it is near-grabbable
 2018-10-23 12:31:41 -07:00
Ryan Huffman
d7dce456b2 Fix incorrect default entity properties in Create 2018-10-22 18:29:27 -07:00
Kerry Ivan Kurian
a1bb685176 Remove cruft 2018-10-22 14:00:08 -07:00
Zach Fox
f5a5c0dad3 Attempt to fix wearable bug? 2018-10-22 14:00:06 -07:00
Zach Fox
f9cc4f5a69 Count unique source and url pairs 2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b Only show unique resources 2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc Tons of improvements 2018-10-22 13:59:57 -07:00
Zach Fox
7be5d5674d Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2 2018-10-22 13:59:35 -07:00
Ryan Huffman
573df2d922 Move copy/paste/cut to SelectionManager 2018-10-22 13:56:08 -07:00
Ryan Huffman
e0851c4807 Add cut to Create, and update shortcuts 2018-10-22 13:56:08 -07:00
Ryan Huffman
65fdd16d90 Cleanup copy/paste changes 2018-10-22 13:56:07 -07:00
Ryan Huffman
9cc2add4a0 Add copy/paste functionality to edit.js 2018-10-22 13:56:07 -07:00
David Rowe
35c1241c98 Fix tablet highlighting not working if start up in HMD 2018-10-23 09:08:38 +13:00
Dante Ruiz
1ce1902fa8 remove magic numbers 2018-10-22 12:49:24 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting 
Add a 'grabbable' option to the new-model dialog
 2018-10-22 11:42:40 -07:00
Wayne Chen
d008bfa523 partial requested code changes 2018-10-22 11:29:36 -07:00
Wayne Chen
7284c3ad53 Merge branch 'intersttiial-do-not-intersect-web' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:28:35 -07:00
Wayne Chen
e2b90aac9d Merge branch 'interstitialIgnoreFix' of https://github.com/wayne-chen/hifi into mergedInterstitialBugFixes 2018-10-22 10:28:12 -07:00
Wayne Chen
d12ee393d7 Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:27:13 -07:00
Wayne Chen
4a8348e0d1 Merge branch 'interstitial-loading-imporvements' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes 2018-10-22 10:14:40 -07:00
Wayne Chen
27813d4948 Merge branch 'fix/loadingscreen-optimization' of https://github.com/FlameSoulis/hifi into mergedInterstitialBugFixes 2018-10-22 10:05:55 -07:00
Wayne Chen
afd8baca87 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialIgnoreFix 2018-10-22 10:01:57 -07:00
Ryan Huffman
9d13902cd3 Improve paramater names in model dialog window 2018-10-20 11:26:12 -07:00
Ryan Huffman
f1258e4445 Add a 'grabbable' option to the new-model dialog 2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 
hide progress overlays if interstitial mode
 2018-10-19 16:35:42 -07:00
David Rowe
71ec5f3612 Fix tablet highlighting when using the Create and Shapes apps 2018-10-20 11:57:46 +13:00
David Rowe
eb179363f6 Merge branch 'master' into M17853 
# Conflicts:
#	scripts/system/controllers/controllerDispatcher.js
 2018-10-20 11:19:26 +13:00
Flame Soulis
5db7c7821e Proper formatting (aka no spaces after anonymous funcs) 2018-10-19 08:51:13 -04:00
Flame Soulis
ba459eda9e Removed duplicate backgroundAlpha 2018-10-19 08:41:04 -04: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
John Conklin II
37dce01dcb
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix 
More reliable "Create Entities as Grabbable" settings persistence.
 2018-10-18 18:26:48 -07:00
John Conklin II
bbccd0ff73
Merge pull request #14120 from zfox23/MS18609_snapShareBugs 
Fix MS18609: Various Snapshot sharing bugs
 2018-10-18 18:21:23 -07:00