Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 12:52:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71918 commits 6 branches 1 tag 1.1 GiB
Commit graph

6584 commits

Author SHA1 Message Date
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
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
Howard Stearns
f96c7f4db4 minimal time handshake 2018-09-27 17:05:18 -07: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
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
Zach Fox
6877af04f1 Fix GOTO notifs; fix WALLET notifs (pending backend change) 2018-09-26 14:57:32 -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
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
Roxanne Skelly
6f4c376d9f Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-24 13:45:24 -07:00
Roxanne Skelly
d5baadbefa Modify --url hifiapp: behavior to trigger through appUI when first 
starting interface.

Also, menu names and order follow UX documentation.
 2018-09-24 13:43:55 -07:00
John Conklin II
1f6f51993d
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit 
Remove verbose logging of keyboard messages in edit.js and gridTool.js
 2018-09-24 12:54:43 -07:00
John Conklin II
9916496118
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74 
Fix entity list selection failing when selecting entities not in list
 2018-09-24 11:02:36 -07:00
Zach Fox
57c303440b Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-24 09:32:53 -07:00
Dante Ruiz
d4450ac780 fix equip and keeping new functionallity 2018-09-21 15:59:00 -07:00
John Conklin II
ea7bc26ad8
Merge pull request #14038 from wayne-chen/fixInterstitialButton 
Fix Interstitial GoTo button stretch
 2018-09-21 11:44:48 -07:00
Zach Fox
6284074ff9 Don't show banner when app is open but continue updating data 2018-09-21 10:47:59 -07:00
Zach Fox
33c04631ea Comments on Confluence doc 2018-09-20 14:37:46 -07:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Ryan Huffman
72adfb7ff0 Fix entity list selection failing when selecting entities not in list 2018-09-20 13:46:22 -07:00
Zach Fox
87e91a4401 GOTO doesn't care about SINCE; reduce data for PEOPLE 2018-09-20 13:36:50 -07:00
Wayne Chen
8bd698b143 leaving button in natural dims 2018-09-20 11:13:27 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
Zach Fox
144771b77b Request JSON from server 2018-09-19 11:35:17 -07:00
David Back
46c8083fb9 only call selectEntity one time per trigger 2018-09-19 10:13:15 -07:00
Zach Fox
f70ecdad16 Small bugfix 2018-09-18 17:00:53 -07:00
Zach Fox
9db11aeda7 Bugfixes and new algo for PAL notifs 2018-09-18 16:35:53 -07:00
Zach Fox
4987164706 Notifications for GOTO (using a cool algorithm) 2018-09-18 15:30:43 -07:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
Zach Fox
04b44d0594 Fix small since bug 2018-09-18 12:38:33 -07:00
Zach Fox
a97f9eb79a Logic for Wallet notifications; some bugfixes 2018-09-18 12:28:03 -07:00
Zach Fox
d487914656 Prevent text notification from appearing when not necessary 2018-09-18 11:28:59 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Zach Fox
c453594eb7 Overhaul notification logic for PAL 2018-09-17 14:41:18 -07:00
Zach Fox
143a059b16 Small changes to AppUI and PAL 2018-09-17 11:11:36 -07:00