Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-19 04:31:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 25 branches 0 tags 1.1 GiB
Commit graph

5197 commits

Author SHA1 Message Date
sabrina-shanman
67dc526ee2 Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2 2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f 
Mini tablet in palm
 2018-10-01 16:56:36 -07:00
John Conklin II
3bbc01477e
Merge pull request #14055 from davidkelly/dk/18147 
Do not have active buy button on invalidated items
 2018-10-01 16:50:53 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2 
Account-managed wallet flow improvements
 2018-10-01 16:43:01 -07:00
David Back
b5edf42fd0
Merge branch 'master' into editHandlePickPlaneImprovements 2018-10-01 16:36:30 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities 
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
 2018-10-01 16:16:48 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation 
Fix edit rotation handle fidgeting
 2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub
6eae178389
Merge pull request #13997 from gcalero/case_18057 
Fix switch from Top View to My View
 2018-10-01 16:13:07 -07:00
Wayne Chen
36dbcd41ba Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged 2018-10-01 16:11:40 -07:00
Wayne Chen
69b547a9fe text overlays for consistency 2018-10-01 16:11:27 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged 
Interstitial screen updates
 2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2 updating interstitialmode 2018-10-01 15:26:56 -07:00
David Rowe
87ff6dd56d Fix play area sizing and positioning for different base avatar sizes 2018-10-02 10:53:31 +13:00
David Rowe
6ccd73ea47 Merge branch 'master' into M18586 2018-10-02 10:17:24 +13:00
Zach Fox
0081f9aac0 Also fix MS18512 2018-10-01 12:24:47 -07:00
Zach Fox
58f098577d Fix MS18609: Various Snapshot sharing bugs 2018-10-01 12:09:49 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
Wayne Chen
eab57633a5 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-01 09:21:26 -07:00
David Rowe
7560a2a923 Short circuit unnecessary repetition 2018-09-29 16:00:44 +12:00
David Rowe
2449868ea9 Fix mini tablet sizing for different sizes of avatar 2018-09-29 13:51:00 +12:00
David Rowe
8464a70c9e Fix initial tablet scale 2018-09-29 12:42:41 +12:00
John Conklin II
130e8dfbe9
Merge pull request #14023 from dback2/selectEntityEveryFrameFix 
Only call selectEntity once triggered when using edit handles
 2018-09-28 16:38:10 -07:00
Ryan Huffman
feb230b3bd Remove old comment in entitySelectionTool.js 2018-09-28 16:17:52 -07:00
Howard Stearns
053f22182a fix inspection case 2018-09-28 11:57:36 -07:00
Wayne Chen
a8b86bd555 removing debug statement 2018-09-28 08:44:49 -07:00
Wayne Chen
5c9094d81f removing debug print statement 2018-09-27 21:24:04 -07:00
Wayne Chen
d5950db2a4 fix for showing the text overlay in mac 2018-09-27 21:20:06 -07:00
David Rowe
545c2591e3 Merge branch 'master' into M18586 2018-09-28 16:19:44 +12:00
David Rowe
7f518d0aa1 Make teleport parabolas semi-transparent 2018-09-28 16:13:25 +12:00
howard-stearns
b45677cd02 additionally handle item urls (marketplace links from cert inspections) 2018-09-27 19:42:01 -07:00
David Rowe
7b7447739a Remove unused code noticed in passing 2018-09-28 14:23:20 +12:00
David Rowe
45993ba475 Provide mini tablet details via API instead of messages 2018-09-28 14:23:08 +12:00
howard-stearns
a6ef25f662 just whitespace and varname changes 2018-09-27 18:14:16 -07:00
sabrina-shanman
411dbbbad3 Make scripts use the default scaleWithParent when creating ray/parabola 
picks
 2018-09-27 17:34:06 -07:00
Wayne Chen
5d27cddab5 consolidating getting oops message 2018-09-27 17:16:18 -07:00
Howard Stearns
f96c7f4db4 minimal time handshake 2018-09-27 17:05:18 -07:00
David Back
215e7e6da7 remove unneeded variable 2018-09-27 17:04:43 -07:00
David Back
b7c098c260 remove unneeded variable 2018-09-27 17:02:54 -07:00
David Back
4204adf60f fix deselecting entity when re-clicking row, fix ctrl/shift selections 2018-09-27 16:59:23 -07:00
Wayne Chen
8b29f7c294 making text box smaller for no occlusion 2018-09-27 16:56:45 -07:00
Howard Stearns
7616639a40 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-27 16:12:21 -07:00
David Rowe
d98e7cea4e Fix not being able to grab tablet with other hand 2018-09-28 11:09:16 +12:00
Howard Stearns
ad676b14a1 doh - return with a newline (and no semicolon) does not continue. Don't 
need extra handler in marketplace any more.
 2018-09-27 16:06:55 -07:00
David Back
8c306b8428 disable debug pick plane 2018-09-27 16:04:18 -07:00
David Back
f5d9dd82d9 better pick plane for stretch, camera-facing pick plane for scale, debug pick plane, overall cleanup 2018-09-27 16:01:20 -07:00
Howard Stearns
4cf5b51124 works, using additional handler from wallet.js 2018-09-27 15:34:16 -07:00
David Rowe
1088a0f9ae Fix invalid state transition in desktop mode 2018-09-28 10:19:17 +12:00
David Rowe
fc78d0582e Tidying 2018-09-28 10:18:00 +12:00
humbletim
025bc19d62 save "Create Grabbable" in menuItemEvent, not scriptEnding 2018-09-27 17:08:49 -04:00
David Rowe
2456fd0e99 Merge branch 'master' into M17428-f 2018-09-28 08:41:57 +12:00
Wayne Chen
03d2fa2787 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-09-27 09:47:08 -07:00
David Rowe
3284b2a90e Immediately hide fading overlays if other hand starts teleporting 2018-09-27 15:20:43 +12:00
David Rowe
6ae206677d Add Settings > Controls option for displaying play area 2018-09-27 14:55:53 +12:00
David Rowe
b9c6811fdc Restructure post-teleport fading code 2018-09-27 14:44:30 +12:00
David Back
046a4e4041 ordering/comment tweak 2018-09-26 18:02:15 -07:00
David Back
7e7dc33acd more CR changes + fix resizing 2018-09-26 17:57:44 -07:00
Wayne Chen
813defebfc Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged 2018-09-26 16:45:22 -07:00
Wayne Chen
33db8e1f24 only allow right-click for buttons 2018-09-26 16:40:43 -07:00
Wayne Chen
fda3ec87ce removing lingering print statement 2018-09-26 15:57:57 -07:00
Wayne Chen
afae4f3b96 adding toolbar reappearing 2018-09-26 15:33:57 -07:00
Howard Stearns
da5f77afcd Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-26 15:26:52 -07:00
Howard Stearns
6e2a7c280e bottleneck opening our marketplace, and make sure it sets up wallet 
first
 2018-09-26 15:21:53 -07:00
Wayne Chen
db77cbcbc1 new location drop - unparent overlays 2018-09-26 15:12:48 -07:00
Zach Fox
6a3fa28fad Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-26 15:12:04 -07:00
Zach Fox
9a21354c27 Merge branch 'notificationsForFourApps' of github.com:zfox23/hifi into notificationsForFourApps 2018-09-26 15:08:20 -07:00
Howard Stearns
940db4f112 fix recently introduced bug 2018-09-26 15:01:30 -07:00
Zach Fox
6877af04f1 Fix GOTO notifs; fix WALLET notifs (pending backend change) 2018-09-26 14:57:32 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Wayne Chen
db41a1c16b error state signal for 404/interstitial 2018-09-26 13:48:15 -07:00
John Conklin II
7df90881cd
Merge pull request #14007 from kkurian/marketplace-item-tester 
Marketplace item tester interface
 2018-09-26 11:25:53 -07:00
John Conklin II
d1771b2928
Merge pull request #14058 from danteruiz/fix-dispacther-module-order 
fix equip while keeping new functionality
 2018-09-26 11:06:45 -07:00
Dante Ruiz
fa5dfb6e28 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-26 09:18:12 -07:00
Wayne Chen
4a87773986 fixing interstitial page, clearing up debug statements 2018-09-26 07:41:18 -07:00
David Rowe
496e0a6304 Update teleport FBX models 2018-09-26 17:20:56 +12:00
Wayne Chen
3e5e324c7e parenting text to head 2018-09-25 20:39:22 -07:00
Wayne Chen
54f800fbda including images/parent buttons to text 2018-09-25 20:21:05 -07:00
Kerry Ivan Kurian
28ec98be9e Uninstall marketplace item tester on wallet shutdown 2018-09-25 19:24:46 -07:00
Wayne Chen
42579f3d16 fixing oops dialog text index lookups 2018-09-25 18:21:51 -07:00
Wayne Chen
26b6967ba6 adding overlays to redirect domain 2018-09-25 18:16:18 -07:00
Kerry Ivan Kurian
e6249e690e Remove duplicate line 2018-09-25 15:52:26 -07:00
Kerry Ivan Kurian
ff83713365 Use persistent object id counter 2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830 Implement delete-from-list functionality in marketplace item tester 2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
David Rowe
a00cacc03e Fix post-teleport display; hide immediately avatar moves 2018-09-25 16:02:19 +12:00
Zach Fox
1ac2800e18 Fix wallet dot logic 2018-09-24 17:50:37 -07:00
Zach Fox
be304ea975 Small bugfixes again 2018-09-24 17:33:23 -07:00
David Rowe
03f0b95a3f Fix unwanted hexagonal occlusion artefact 2018-09-25 12:03:41 +12:00
David Rowe
7396bf0dbe Immediately hide post-teleport play area if start teleporting again 2018-09-25 11:39:41 +12:00
David Rowe
06b4f51a08 Misc fixes 2018-09-25 11:33:08 +12:00
Kerry Ivan Kurian
697f556a60 Persist list of marketplace items in test 
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
 2018-09-24 16:30:49 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
David Rowe
4927ffece3 Misc fixes 2018-09-25 10:33:49 +12:00
David Rowe
991ceb643c Fix teleport not working after script reload in HMD mode 2018-09-25 10:18:52 +12:00
David Rowe
858abaf6fc Fix sensor overlays not displaying after re-enter HMD mode 2018-09-25 09:49:11 +12:00
Zach Fox
a76c3f028d Small bugfixes 2018-09-24 14:46:00 -07:00
Howard Stearns
71cff45fbb Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 14:38:21 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity 
fix bug that caused localAngularVelocity to get zeroed out
 2018-09-24 14:32:57 -07:00
Howard Stearns
d3391b9273 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 13:50:52 -07:00