Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 05:20:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66731 commits 76 branches 59 tags 1.2 GiB
Commit graph

5546 commits

Author SHA1 Message Date
Dante Ruiz
86d3ba658f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-18 13:30:24 -07:00
Dante Ruiz
cf22f61361 adding cleanup of selection 2018-04-18 13:30:14 -07:00
Zach Fox
3ef0598871
Merge pull request #12923 from zfox23/MS10864_preventSnapshotSpam 
Don't allow users to spam Still Only snapshot capture
 2018-04-18 13:19:36 -07:00
Liv Erickson
abe8a3e6d9 correct implementation that doesn't interfere with other app status 2018-04-17 15:41:03 -07:00
Liv
071396bed0 move logic for disconnecting out of initalize() and into setActive() 2018-04-17 15:40:59 -07:00
Liv
7a7438b648 space for synxtax 2018-04-17 15:40:57 -07:00
Liv
7f01dded79 add handler to refused domain change connections 2018-04-17 15:40:55 -07:00
Liv
6f020a7ec8 return tablet to home on change domain 2018-04-17 15:40:54 -07:00
Zach Fox
4e48008ba1 Don't allow users to spam Still Only snapshot capture 2018-04-17 12:39:46 -07:00
Zach Fox
02aa8ac566 Bugfixes per QA 2018-04-16 11:53:37 -07:00
Zach Fox
071bf35683 Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018 2018-04-16 10:11:44 -07:00
Dante Ruiz
08ea72d71f Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-13 15:39:14 -07:00
John Conklin II
08ca30cf43
Merge pull request #12870 from druiz17/fix-grab-js 
fix grab.js unable to grab other entities
 2018-04-13 12:17:46 -07:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate 
Migrate materials from userData to materialData
 2018-04-12 18:24:33 -07:00
Dante Ruiz
43b92299d6 changing highlighting percentage 2018-04-12 10:35:29 -07:00
Seth Alves
32e7e5087e
Merge pull request #12668 from alexiamandeville/marketplace-update 
Updating repo script to match marketplace script
 2018-04-12 09:20:03 -07:00
Dante Ruiz
7243160dac making requested changes 2018-04-11 14:42:26 -07:00
Dante Ruiz
cdc248129c fix grab.js 2018-04-11 14:25:06 -07:00
Dante Ruiz
ba9d5d18bc make requested changes 2018-04-11 13:30:21 -07:00
John Conklin II
2f4bc5bd04
Merge pull request #12701 from misslivirose/fix-edit-grid-color 
Fix for grid color changes not applying
 2018-04-11 12:06:09 -07:00
John Conklin II
28168e6e45
Merge pull request #12699 from misslivirose/fix/save-settings-for-editing 
Fix for edit preferences not persisting
 2018-04-11 11:59:58 -07:00
Zach Fox
095b4ba5f2 Reduce logging from some Commerce/Discovery features 2018-04-10 16:02:58 -07:00
Zach Fox
01fec2edc7 Prevent the Bubble icon from ever blinking as per 14026 2018-04-10 16:00:35 -07:00
Zach Fox
a2f5891a0b Cleanup 'Private' HMD Preview State Machine Logic 2018-04-10 16:00:18 -07:00
Zach Fox
a9b9a1cb10 Commerce: Gifts 2018-04-10 15:54:19 -07:00
Liv
c7be6e0934
Update edit.js 
remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start..

tested locally but might have gotten in a weird state, so fixing in GH editor.
 2018-04-10 12:15:57 -07:00
Dante Ruiz
54c3f48e65 Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-10 09:32:40 -07:00
Dante Ruiz
447163bd07 clean up scripts 2018-04-10 09:23:40 -07:00
Liv Erickson
20ee169054 two more spaces 2018-04-10 09:23:14 -07:00
Liv Erickson
6c15577653 style fixes for eslint 2018-04-10 09:18:54 -07:00
Dante Ruiz
2e1ebac03f clean up functionality 2018-04-09 18:07:03 -07:00
Dante Ruiz
1113202a90 reverting file 2018-04-09 16:51:20 -07:00
SamGondelman
9b07880aab migrate materials from userData to materialData 2018-04-09 12:49:03 -07:00
Dante Ruiz
2c20593b6d editing equip code 2018-04-06 16:30:45 -07:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00
Dante Ruiz
fd47832857 saving changes 2018-04-06 11:47:09 -07:00
Dante Ruiz
07b1a6be01 saving work 2018-04-06 11:01:40 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66 
Merge back RC66 to master
 2018-04-06 10:43:01 -07:00
Dante Ruiz
893832f4c7 Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting 2018-04-05 16:01:36 -07:00
Dante Ruiz
cc341e8ad7 highlight nearby entities 2018-04-05 15:38:56 -07:00
Zach Fox
8e46ebf83b Prevent Interface from crashing when a Snapshot upload fails 2018-04-05 11:27:26 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -07:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix 
Fix Y arrow translation handle issues
 2018-04-04 13:46:31 -07:00
Dante Ruiz
42149e295d editing seletion style 2018-04-04 12:55:28 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one 
Remove notifications and print outs when degrading LOD
 2018-04-04 10:35:05 -07:00
Zach Fox
b641f87792
Merge pull request #12778 from zfox23/MS13792 
Prevent Context Overlay from flashing when briefly hovering over certified entity
 2018-04-04 09:31:33 -07:00
Dante Ruiz
c9c3d8f332 adding entity selection for far grabbing 2018-04-04 08:07:35 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
Zach Fox
5f47d51171 Prevent Context Overlay from flashing when briefly hovering over certified entity 2018-04-03 15:35:46 -07:00
howard-stearns
f229e24e60 fix help.js noisy log reference to undefined string#startsWith 2018-04-03 13:48:51 -07:00