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
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
Thijs Wenker
eeda7400c9
check if id matches in filtered getMultipleEntityProperties
2018-10-01 19:36:53 +02:00
David Rowe
2449868ea9
Fix mini tablet sizing for different sizes of avatar
2018-09-29 13:51:00 +12:00
Thijs Wenker
e266e2ebbf
filter getEntity(Multiple)Properties entities unitTest
2018-09-29 02:44:11 +02: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
John Conklin II
789062d0b9
Merge pull request #14103 from howard-stearns/shorter-handshake
...
minimal time handshake
2018-09-28 16:29:38 -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
Howard Stearns
2d29906e3c
Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2
2018-09-28 11:22:57 -07: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
Howard Stearns
f96c7f4db4
minimal time handshake
2018-09-27 17:05:18 -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
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
David Rowe
2456fd0e99
Merge branch 'master' into M17428-f
2018-09-28 08:41:57 +12:00
Roxanne Skelly
af6db93b70
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-27 12:05:21 -07:00
Roxanne Skelly
330789471d
Fix merge conflict and set proper polling times
2018-09-27 12:03:37 -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
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
Howard Stearns
6fdae83f1b
fix recent refactoring bug
2018-09-26 14:59:53 -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
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
Kerry Ivan Kurian
28ec98be9e
Uninstall marketplace item tester on wallet shutdown
2018-09-25 19:24:46 -07:00
Kerry Ivan Kurian
e6249e690e
Remove duplicate line
2018-09-25 15:52:26 -07:00
Roxanne Skelly
cbb4bff2db
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-25 14:16:43 -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
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
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
Zach Fox
a76c3f028d
Small bugfixes
2018-09-24 14:46:00 -07:00
