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

7007 commits

Author SHA1 Message Date
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix 
Fix Collides With subproperties
 2018-10-26 13:46:52 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props 
keep userData and new grab properties in sync
 2018-10-26 11:52:47 -07:00
David Back
13acfb325a fix collides with properties, fix ordering for start/finish/spread properties 2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips 
MS19052 [CreateApp]: Tooltips
 2018-10-25 14:52:16 -07:00
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer 
Remove particle explorer
 2018-10-25 13:37:22 -07:00
David Back
eb347c5596 remove particle explorer 2018-10-25 11:30:18 -07:00
SamGondelman
faff5f11e8 Merge remote-tracking branch 'upstream/master' into particleLoad 2018-10-25 10:56:11 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Jeff Clinton
736dc47934
Merge pull request #14274 from huffman/feat/silence-defaults-in-script-log 
Add optional default scripts log suppression to the script debug window
 2018-10-25 08:50:25 -07:00
Seth Alves
b8f1c96685 rats 2018-10-25 07:47:16 -07:00
Seth Alves
b93807b1a7 remove conversion code from equipEntity.js 2018-10-25 07:47:16 -07:00
Seth Alves
b9f8c59f61
Merge pull request #13904 from alexiamandeville/menu-updates 
Resorting Developer menu organization
 2018-10-24 19:41:22 -07:00
Thijs Wenker
13cad17793 better style js attributes 2018-10-25 02:46:16 +02: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
Ryan Huffman
5c5a5c9cd2 Add optional default scripts log suppression 2018-10-24 16:23:10 -07:00
David Back
a88678fb70 fix bad css merge, add particle property debounce 2018-10-24 15:07:47 -07:00
David Back
5c1972e3f4 fix fallback properties 2018-10-24 12:40:44 -07:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
David Back
073040d1fc
Merge branch 'master' into entityListTypeFilter 2018-10-24 10:39:30 -07:00
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
unknown
c7ba386be1 darn prints somehow slipping past me 2018-10-23 20:56:53 -07:00
unknown
06aff231a3 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 20:19:06 -07:00
David Back
2b9dcd0875 fix particle properties and keylight direction, remove columns, fix orderings, fix sliders 2018-10-23 18:38:05 -07: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
SamGondelman
8807b90474 fix emitRadiusStart 2018-10-23 13:33:14 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -07: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
Brad Hefta-Gaub
405b1d5725
Revert "Better imports for controls and styles" 2018-10-23 10:58:28 -07:00
David Back
9afb111fbe add link, fix group order 2018-10-22 18:42:06 -07:00
David Back
d5dc93e800 QA fixes and reset server script status 2018-10-22 18:31:21 -07:00
Ryan Huffman
d7dce456b2 Fix incorrect default entity properties in Create 2018-10-22 18:29:27 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
David Back
e5caf01681 CR change for body click event 2018-10-22 14:51:54 -07:00