Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 19:48:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53573 commits 25 branches 0 tags 1.1 GiB
Commit graph

552 commits

Author SHA1 Message Date
Andrew Meadows
1137bd1436 pull qApp spaghetti out of Avatar class 
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
 2017-04-18 11:52:21 -07:00
Zach Fox
e6edce5352 Entirely remove addressBarToggle() 2017-04-17 12:13:01 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Ryan Huffman
150dcd7dec Merge remote-tracking branch 'upstream/master' into stable-merge 2017-03-30 14:22:27 -07:00
Howard Stearns
3a7edebb94 Adjust reporting of availability to metaverse. 2017-03-29 16:12:50 -07:00
Howard Stearns
b8f557ca54 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration 2017-03-29 13:30:15 -07:00
Delamare2112
4f7cbd5b7c Add limitless connection and scripting interface 2017-03-29 12:47:58 -07:00
Howard Stearns
c795d2ca3b Four-way discoverability. (Needs testing.) 2017-03-28 18:31:08 -07:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master" 
This reverts commit b5ba4a109d.
 2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
David Kelly
76657a670c added notifications (faked user name for now), along with switch to avatar entities 2017-03-27 11:28:57 -07:00
Vladyslav Stelmakhovskyi
fc23c348cb Implemented Audio settings screen for Tablet UI 2017-03-25 13:17:38 +01:00
Zach Fox
6c4b23195b One-line warning fix...I swear I've done this before 2017-03-20 13:26:50 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
Zach Fox
beb848373b Update from zfox23/PALv2 branch 2017-03-13 10:15:06 -07:00
Seth Alves
fffff817a3 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-10 10:20:40 -08:00
Dante Ruiz
c6c0c6d382 toolbar becomes visible after taking a snapshot 2017-03-09 22:54:22 +00:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
Seth Alves
ce717d04e9 merge in tablet-as-overlay code 2017-02-23 18:40:20 -08:00
Seth Alves
37004e4347 steps toward making mouse work on tablet 2017-02-23 08:11:31 -08:00
Seth Alves
d7bb6f105b make tablet part IDs available through qApp 2017-02-17 15:43:20 -08:00
Seth Alves
39e1edafd2 merge from upstream 2017-02-17 13:16:12 -08:00
Seth Alves
5ddcbae934 save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet 2017-02-17 11:51:23 -08:00
Seth Alves
47cdade1e9 fix home-button on tablet 2017-02-17 11:47:37 -08:00
Seth Alves
21b0e45b0f don't show keyboard in edit.js unless HMD is being worn 2017-02-16 09:56:50 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
Brad Hefta-Gaub
74f10a1e7f Merge pull request #9603 from huffman/feat/trace-thread-script 
Add thread names and scripts to chrome traces
 2017-02-09 13:00:05 -08:00
Thijs Wenker
6957ac5f8b Fixes cursor being hidden while Window.browse(), Window.save() are being called from the defaultScript.js thread 2017-02-09 01:31:07 +01:00
Ryan Huffman
9d4fdfa38a Add Test.profileRange 2017-02-03 09:19:10 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Anthony J. Thibault
5eb7849a80 Support for Window.geometryChanged signal. 2017-01-25 16:43:35 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
David Rowe
74b878a276 Fix threading of message box updates 2017-01-25 17:48:58 +13:00
Anthony J. Thibault
432bb27119 The tablet Help button should be active if window is visible 2017-01-23 18:37:08 -08:00
Seth Alves
69252deb2e close the tablet when going to a new domain 2017-01-23 16:28:56 -08:00
Dante Ruiz
a319db3cb4 removed duplicate code 2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
Dante Ruiz
30b57b62da toggle help 2017-01-19 08:12:49 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Dante Ruiz
7d84aae670 closing tablet when taking snapshot 2017-01-12 17:29:38 +00:00
David Rowe
b41f8c754d Add updateable message box to JavaScript API 2017-01-12 15:46:53 +13:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Brad Davis
31f39d7eef Allow scripts to inject tracing events 2017-01-10 14:06:39 -08:00