Commit graph

63158 commits

Author SHA1 Message Date
SamGondelman
c46531296f move key logic from onClicked to onReleased 2018-01-09 18:28:54 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination
Commerce: Support pagination at History endpoint; improve Purchases scrolling
2018-01-09 15:57:34 -08:00
Brad Hefta-Gaub
a7b56da570
Merge pull request #12103 from ZappoMan/emoteApp
first cut at an emote app
2018-01-09 15:23:14 -08:00
Zach Fox
edf25c3e4e Remove code duplication... 2018-01-09 14:14:54 -08:00
Melissa Brown
7b50480a43
Merge pull request #12070 from 1st-BrainStormer/master
WL#21651: Extend MIDI javascript support.
2018-01-09 14:06:15 -08:00
Melissa Brown
19802b33eb
Merge pull request #12109 from vladest/tablet_page_indicator
Page indicator visible only when pages more than one
2018-01-09 14:05:32 -08:00
ZappoMan
4f1dc2f184 fix CR comments 2018-01-09 13:42:51 -08:00
Zach Fox
d31dec7acb Fix unix build errors 2018-01-09 12:41:56 -08:00
Zach Fox
0bc483f7a6
Merge pull request #12096 from ElderOrb/FB5648
5648 play audio notification to confirm purchase upon rezzing
2018-01-09 12:32:28 -08:00
Zach Fox
360a7cc4c6 CR feedback 2018-01-09 11:08:18 -08:00
Anthony Thibault
1f1ac71b73
Merge pull request #12111 from hyperlogic/bug-fix/oculus-touch-angular-velocity
Oculus Touch: More accurate spin on thrown objects
2018-01-09 10:13:34 -08:00
Thijs Wenker
88d353a642
Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable
Make zones, lights, and particles not grabbable when created in edit.js
2018-01-09 18:26:13 +01:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify
Tablet pagination magnify
2018-01-09 08:08:02 -08:00
Alexander Ivash
7e87cb38e1 adjusted code to PR comments 2018-01-09 11:10:23 +03:00
Bruce Brown
e9f8dafbc8 Corrected bitwise operators, Removed midiRaw signal. 2018-01-08 20:10:22 -08:00
ZappoMan
1fd9eae2b5 make second click stop animation if still playing, and shrink animation files 2018-01-08 17:57:12 -08:00
Sam Gondelman
02100a405d
Merge pull request #12100 from samcake/blue
Restore packing of QRC qml and resources to interface.exe in DEV_BUILD
2018-01-08 17:41:34 -08:00
ZappoMan
0d1b34f487 make animation 60fps 2018-01-08 17:32:22 -08:00
Anthony J. Thibault
dd0e57026e Oculus Touch: More accurate spin on thrown objects
The internal computation of angular velocity was incorrect.
Apparently, the ovrPoseStatef.AngularRotation is not in sensor frame but local to the controller rotation.
2018-01-08 15:28:59 -08:00
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594
Case 10594 - Fix entity property href not being able to reset (empty) ...
2018-01-08 14:22:28 -08:00
vladest
891663bae9 Page indicator visible only when pages more than one 2018-01-08 23:07:09 +01:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix
Fix avatar texture loading
2018-01-08 14:01:15 -08:00
Zach Fox
611f25d542 Improve scrolling thru My Purchases 2018-01-08 13:17:04 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch
Touch feeling for near grab
2018-01-08 12:50:30 -08:00
SamGondelman
97c0b33975 fix avatar texture loading 2018-01-08 12:50:05 -08:00
John Conklin II
1acd3e17e0
Merge pull request #12104 from druiz17/fix-laser-mess
fix tablet interaction and far grab functionality
2018-01-08 12:43:36 -08:00
Zach Fox
dcfceab078 Remove all work done on paginating purchases 2018-01-08 12:03:56 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646
Window JSDoc
2018-01-08 11:53:34 -08:00
Zach Fox
2231bf2bdd Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination 2018-01-08 11:45:20 -08:00
Liv Erickson
d1e176ee9d Update menu to reflect non-grabbable entity types, include particles 2018-01-08 11:31:09 -08:00
Dante Ruiz
fd83e00df4 fix tablet interaction and far grab functionallity 2018-01-08 11:30:21 -08:00
Zach Fox
cdd62c7119 I don't think auto-refresh and pagination of inventory is possible 2018-01-08 11:29:41 -08:00
David Rowe
7a971b2d26 Fix typo 2018-01-09 08:17:15 +13:00
Alexander Ivash
9a63fc94f0 5648 play audio notification to confirm purchase upon rezzing 2018-01-08 21:14:44 +03:00
Zach Fox
99510f522d
Merge pull request #12095 from ElderOrb/FB10621
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
2018-01-08 10:05:53 -08:00
Liv Erickson
b166f98702 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/make-zones-lights-not-grabbable 2018-01-08 10:01:40 -08:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit
Bug fix for sit script.
2018-01-08 09:59:17 -08:00
ZappoMan
1dc24072dc cleanup a few things in emote App 2018-01-08 09:04:07 -08:00
ZappoMan
c4d0872bbf first cut at an emote app 2018-01-07 22:28:50 -08:00
luiscuenca
50f89182d7 Add Utils.jsc 2018-01-07 18:29:13 -07:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser
Consistent go to user
2018-01-07 11:07:39 -08:00
luiscuenca
8a7c68829d Optimizations, cleanings and globals 2018-01-07 11:56:30 -07:00
Bruce Brown
f233c93aaa Requested updates 2018-01-05 19:50:16 -08:00
David Rowe
673bc7de38 Update Window JSDoc 2018-01-06 16:05:55 +13:00
Liv Erickson
4e582975b6 cleanup 2018-01-05 18:03:20 -08:00
Liv Erickson
f563b8ca2e Make zones and lights not default grabbable 2018-01-05 17:49:43 -08:00
Anthony Thibault
1a97d1de0f
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter
Added exponential smoothing filter for vive pucks.
2018-01-05 16:50:55 -08:00
Anthony J. Thibault
243dcb88ee Bug fix for sit script. 2018-01-05 16:20:44 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection
Fix bugs related to inspecting entities with hand controllers
2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1 Fix magic numbers 2018-01-05 16:27:48 -07:00