David Rowe
|
cfd155c198
|
Merge branch 'master' into 21418
|
2017-07-06 16:56:10 +12:00 |
|
Dante Ruiz
|
6c15dffb9d
|
added new glyph
|
2017-07-06 00:45:59 +01:00 |
|
Dante Ruiz
|
063984f573
|
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
|
2017-07-03 16:44:47 +01:00 |
|
Dante Ruiz
|
6f30cb1825
|
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
|
2017-07-01 00:48:49 +01:00 |
|
Dante Ruiz
|
51792769b5
|
finished vive in desktop mode
|
2017-07-01 00:48:36 +01:00 |
|
David Rowe
|
07697c5083
|
Merge branch 'master' into 21418
# Conflicts:
# interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
# interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
Removed stray "Vive Controller Picks" configuration item which no longer exists.
|
2017-07-01 11:19:00 +12:00 |
|
Brad Davis
|
31d2c9980e
|
Merge pull request #10797 from ctrlaltdavid/21396
Make Leap Motion a plugin
|
2017-06-30 14:37:23 -07:00 |
|
Dante Ruiz
|
a7e4dc1473
|
clean up code
|
2017-06-28 23:51:00 +01:00 |
|
David Rowe
|
be0e1a75a4
|
User-friendly SDL2 controller name
|
2017-06-29 10:03:58 +12:00 |
|
Dante Ruiz
|
a2df2f8472
|
added user activity status
|
2017-06-28 19:52:19 +01:00 |
|
David Rowe
|
72d712ac76
|
Add "enabled" setting for Sixense; bail in update if note enabled
|
2017-06-26 16:43:06 +12:00 |
|
David Rowe
|
31714675c3
|
Remove unused Sixense preference and associated methods
|
2017-06-26 16:14:57 +12:00 |
|
David Rowe
|
361bc1ce03
|
Add "enabled" setting for SDL2 joystick; bail in update if not enabled
|
2017-06-26 16:00:18 +12:00 |
|
Vladyslav Stelmakhovskyi
|
30714d5d25
|
Make background with default color. Fix few warnings
|
2017-06-22 16:47:40 +02:00 |
|
David Rowe
|
6ff8aed5e3
|
Merge branch 'master' into 21396
|
2017-06-22 23:54:15 +12:00 |
|
Dante Ruiz
|
c4699e00ca
|
added hand offsets
|
2017-06-21 23:10:08 +01:00 |
|
Dante Ruiz
|
17832b6022
|
edited some button behavior
|
2017-06-21 01:38:05 +01:00 |
|
Dante Ruiz
|
b7286db523
|
fixed merge conflict
|
2017-06-21 01:10:54 +01:00 |
|
Dante Ruiz
|
2c3db0fb91
|
finished calibration-ui
|
2017-06-21 01:07:12 +01:00 |
|
Zach Pomerantz
|
6823e7cae0
|
Audio -> HifiAudio to avoid collision
|
2017-06-20 12:20:14 -07:00 |
|
Zach Pomerantz
|
c826858458
|
revamp tablet MicBar
|
2017-06-20 11:43:02 -07:00 |
|
Dante Ruiz
|
33b89c9d32
|
adding glyph and text
|
2017-06-20 17:26:17 +01:00 |
|
Dante Ruiz
|
13dff29bd5
|
adding calibration screen
|
2017-06-20 01:19:10 +01:00 |
|
Dante Ruiz
|
734cde33e7
|
better calibrate button
|
2017-06-19 21:40:09 +01:00 |
|
Dante Ruiz
|
da29157a3c
|
fixed merge conflict'
|
2017-06-17 00:40:50 +01:00 |
|
Dante Ruiz
|
2015f059c7
|
fixed hand calibration
|
2017-06-17 00:37:33 +01:00 |
|
Dante Ruiz
|
07102cc98d
|
improving the ui
|
2017-06-16 00:25:27 +01:00 |
|
David Rowe
|
febd0eaf98
|
Add Leap Motion settings
|
2017-06-16 10:58:11 +12:00 |
|
Dante Ruiz
|
a1782bf7d2
|
Merge branch 'controller-ui' into hand-pucks
|
2017-06-15 16:27:55 +01:00 |
|
Dante Ruiz
|
d65c0dfbac
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
|
2017-06-15 16:24:59 +01:00 |
|
Zach Pomerantz
|
a8f69bb2e0
|
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
|
2017-06-13 17:41:52 -04:00 |
|
Dante Ruiz
|
ef9a211f6e
|
adding hand punck
|
2017-06-13 21:15:16 +01:00 |
|
Zach Pomerantz
|
20c0dac8e8
|
update QML with Audio.muted
|
2017-06-13 16:10:16 -04:00 |
|
Zach Pomerantz
|
b37a0239b0
|
up to reverb (needs cherry-picking)
|
2017-06-12 18:00:52 -04:00 |
|
Bradley Austin Davis
|
1968ecbc8f
|
Simplify eventBridge mechanism exposing functionality to web pages
|
2017-06-12 14:46:37 -07:00 |
|
Dante Ruiz
|
89b0e31edc
|
update calibrate button glyph
|
2017-06-12 22:21:46 +01:00 |
|
Dante Ruiz
|
bbe675ab72
|
making final changes
|
2017-06-12 22:01:41 +01:00 |
|
Dante Ruiz
|
1b13cd6d45
|
saving work
|
2017-06-12 17:31:02 +01:00 |
|
Dante Ruiz
|
067fc9bb98
|
fixed merge conflict
|
2017-06-12 16:45:34 +01:00 |
|
druiz17
|
f6ef1443c8
|
some more clean up
|
2017-06-11 12:08:45 -07:00 |
|
Dante Ruiz
|
ef1be931dc
|
preparing to clean code
|
2017-06-10 00:50:32 +01:00 |
|
Dante Ruiz
|
73e628461e
|
confiration update status
|
2017-06-09 00:44:05 +01:00 |
|
Dante Ruiz
|
c97ea84cbf
|
saving work
|
2017-06-08 17:44:55 +01:00 |
|
howard-stearns
|
fa74daf875
|
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
|
2017-06-07 16:43:25 -07:00 |
|
Dante Ruiz
|
11409aae9b
|
connect the ui with the input plugins
|
2017-06-08 00:34:52 +01:00 |
|
Dante Ruiz
|
4ba1fdc323
|
elimated uncofigurable items from the list
|
2017-06-07 00:48:12 +01:00 |
|
Dante Ruiz
|
70ba344f1b
|
finished openvr ui
|
2017-06-07 00:25:08 +01:00 |
|
Dante Ruiz
|
bb7c424d47
|
get ui working
|
2017-06-06 21:09:09 +01:00 |
|
Dante Ruiz
|
038ffe920a
|
fixing merge conflicts
|
2017-06-06 16:42:08 +01:00 |
|
Dante Ruiz
|
19b134b0ac
|
base ui working
|
2017-06-06 00:32:20 +01:00 |
|
Bradley Austin Davis
|
995fe11c05
|
Migrate to single QML engine
|
2017-06-05 15:14:44 -07:00 |
|
Zach Pomerantz
|
7cb38d22c3
|
fix AudioBuffers to work in tablet
|
2017-06-05 15:06:47 -04:00 |
|
Howard Stearns
|
556dcd69ac
|
wording change regarding use of exact for floors
|
2017-06-03 15:48:48 -07:00 |
|
Dante Ruiz
|
f0f10f74c6
|
inpput configutration stub
|
2017-06-03 00:30:00 +01:00 |
|
Brad Davis
|
9a80a81321
|
Merge pull request #10565 from vladest/fix_claraio_download_clones
Make sure that there is only one connection created for web events, s…
|
2017-06-01 20:42:50 -07:00 |
|
Vladyslav Stelmakhovskyi
|
bcee25acc7
|
Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated
|
2017-05-28 19:54:41 +02:00 |
|
Dante Ruiz
|
a45bea2c90
|
fixed merge conflicts
|
2017-05-27 00:57:09 +01:00 |
|
Dante Ruiz
|
4365907462
|
drop down puck configuration for gernal settings
|
2017-05-10 22:12:11 +01:00 |
|
Seth Alves
|
6b2caf8081
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash
|
2017-05-02 09:41:47 -07:00 |
|
Seth Alves
|
71deac49c6
|
reset tablet to homescreen when going from 2d to vr
|
2017-05-01 17:06:15 -07:00 |
|
Howard Stearns
|
73c24a5240
|
Merge pull request #10344 from howard-stearns/announcement-styling
goto announcement card styling
|
2017-05-01 16:41:39 -07:00 |
|
howard-stearns
|
ca5318f121
|
remove debugging code
|
2017-05-01 15:57:22 -07:00 |
|
druiz17
|
67daa4b0a9
|
Merge pull request #10335 from druiz17/webview-js
Implemented of a web app to bring up the tablet webView
|
2017-05-01 15:03:55 -07:00 |
|
Dante Ruiz
|
763feccbe1
|
removed tabs
|
2017-05-01 18:07:42 +01:00 |
|
druiz17
|
2bf7b12c7d
|
open webview from tabletwebscreen
|
2017-04-30 15:27:34 -07:00 |
|
Howard Stearns
|
b6ae0a5bde
|
add nextTick, and cleanup
|
2017-04-28 20:06:13 -07:00 |
|
howard-stearns
|
f9debf1388
|
checkpoint
|
2017-04-28 16:53:08 -07:00 |
|
Dante Ruiz
|
59f84a60c5
|
saving work
|
2017-04-29 00:31:09 +01:00 |
|
Howard Stearns
|
0ad8f4d985
|
remove debugging
|
2017-04-28 07:15:22 -07:00 |
|
howard-stearns
|
aed762e986
|
ux
|
2017-04-27 17:16:03 -07:00 |
|
howard-stearns
|
e4f259e630
|
back to non-fake data
|
2017-04-27 13:01:33 -07:00 |
|
howard-stearns
|
56196c03a3
|
pr review
|
2017-04-27 12:56:32 -07:00 |
|
howard-stearns
|
97777a416d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar
|
2017-04-27 12:02:02 -07:00 |
|
anshuman64
|
d146431e9b
|
Merge pull request #10268 from druiz17/input-recorder
Input recorder/ input playback system for all input actions
|
2017-04-26 16:20:20 -07:00 |
|
Zach Fox
|
9ace7a7488
|
Merge pull request #10279 from andrewd440/21174
21174 Make the Particle Emitter Easier to Use
|
2017-04-26 15:35:29 -07:00 |
|
Andrew Lowry
|
d3a9114676
|
Uses spaces instead of tabs for Edit.qml and EditTabView.qml.
|
2017-04-26 18:29:38 -04:00 |
|
anshuman64
|
5bd9b2e631
|
Merge pull request #10130 from ctrlaltdavid/21249
New avatar record and playback script
|
2017-04-26 15:18:30 -07:00 |
|
Dante Ruiz
|
95d6a451c6
|
fixed work mapping
|
2017-04-26 22:14:53 +01:00 |
|
Zach Pomerantz
|
532284f779
|
fix tablet resolve typo
|
2017-04-26 16:28:42 -04:00 |
|
Dante Ruiz
|
4df953d510
|
fixed text issue
|
2017-04-26 19:14:14 +01:00 |
|
Dante Ruiz
|
d8e6e8e7d0
|
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
|
2017-04-26 16:53:02 +01:00 |
|
Dante Ruiz
|
79d827c6be
|
added requested features
|
2017-04-26 16:52:51 +01:00 |
|
Dante Ruiz
|
b78bae37be
|
added keyboard for tabletWebview
|
2017-04-25 23:22:27 +01:00 |
|
Dante Ruiz
|
8c020a0ec2
|
saving work
|
2017-04-25 18:01:19 +01:00 |
|
Dante Ruiz
|
367a6ac03c
|
first prototype
|
2017-04-24 22:09:01 +01:00 |
|
Dante Ruiz
|
d057dfebf0
|
got input recording to work
|
2017-04-24 19:57:38 +01:00 |
|
Andrew Lowry
|
6a218eaca9
|
Embeds colpick color picker in dat.GUI for particle explorer.
Cleans up eslint for particleExplorer.js.
|
2017-04-24 13:35:37 -04:00 |
|
Andrew Lowry
|
aea89824c5
|
Switches tablet edit tab to particle explorer when particle entities are
selected or created.
|
2017-04-24 13:35:37 -04:00 |
|
Dante Ruiz
|
64fcfd33a4
|
working on loading files
|
2017-04-21 22:38:53 +01:00 |
|
Dante Ruiz
|
cc34cb96e4
|
making ui for input recorder
|
2017-04-21 18:15:47 +01:00 |
|
howard-stearns
|
4ea882cad1
|
faster initial response
|
2017-04-20 14:56:34 -07:00 |
|
howard-stearns
|
ce7145a388
|
Announcement cards, debug data.
|
2017-04-20 14:40:24 -07:00 |
|
howard-stearns
|
bc77eeeabd
|
scroll, margins
|
2017-04-20 13:43:55 -07:00 |
|
howard-stearns
|
2512255dd0
|
reusable feeds
|
2017-04-19 16:33:02 -07:00 |
|
howard-stearns
|
3ce238b8a0
|
make feed self contained
|
2017-04-19 13:45:58 -07:00 |
|
David Rowe
|
2108300272
|
Merge branch 'master' into 21249
|
2017-04-20 08:43:00 +12:00 |
|
howard-stearns
|
c5f1455872
|
go horizontal
|
2017-04-19 12:47:28 -07:00 |
|
David Rowe
|
dae6d6fb69
|
Stub desktop dialog to select recording to play from ATP assets
|
2017-04-18 11:43:42 +12:00 |
|
Dante Ruiz
|
31b61c3225
|
removed white space
|
2017-04-18 00:24:34 +01:00 |
|
Dante Ruiz
|
e46d9da98f
|
fixed merge conflict
|
2017-04-18 00:22:35 +01:00 |
|