SamGondelman
7f3268548c
direct connection to web3doverlay
2017-10-12 14:14:08 -07:00
druiz17
83d2a54b0f
fixed some bugs
2017-10-12 13:48:21 -07:00
Zach Fox
6a47884fcf
Cleanup and fix
2017-10-12 13:41:19 -07:00
Brad Hefta-Gaub
1bba5ff812
Merge pull request #11554 from sethalves/import-av-entities
...
Import av entities
2017-10-12 13:30:53 -07:00
beholder
c31aa6bcdb
8213 Keyboard Input Field: Reveals Passwords
2017-10-12 22:08:46 +03:00
Zach Fox
abe1cd1b51
Minor cleanup
2017-10-12 11:53:47 -07:00
Zach Fox
30d6c78e4e
Merge pull request #11580 from ElderOrb/case8210
...
8210 Keyboard Input Field: Pressing Space should Clear Field
2017-10-12 11:49:18 -07:00
Zach Fox
0e96fc5cab
It's working!
2017-10-12 11:37:26 -07:00
SamGondelman
27b585cb0b
Merge remote-tracking branch 'upstream/master' into pointerEvents
2017-10-12 11:22:23 -07:00
SamGondelman
53fde83922
cleaning up pointerevents, wip
2017-10-12 11:21:50 -07:00
Zach Fox
5efa920712
Getting closer
2017-10-12 11:13:23 -07:00
Zach Fox
1227168939
Merge pull request #11575 from ElderOrb/QTBUG-49297
...
workaround for https://bugreports.qt.io/browse/QTBUG-49297
2017-10-12 10:56:45 -07:00
druiz17
a6bc6a09a5
Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module
2017-10-12 10:34:17 -07:00
vladest
2d010980b0
Removed special sound for Mute and replace it with hover and click sounds
2017-10-12 19:15:09 +02:00
vladest
35b146b59a
Added sounds in Audio menu
2017-10-12 19:01:38 +02:00
vladest
b965049651
Do not produce sound and highlight on disabled items and menu separators
2017-10-12 18:39:26 +02:00
vladest
f1d5df5926
Restore lost-in-merge context property
2017-10-12 18:26:50 +02:00
vladest
145149fedd
Merge branch 'master' into tablet_extended_sounds
2017-10-12 18:01:23 +02:00
beholder
f31316b0aa
8210 Keyboard Input Field: Pressing Space should Clear Field
2017-10-12 15:03:32 +03:00
samcake
480047548d
exposing the Render interface to the overlay web3d
2017-10-11 18:04:29 -07:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
Zach Fox
c3e66c9581
Fixes
2017-10-11 16:56:47 -07:00
Brad Hefta-Gaub
cd2a742974
Merge pull request #11576 from SamGondelman/pointerEvents
...
Remove unused HFMetaEvents
2017-10-11 16:10:43 -07:00
beholder
dcdf85b08e
workaround for https://bugreports.qt.io/browse/QTBUG-49297
2017-10-12 02:10:09 +03:00
druiz17
42cab19ab2
generialze window search
2017-10-11 16:04:35 -07:00
samcake
9abe098436
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-11 15:48:40 -07:00
Sam Gateau
38b467a6bf
Merge pull request #11570 from jherico/overlays_blocking
...
Remove unnecessary blocking call
2017-10-11 15:40:53 -07:00
SamGondelman
403b18977b
remove unused HFMetaEvents
2017-10-11 14:37:23 -07:00
Seth Alves
a4462056df
Merge pull request #11549 from sethalves/linux-clang-build
...
allow project to be built with clang on Linux
2017-10-11 13:28:45 -07:00
Zach Fox
9e570fdba3
First pass at encryption/decryption. Exciting!
2017-10-11 13:08:04 -07:00
druiz17
8f3fa08b1e
hud module intersects with stats window
2017-10-11 11:41:10 -07:00
Seth Alves
ca128a3251
merge from upstream
2017-10-11 11:09:33 -07:00
Zach Fox
f037eab26c
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-11 11:07:32 -07:00
Zach Fox
99109fe8e5
Merge pull request #11567 from zfox23/commerce_daveIntegration3
...
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Brad Davis
69f869b339
Remove unecessary blocking call
2017-10-11 11:01:06 -07:00
Zach Fox
3f0ec73be6
Fix date displays
2017-10-11 10:55:14 -07:00
Zach Fox
4ebccfa65c
Use put instead of get sob
2017-10-10 16:23:43 -07:00
Zach Fox
5e383e2b1c
My Item certificates
2017-10-10 14:56:17 -07:00
Dante Ruiz
742cf0debe
Merge pull request #11383 from ElderOrb/case7384
...
7384 On Domains without Edit Access, Create Button Text still Highlights
2017-10-10 14:30:49 -07:00
Sam Gateau
f143c28625
Merge pull request #11542 from SamGondelman/bubbleBoy
...
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
Zach Fox
702528a8cc
Fully integrate cert properties
2017-10-10 13:27:17 -07:00
Zach Fox
0ae69b6ad9
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-10 12:38:14 -07:00
Zach Fox
1c0a564155
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3
2017-10-10 12:36:06 -07:00
Zach Fox
b105248dd7
Merge pull request #11555 from zfox23/commerce_daveIntegration2
...
2017-10-09 Commerce Frontend Updates
2017-10-10 12:34:30 -07:00
Zach Fox
be2b241629
Lots of progress; don't yet have some things
2017-10-10 12:20:48 -07:00
Ryan Huffman
568a7ba439
Merge pull request #11557 from cain-kilgore/21562
...
WL 21562 - Fix the error in the Asset Browser
2017-10-10 11:12:33 -07:00
Clément Brisset
3b48833cc0
Merge pull request #11451 from huffman/feat/upload-user-event
...
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
Zach Fox
8d0d9a159f
Bugfixes
2017-10-10 10:38:19 -07:00
Gerard Maguire
e5f65b5fb1
Merge branch 'master' of https://github.com/highfidelity/hifi into 21466
2017-10-10 17:44:27 +01:00
Ryan Huffman
9c120f1194
Update AssetMappingsScriptingInterface to not open file for activity event
2017-10-10 09:44:13 -07:00
Gerard Maguire
afb03b3d2d
Avatar pitch and roll cleared
2017-10-10 16:19:31 +01:00
Cain Kilgore
583b0c521e
Open
2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d
WL 21562 - Fix the error in the Asset Browser
2017-10-10 03:39:13 +01:00
Seth Alves
8ac1875a91
Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login
...
Find nearby entities at login
2017-10-09 17:54:44 -07:00
Seth Alves
3cef3779df
Merge branch 'master' of github.com:highfidelity/hifi into linux-clang-build
2017-10-09 17:34:50 -07:00
Seth Alves
aa08053a28
fix osx build
2017-10-09 17:34:43 -07:00
Seth Alves
f349ba3674
replace parent avatar-id with avatar-self-id when exporting entities
2017-10-09 15:32:45 -07:00
Zach Fox
b81a8a95ea
Final fixes
2017-10-09 15:23:22 -07:00
Seth Alves
58534a5a6d
Merge pull request #11550 from druiz17/fix-test-audio
...
fixed looping sample sound bug
2017-10-09 15:21:24 -07:00
Zach Fox
38b95b5403
Instructions HTML file and flow
2017-10-09 15:07:14 -07:00
Seth Alves
d1d2b8a4da
don't export avatar-parent sessions IDs into json
2017-10-09 14:02:20 -07:00
Zach Fox
733df8391f
Round 2
2017-10-09 12:27:56 -07:00
Seth Alves
13da20e1f0
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-09 12:18:09 -07:00
Seth Alves
54204833df
add a getParentTree call for overlays
2017-10-09 12:17:56 -07:00
Zach Fox
acdd1e32e4
First round
2017-10-09 12:11:07 -07:00
Anthony Thibault
13919907de
Merge pull request #11539 from Nex-Pro/patch-1
...
Fixed typo in qWarning message.
2017-10-09 12:10:27 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
druiz17
cd97ab0fdf
fixed looping sample sound bug
2017-10-09 11:39:57 -07:00
Zach Fox
a7d43c63b6
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-09 11:38:13 -07:00
Stephen Birarda
1fb7b0df7a
re-bake new default avatar to compress mesh
2017-10-09 10:57:34 -07:00
Andrew Meadows
bbde1bcd63
move stuff out of writelock when possible
2017-10-09 10:42:42 -07:00
Stephen Birarda
78c5e84140
update to re-baked hipsFixed avatar
2017-10-09 10:33:35 -07:00
Stephen Birarda
198dbf83c3
fix name in mannequin FST
2017-10-09 10:33:34 -07:00
Stephen Birarda
429e037534
fix path to mannequin FBX from FST
2017-10-09 10:33:34 -07:00
Stephen Birarda
72b23a0fbb
update default avatar to be better with oculus grab triggers
2017-10-09 10:33:34 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Andrew Meadows
0f4e7fb532
workaround for bad physics polling on login
2017-10-09 10:27:46 -07:00
samcake
1f3623e8e9
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-09 09:37:25 -07:00
Seth Alves
4d2f16efc3
allow project to be built with clang on Linux
2017-10-08 18:01:41 -07:00
Brad Davis
7aeeaeb4e7
Fix rendering transform for text3d overlays
2017-10-07 19:41:43 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
samcake
988d8a1a62
TRying to debug the overlay notifications to show ?)
2017-10-06 18:17:48 -07:00
Brad Hefta-Gaub
62fc193bff
Merge pull request #11532 from sethalves/import-av-entities
...
fix importing of avatar entities
2017-10-06 17:59:54 -07:00
Thijs Wenker
77a36bf788
Merge pull request #10892 from ctrlaltdavid/vr-edit-a
...
VR edit app
2017-10-07 02:19:00 +02:00
Zach Fox
59a6726af6
Checkpoint; lotsa changes...
2017-10-06 16:55:05 -07:00
SamGondelman
e95ecc3f27
fix missing sensorToWorld matrix
2017-10-06 15:37:23 -07:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Zach Fox
1fa9bd8fc6
Better implementation of location change and bugfixes
2017-10-06 12:22:29 -07:00
Seth Alves
195d96bd43
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 11:02:35 -07:00
Nex-Pro
24974fdae3
Fixed typo in qWarning message.
2017-10-06 18:42:02 +01:00
Gerard Maguire
93caa7e259
Merge branch 'master' of https://github.com/highfidelity/hifi into 21466
2017-10-06 17:52:42 +01:00
Zach Fox
e5e6d84e07
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-06 09:47:21 -07:00
Zach Fox
051b63503c
Merge pull request #11534 from zfox23/commerce_daveIntegration1
...
Commerce backend changes sync, October 5 2017
2017-10-06 09:45:45 -07:00
Ryan Huffman
9c06afc4c8
Merge pull request #11326 from cain-kilgore/21537
...
WL 21537 - Improve log naming
2017-10-06 08:51:42 -07:00
Seth Alves
8d00731620
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-06 07:20:34 -07:00
Zach Fox
525e0d8f61
Make SettingsScriptingInterface accessible to tablet
2017-10-05 16:51:13 -07:00
David Rowe
28c7ef2e97
Merge branch 'master' into vr-edit-a
2017-10-06 11:54:08 +13:00
Zach Fox
0b600a74c3
Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout
2017-10-05 14:34:53 -07:00
Andrew Meadows
a3bafa3c44
Merge pull request #11506 from SamGondelman/sharks
...
Fix and improve laser pointer locking
2017-10-05 14:10:06 -07:00
Zach Fox
9290a51685
Fix confirmed text
2017-10-05 14:03:56 -07:00
Seth Alves
30269c6794
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 13:57:44 -07:00
Andrew Meadows
05f2dfbbc3
Merge pull request #11529 from vladest/fix_audiotab_name_alignment
...
Fix alignment of audio devices input header
2017-10-05 13:50:29 -07:00
SamGondelman
6b02cbb911
move locking inside laserpointer and raypick
2017-10-05 13:17:57 -07:00
Zach Fox
8e82095135
Number sold and limited run
2017-10-05 12:46:20 -07:00
Seth Alves
b96fac2f00
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Zach Fox
d605bd9ef4
Preprocess inventory endpoint result
2017-10-05 11:01:15 -07:00
Ryan Huffman
f0c9badbd6
Fix misspelling in lost-connection-to-atp error
2017-10-05 09:10:46 -07:00
vladest
193dc83b99
Fix alignment of audio devices input header
2017-10-05 13:59:42 +02:00
Sam Gateau
25dae2f24e
Merge pull request #11499 from samcake/blue
...
Moving Camera update and render frame to Game Loop (Main thread)
2017-10-04 18:42:02 -07:00
Zach Fox
27d6cc2657
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-04 15:49:33 -07:00
Zach Fox
9d51d40af4
Merge pull request #11489 from vladest/login_dialog_rework
...
Login dialog rework
2017-10-04 15:47:44 -07:00
David Rowe
63e7521711
Merge branch 'master' into vr-edit-a
2017-10-05 11:29:49 +13:00
Clément Brisset
74fd69ac2d
Merge pull request #11523 from Atlante45/new-master
...
RC56 into Master
2017-10-04 15:17:52 -07:00
Zach Fox
b35eaf2cc8
Throw a bunch of code at the wall and hope some sticks
2017-10-04 15:06:55 -07:00
samcake
d773b40a63
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-04 13:25:14 -07:00
Zach Fox
ab08dc6bd6
Progress?
2017-10-04 12:33:58 -07:00
Andrew Meadows
e3ea013d5f
Merge pull request #11518 from SamGondelman/avatarRay
...
Fix calling AvatarManager.findRayIntersection() from script
2017-10-04 12:04:30 -07:00
SamGondelman
477dfdff1e
wip hud layering and fix crashes
2017-10-04 11:45:21 -07:00
vladest
86e8076362
Fix puntuation mode
2017-10-04 20:30:25 +02:00
Zach Fox
1ed10ecf59
Fix passphrase crash
2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3
Merging with master
2017-10-04 10:55:38 -07:00
Zach Fox
23245e2fb9
Modify context overlay filter
2017-10-04 10:39:23 -07:00
vladest
073fa81d5b
Merge branch 'master' into login_dialog_rework
2017-10-04 19:37:38 +02:00
vladest
0a505617df
Implemented single keyboard instance for all Tablet login dialog items
2017-10-04 19:33:36 +02:00
Zach Fox
fcafbef109
Fix buying free items using Commerce system
2017-10-04 09:34:32 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
SamGondelman
0614fd9b4f
fix AvatarManger::findRayIntersection from script thread
2017-10-03 15:31:49 -07:00
Zach Fox
9c4b02c659
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73
First steps
2017-10-03 14:36:22 -07:00
Seth Alves
ea4068f1f9
Merge pull request #11478 from vladest/fix_menu_linux
...
Added workaround to enable menu bar under Linux
2017-10-03 13:10:34 -07:00
vladest
6fddf49988
Merge branch 'master' into login_dialog_rework
2017-10-03 21:39:38 +02:00
Zach Fox
ea3da6c9dd
Merge pull request #11495 from zfox23/pop_interfaceChanges2
...
Commerce: One step closer!
2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2
Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit
...
Tweak debug stats for more clarity
2017-10-03 11:23:16 -07:00
Zach Fox
409360e55d
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests
2017-10-03 11:17:38 -07:00
Zach Fox
e64b0861a1
Change passphrase working
2017-10-03 10:53:10 -07:00
Andrew Meadows
cd4be1473f
put more of Application::update() under time measurement
2017-10-03 10:34:12 -07:00
Andrew Meadows
773c48bbc9
use floating point for game loop stats values
2017-10-03 10:32:19 -07:00
David Rowe
f52df6667a
Merge branch 'master' into vr-edit-a
2017-10-03 21:50:49 +13:00
Sam Gateau
64f70f1ebb
more cleanups
2017-10-02 22:00:41 -07:00
Sam Gateau
895e3d0430
more cleanups
2017-10-02 21:46:52 -07:00
Sam Gateau
316156db46
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 21:31:59 -07:00
Andrew Meadows
21cd986645
tally PerformanceTimer records when it is active
2017-10-02 20:57:20 -07:00
druiz17
86f580919c
remove what space
2017-10-02 17:43:43 -07:00
samcake
bb99f68d40
Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead
2017-10-02 17:04:00 -07:00
Zach Fox
11d0062104
Progress on buy endpoint
2017-10-02 16:57:41 -07:00
druiz17
8a0ecf4e6f
propertly determine is laser intersects with HUD UI
2017-10-02 16:46:43 -07:00
Andrew Meadows
c3167444a9
decouple 'general timing' from 'game loop' details
2017-10-02 16:31:20 -07:00
druiz17
68780f56b7
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
2017-10-02 14:06:26 -07:00
SamGondelman
97b09d680c
fix and improve laser pointer locking
2017-10-02 13:17:53 -07:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
Zach Fox
1d1b846f39
Better 'view backup instructions' behavior
2017-10-02 12:44:51 -07:00
Zach Fox
15c0a21e0e
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
2017-10-02 12:19:24 -07:00
Andrew Meadows
0fc6bf1e89
Merge pull request #11471 from Atlante45/feat/auto-bake
...
Asset Browser tweaks
2017-10-02 11:29:36 -07:00
vladest
bf39eb9a77
Test Tablet keyboard specific
2017-10-02 20:02:55 +02:00
Zach Fox
2b03e08c96
Fix errant status when requesting it for the first time
2017-10-02 10:20:24 -07:00
Sam Gateau
68046ae4e3
Merge pull request #11491 from jherico/dev/disable_watchdog
...
Disable watchdog with environment variable
2017-10-02 10:19:32 -07:00
samcake
fc2329193e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 10:15:38 -07:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
vladest
07ba2cce5b
Merge branch 'master' into login_dialog_rework
2017-10-02 18:24:12 +02:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
Zach Fox
2783293d24
Merge pull request #11490 from vladest/fix_walletsetup_focus
...
Remove mouse area for text fields. use activeFocusOnPress property in…
2017-10-02 08:38:04 -07:00
Sam Gateau
ec10d38983
more cleaning
2017-10-01 22:28:04 -07:00
David Rowe
829cc8e5e6
Merge branch 'master' into vr-edit-a
2017-10-02 17:08:27 +13:00
Sam Gateau
6c510bc18f
fine tuning the changes to respect clean up
2017-10-01 20:05:48 -07:00
samcake
0cbf19bcf1
Removing comments
2017-10-01 17:47:35 -07:00
samcake
aa10c29609
Cleaning up the changed code
2017-10-01 17:16:10 -07:00
samcake
da4de38e91
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-01 15:01:18 -07:00
SamGondelman
572986bfad
fix modeloverlay visible change
...
(cherry picked from commit 0bb27a7165
2017-10-01 13:40:00 -07:00
Sam Gateau
44cc6deac2
moving render specific code from Application.cpp to Application_render.cpp
2017-10-01 12:55:44 -07:00
vladest
ad32e7bdf5
Merge branch 'master' into login_dialog_rework
2017-10-01 19:27:23 +02:00
vladest
9a00468ea9
semicolons, yes
2017-10-01 19:21:30 +02:00
vladest
feafd441b1
Make sure keyboard will be rised after lowering on another click
2017-10-01 18:54:07 +02:00
vladest
c3bc67b72d
Merge branch 'master' into fix_walletsetup_focus
2017-10-01 18:24:38 +02:00
David Rowe
0daa5012ca
Enable toolbar and tablet icons to load from local script directory
2017-09-30 15:00:15 +13:00
SamGondelman
0bb27a7165
fix modeloverlay visible change
2017-09-29 17:48:59 -07:00
samcake
577378f539
Adding stuff that seems to break?
2017-09-29 17:45:10 -07:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
Zach Fox
e6ea76eefe
Tiny language fix - Thanks Cain!
2017-09-29 15:44:44 -07:00
Zach Fox
4668294389
Fix login flow regression
2017-09-29 15:25:24 -07:00
Zach Fox
bbbce96407
Fix gray securityimage
2017-09-29 14:30:02 -07:00
samcake
225d2bbbb4
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 13:47:37 -07:00
Zach Fox
63396a2fc3
WalletScriptingInterface; wallet status refactor
2017-09-29 13:42:04 -07:00
vladest
7f6773b1f4
Added semicolons
2017-09-29 21:12:21 +02:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
SamGondelman
3ae41b9b75
cleanup client and stats string
2017-09-29 11:34:35 -07:00
SamGondelman
f7af581c71
track traversal time, rename entity server stat
2017-09-29 11:34:35 -07:00
Andrew Meadows
fb3e74398f
don't invalidate viewFrustum sent to server
2017-09-29 11:34:35 -07:00
SamGondelman
247764b679
add total entity packets in stat (kbps)
2017-09-29 11:34:34 -07:00
SamGondelman
cbf82a6f2c
fix timeout for physics check
2017-09-29 11:34:34 -07:00
Andrew Meadows
171151b92a
use new form of MovingEntitiesOperator ctor
2017-09-29 11:34:32 -07:00
Brad Davis
a7d507e9fd
Disable watchdog with environment variable
2017-09-29 10:44:04 -07:00
Seth Alves
e7705175a3
Merge pull request #11481 from ZappoMan/animatedOverlays
...
support animation of model overlays
2017-09-29 10:26:24 -07:00
ZappoMan
9c81bc5479
CR fixes
2017-09-29 09:52:30 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
samcake
3265fe62ad
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 09:09:27 -07:00
vladest
01a0b26b90
Remove mouse area for text fields. use activeFocusOnPress property instead
2017-09-29 17:14:35 +02:00
vladest
d3cd034d61
Cleanup
2017-09-29 16:33:52 +02:00
vladest
174287c5f5
Merge branch 'master' into login_dialog_rework
2017-09-29 15:57:27 +02:00
Atlante45
af69222fdb
Fix icon name change
2017-09-28 18:34:42 -07:00
samcake
e637842f8a
Separating some of the code sepecific to render in its own cpp
2017-09-28 17:45:50 -07:00
Zach Fox
a1ae13489e
Slight changes to tutorial
2017-09-28 16:41:29 -07:00
Zach Fox
4814f277c1
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-09-28 16:07:32 -07:00
ZappoMan
be7729b276
support animation of model overlays
2017-09-28 15:14:59 -07:00
Zach Fox
2cff5c1fa6
First time Purchases tutorial
2017-09-28 15:12:55 -07:00
samcake
c112a3baf1
Seting up of camera and avatar correctly in game loop, not in render loop
2017-09-28 15:09:49 -07:00
Zach Fox
66be558a04
My Items Interface
2017-09-28 14:04:57 -07:00
Ryan Huffman
ff019d6195
Fix extension detection when tracking asset uploads
2017-09-28 13:56:49 -07:00
vladest
4023c40149
Cleanup
2017-09-28 22:55:01 +02:00
Zach Fox
3a537cdcc3
Make usernameDropdown collapse when clicking anywhere outside it
2017-09-28 13:21:55 -07:00
Zach Fox
3742ccbdd3
Fix keyboard focus during setup while tip is up
2017-09-28 13:12:42 -07:00
Zach Fox
751dca0761
styling updates for purchases
2017-09-28 13:06:37 -07:00
Zach Fox
68c08969ae
Update Purchases
2017-09-28 12:49:38 -07:00
Andrew Meadows
60fe9ec5e9
Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928
...
fix interface crash in Debug build
2017-09-28 12:41:12 -07:00
vladest
c3225c2c76
Make fix precisely for Linux
2017-09-28 21:38:03 +02:00
vladest
769c57208c
Signup ready
2017-09-28 21:35:41 +02:00
Zach Fox
b5dc6b791b
Fix commerce setting handle
2017-09-28 10:42:45 -07:00
Zach Fox
8d74487393
Use edition number; fix CONFIRMED timer
2017-09-28 10:25:05 -07:00
samcake
2f9779c02c
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-28 10:08:20 -07:00
Seth Alves
912305fd4b
Merge pull request #11476 from ElderOrb/case7925
...
7925 Create Mode: keyboard focused entry field is not visible
2017-09-28 10:03:28 -07:00
Zach Fox
b6ce294bb2
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-09-28 09:38:48 -07:00
Zach Fox
65a63ea8c3
Remove dead OS X code
2017-09-28 09:38:22 -07:00
samcake
b1daae0150
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-28 09:16:02 -07:00
Ryan Huffman
97bf093cab
Fix ambiguous conversion in AssetMappingScriptingInterface
2017-09-28 08:16:54 -07:00
vladest
0a9bebeefc
Added workaround to enable menu bar under Linux
2017-09-28 15:34:56 +02:00
vladest
8d23bf38ac
Merge branch 'master' into login_dialog_rework
2017-09-28 14:55:12 +02:00
vladest
4f907aba1e
sign in reworked
2017-09-28 14:49:48 +02:00
beholder
338a230de9
reduced delay to improve user experience
2017-09-28 13:01:14 +03:00
beholder
1021aa1a0e
re-center focused eleemnt even if keyboard was already visible
2017-09-28 12:59:36 +03:00
samcake
40ca98214b
Moving all of the camera and avatar eval to game loop
2017-09-27 17:58:43 -07:00
Zach Fox
60823903cf
You own X others
2017-09-27 17:05:07 -07:00
Zach Fox
7b7e0bc78b
Updated Recent Activity
2017-09-27 16:35:35 -07:00
samcake
29da0c663f
Merge branch 'master' of https://github.com/highfidelity/hifi into flash
2017-09-27 16:21:55 -07:00
Sam Gateau
287f4f1d71
Merge pull request #11466 from SamGondelman/mirrorCrash
...
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
Atlante45
eb06c33187
Naming coding standard fix
2017-09-27 15:32:53 -07:00
samcake
3bd6e35e30
Fixing the broken on hud overlay's render transform
2017-09-27 15:19:21 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
Andrew Meadows
26ea7034d8
prevent zero scale for Line3DOverlay
2017-09-27 14:30:50 -07:00
Andrew Meadows
b602c18475
prevent zero dimensions for Volume3DOverlay
2017-09-27 14:30:50 -07:00
beholder
00c3dcee2f
7925 Create Mode: keyboard focused entry field is not visible
...
note: changed the way of calculation scroll value after showing virtual keyboard.
Now it doesn't require KEYBOARD_HEGHT and will always try to position focused element at vertical center of the client area
2017-09-28 00:28:54 +03:00
SamGondelman
553829f7ab
make sure FadeEffect dependency is created early
2017-09-27 11:58:35 -07:00
beholder
3677718e48
7926 Create Mode: the keyboard tray is not styled correctly
2017-09-27 21:33:18 +03:00
Sam Gateau
88097bb39f
Merge pull request #11447 from AndrewMeadows/lod-auto-adjust
...
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
2017-09-27 10:51:46 -07:00
Ryan Huffman
88810d28c1
Add activity logging for uploading_asset
2017-09-27 09:33:11 -07:00
Ryan Huffman
014a7bc9b0
Fix bytes downloaded stat tracking
2017-09-27 09:33:10 -07:00
Atlante45
73483eef94
Update information sentence
2017-09-26 19:19:34 -07:00
Atlante45
bf984e8d1a
Fix tablet asset browser
2017-09-26 19:05:36 -07:00
Atlante45
03bd887f9a
Re-sync files
2017-09-26 18:42:50 -07:00
Atlante45
dda715e171
Update TabletAssetServer
2017-09-26 18:25:20 -07:00
