Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-19 17:16:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49797 commits 25 branches 0 tags 1.1 GiB
Commit graph

18750 commits

Author SHA1 Message Date
Zach Fox
5b77202c52 Popups wow! 2016-12-21 12:48:25 -08:00
Zach Fox
db2da8f06b Great cleanup 2016-12-21 12:48:25 -08:00
Zach Fox
7999e14ecf Kinda screwed things up by changing styles 2016-12-21 12:48:25 -08:00
Zach Fox
feafc16833 Frequent checkpoints are good. 2016-12-21 12:47:38 -08:00
Zach Fox
e7c2229b2c More progress 2016-12-21 12:46:23 -08:00
Zach Fox
deb40f67df Steady progress 2016-12-21 12:46:23 -08:00
Zach Fox
46c787512e Working 2016-12-21 12:46:23 -08:00
Zach Fox
5996228622 Starting off strong. 2016-12-21 12:46:23 -08:00
Brad Hefta-Gaub
e6a20102d4 debug window enhancements 2016-12-21 11:31:34 -08:00
Andrew Meadows
2209c0ebba remove debug hook for dumping stats to logs 2016-12-21 10:55:59 -08:00
Andrew Meadows
3830649990 remove debugging and profiling 2016-12-21 10:55:59 -08:00
Andrew Meadows
8ab6974233 optimizations for processing avatar joint data 2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
08cfd8a40e Merge pull request #9208 from ZappoMan/addViewFrustumToAvatarMixer 
Optimize avatar-mixer bandwidth for out of view avatars
 2016-12-21 10:22:56 -08:00
samcake
909f24c3e1 Merge pull request #9245 from AndrewMeadows/avatars-per-second 
measure avatar processing stats in Chrome trace framework
 2016-12-21 09:13:41 -08:00
Brad Hefta-Gaub
be62df2001 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-21 08:59:29 -08:00
Brad Hefta-Gaub
5e65e3991c CR feedback 2016-12-20 21:03:10 -08:00
Ryan Huffman
8325c96c0c Update oculus hand controller tip labels 2016-12-20 18:01:53 -08:00
Ryan Huffman
3d84ccd4f0 Update oculus hand controller help image 2016-12-20 18:01:53 -08:00
Ryan Huffman
0b2f60fb27 Update tutorial to use new trigger configuration for touch 2016-12-20 18:01:53 -08:00
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00
Andrew Meadows
e43efa74de use sampled counter 2016-12-20 16:16:31 -08:00
Dante Ruiz
fa761af1a6 update#2 2016-12-20 15:39:17 -08:00
Dante Ruiz
8698ee61cd commit update 2016-12-20 15:39:17 -08:00
Andrew Meadows
fa18d548f7 use proper category for NumAvatarsPerSec trace 2016-12-20 15:28:25 -08:00
Andrew Meadows
4d711d869c cleanup 2016-12-20 14:45:11 -08:00
Anthony J. Thibault
01a96347a5 Updated Web3dOverlay.cpp to work with TabletRoot.qml 2016-12-20 14:40:29 -08:00
Andrew Meadows
991a61b722 fix data collection for AvatarsPerSec 2016-12-20 14:01:03 -08:00
Andrew Meadows
1788d19260 remove some debug code 2016-12-20 14:00:25 -08:00
David Kelly
7750e86c13 Only send machine fingerprint when not logged in 
While at it, no longer grabbing it at all when starting up, as that
was just a dev thing.  Should consider not sending MAC address too, but
we may revisit that later.
 2016-12-20 13:47:58 -08:00
Anthony J. Thibault
ec38c4e319 Merge remote-tracking branch 'upstream/tablet-ui' into tablet-ui 2016-12-20 13:43:06 -08:00
Anthony J. Thibault
84db58dbc6 Make tablet.qml work on Web3DOverlay 2016-12-20 12:16:11 -08:00
Andrew Meadows
03114fa610 add AvatarsPerSec trace stats 2016-12-20 11:45:21 -08:00
Brad Hefta-Gaub
9b11c7cc9c Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/networking/src/NodeList.cpp
 2016-12-20 10:46:57 -08:00
Brad Hefta-Gaub
2079b1ff7e cleanup comments 2016-12-20 10:45:36 -08:00
Howard Stearns
9aad93465d Merge pull request #9227 from howard-stearns/sessionDisplayNames 
Session display names
 2016-12-20 10:07:05 -08:00
Seth Alves
ab3c833dd5 diff minimization 2016-12-20 09:23:21 -08:00
Seth Alves
36e843178a diff minimization 2016-12-20 09:21:41 -08:00
Brad Hefta-Gaub
6a7fa63327 classify ScriptEngine errors better, and send them as signal to JS 2016-12-20 09:00:01 -08:00
Seth Alves
d8ee4d86b0 merge from upstream 2016-12-20 08:43:19 -08:00
Seth Alves
dc996bee95 merge from upstream 2016-12-20 08:06:01 -08:00
samcake
28ed61cc97 Introducing a fix for the overlayered model drawn in front 2016-12-20 07:45:35 -08:00
Zach Fox
a18f9dbe90 PR comments; need particular fix on Master for full QA 2016-12-20 07:45:35 -08:00
Zach Fox
ba240854a7 Comments and clarity 2016-12-20 07:45:35 -08:00
Zach Fox
95e2f0687d It's working! Untested on human avatars. 2016-12-20 07:45:35 -08:00
Zach Fox
54774950d2 Super close 2016-12-20 07:45:35 -08:00
Zach Fox
9c09ec6755 Checkpoint 2016-12-20 07:45:35 -08:00
Brad Davis
bfc4a6e038 Fix stat tracker missing in agents 2016-12-20 07:45:35 -08:00
Ryan Huffman
9a517d7257 Update req tutorial version for Oculus Touch 2016-12-20 07:45:35 -08:00
Ryan Huffman
a72f8cac0e Update to only send users to tutorial if they have Vive or Touch 2016-12-20 07:45:35 -08:00
Ryan Huffman
240dba5306 Fix oculus touch labels in tutorial 2016-12-20 07:45:35 -08:00
Ryan Huffman
74b07273d6 Update oculus touch labels to be emissive 2016-12-20 07:45:35 -08:00
Ryan Huffman
1ddc869c8e Fix emissive channel on touch models 2016-12-20 07:45:35 -08:00
Ryan Huffman
495a61ced4 Update right joystick mesh 2016-12-20 07:45:35 -08:00
Ryan Huffman
ac33bf4d4a Fix right touch joystick 2016-12-20 07:45:35 -08:00
Ryan Huffman
335e91e4a6 Update touch controller tips 2016-12-20 07:45:35 -08:00
Ryan Huffman
b835fc7ada Add touch controller support to ControllerDisplay 2016-12-20 07:45:35 -08:00
Ryan Huffman
b6759fb1d1 Extend HMD scripting interface to check subdevices 2016-12-20 07:45:35 -08:00
Ryan Huffman
4e29d7a2b8 Add send-to-tutorial logic for Oculus Touch 2016-12-20 07:45:35 -08:00
Brad Davis
d0d6b1f87e tracing polish 2016-12-20 07:45:35 -08:00
Andrew Meadows
e03e57a480 adding profile stats relating to avatar CPU costs 2016-12-20 07:45:35 -08:00
Ryan Huffman
21bab49f79 Add chrome tracing support 2016-12-20 07:45:35 -08:00
David Rowe
1b8108bfba Update from Seth 2016-12-20 07:45:35 -08:00
David Rowe
898372e841 Fix crash after manually closing Clara download status message box 2016-12-20 07:45:35 -08:00
David Rowe
6d0bb3bdc7 Make manually closing message box code more correct 2016-12-20 07:45:35 -08:00
Zach Pomerantz
13d3ffd47c change render forward flag to HIFI_... 2016-12-20 07:45:35 -08:00
David Rowe
3ebfc130c0 Scale all imported Clara models to have max dimension of exactly 1m 2016-12-20 07:45:35 -08:00
David Rowe
d933b3506f Fix Clara download status message box not auto-closing 2016-12-20 07:45:35 -08:00
David Rowe
fa9aef8b22 Fix crashing if manually close Clara download status message box 2016-12-20 07:45:35 -08:00
David Rowe
7a9cf498dc Increase resize timeout to 5 mins to improve the odds of model rezzing 
Model needs to rez in order for its initial dimensions to be obtained
from FBX.
 2016-12-20 07:45:35 -08:00
David Rowe
a63beedff4 Rescale models if necessary to have their largest dimension be 1m 
Models are still rescaled beforehand if thought to be in cm.
 2016-12-20 07:45:35 -08:00
David Rowe
e9dbb32277 Handle unzip failure 2016-12-20 07:45:35 -08:00
David Rowe
77676436a2 Missing comment close 2016-12-20 07:45:35 -08:00
David Rowe
5bb497d258 Initial fix for detaching tablet UI 2016-12-20 07:45:35 -08:00
David Rowe
0ec1dc6c85 Log requested ATP mapping of model upload 2016-12-20 07:45:35 -08:00
David Rowe
d02e217b49 Don't make downloaded Clara.io models dynamic 2016-12-20 07:45:35 -08:00
David Rowe
932b05c1ba Rework Clara.io download user messaging to have no user interaction 2016-12-20 07:45:35 -08:00
David Rowe
c4ff129f86 Inform user if can't do Clara.io download because can't write to ATP 2016-12-20 07:43:48 -08:00
David Rowe
6680395e97 Add scriptEvent message to web3d overlay event bridge 2016-12-20 07:43:48 -08:00
howard-stearns
641f98589a don't keep selection while things are disappearing 2016-12-20 07:43:48 -08:00
howard-stearns
db68a6adcd fix broken search for myself 2016-12-20 07:43:48 -08:00
howard-stearns
07ab771c2b update canKick whenever we get new data, instead of just at first use. 2016-12-20 07:43:48 -08:00
howard-stearns
d0cdd4d5c1 missing the ban button 2016-12-20 07:43:48 -08:00
howard-stearns
0e9b1b45f4 Don't show admin columns if you can't kick. 2016-12-20 07:43:48 -08:00
howard-stearns
5a97156151 no debug printing 2016-12-20 07:43:48 -08:00
howard-stearns
946d9aa346 checkpoint 2016-12-20 07:43:48 -08:00
howard-stearns
7e7ce0c103 checkpoint 2016-12-20 07:43:48 -08:00
Howard Stearns
b6b80fb9c1 checkpoint 2016-12-20 07:43:48 -08:00
David Rowe
f3899736e8 Auto-close Clara model download progress box when model added to world 2016-12-20 07:43:48 -08:00
David Rowe
825225fcb2 Make Clara.io models grabbable and dynamic by default 2016-12-20 07:43:48 -08:00
David Rowe
39d01b8755 Raise and lower keyboard on password fields 2016-12-20 07:43:48 -08:00
David Rowe
591bc245bd Fix model being left invisible if not auto-resized 2016-12-20 07:43:48 -08:00
David Rowe
a4ff4f61b9 Increase auto-resize timeout for Clara.io asset download from ATP 2016-12-20 07:43:48 -08:00
David Rowe
5b8a9c0bcd Add extra logging for Clara.io asset resizing 2016-12-20 07:43:48 -08:00
howard-stearns
8d300eac76 pal prototype 2016-12-20 07:43:48 -08:00
David Rowe
25651800dd Code review 2016-12-20 07:43:48 -08:00
David Rowe
9f4df9bd07 Fix model auto-scaling to 1% not being seen by observers take 2 2016-12-20 07:43:48 -08:00
David Rowe
58edbf4eaf Fix model auto-scaling to 1% not being seen by observers 2016-12-20 07:43:48 -08:00
Seth Alves
67093dc519 don't flutter tablet when menu button is pressed. start on a stylus 2016-12-20 07:43:48 -08:00
David Rowe
7a36e4eed8 Fix keyboard focus when switch highlight between overlays and entities 2016-12-20 07:42:21 -08:00
David Rowe
d13e990ebe Rescale large Clara.io models to 1% instead of 10% 2016-12-20 07:42:21 -08:00
David Rowe
0accdddc8f Fix Web overlay x, y coordinate calcs 2016-12-20 07:42:21 -08:00
David Rowe
17831e3b6a Fix Overlays.getProperty method not returning value to script 2016-12-20 07:42:21 -08:00
David Rowe
f749c76ced First pass at controller interaction with 3D Web overlay 2016-12-20 07:42:21 -08:00
David Rowe
367e758dc6 Fix compiler warning 2016-12-20 07:42:21 -08:00
David Rowe
d06a0ce9f5 Auto-resize Clara.io models if larger than 10m as likely in cm or mm 2016-12-20 07:42:21 -08:00
David Rowe
527757cd22 Add further user feedback on Clara download progress 2016-12-20 07:40:28 -08:00
David Rowe
4cbd64b75e Improve temporary download directory robustness 2016-12-20 07:40:28 -08:00
David Rowe
73df11bddf Fix build warnings 2016-12-20 07:40:28 -08:00
David Rowe
2216ab6def Delete redundant code 2016-12-20 07:40:28 -08:00
David Rowe
5843185683 Tidying 2016-12-20 07:40:28 -08:00
David Rowe
5fbdd64fff Handle Clara marketplace downloads 2016-12-20 07:40:28 -08:00
David Rowe
bebedd8e51 Add JavaScript event bridge for Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
767b3ea8e9 Add script injection to Web 3D overlay 2016-12-20 07:40:28 -08:00
David Rowe
e85bc50333 Tidying 2016-12-20 07:38:25 -08:00
David Rowe
44f36a9dae Highlight Web overlay with focus 2016-12-20 07:38:25 -08:00
David Rowe
92b72af71c Direct keyboard input to Web overlay when has focus 2016-12-20 07:38:25 -08:00
David Rowe
5a550e5fc9 Refactoring 2016-12-20 07:38:25 -08:00
David Rowe
aca0e15503 Add mouse hover handling to Web overlay 2016-12-20 07:38:25 -08:00
David Rowe
e3444e1861 Add mouse press, move, and release handling to Web overlay 2016-12-20 07:38:25 -08:00
David Rowe
5db2fad6ec Fix Web 3D overlay ray intersection then comment out for performance 
Per Image3DOverlay.
 2016-12-20 07:38:25 -08:00
David Rowe
ef488ec036 Get script injection working in new marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
5690bc30ea Automatically continue once Zip file is ready 2016-12-20 07:33:55 -08:00
David Rowe
e40b71b3dd Customize Clara item menu 2016-12-20 07:33:55 -08:00
David Rowe
c7c3dfef3e Fix up library link from Clara item page 2016-12-20 07:33:55 -08:00
David Rowe
f7503ba46c Display "image" option for each Clara marketplace item 2016-12-20 07:33:55 -08:00
David Rowe
1987719cfd Display Clara.io download information 2016-12-20 07:33:55 -08:00
David Rowe
9c2252bd7e Fix typo 2016-12-20 07:33:55 -08:00
David Rowe
43ebdf97cb Tidy UI text 2016-12-20 07:33:55 -08:00
David Rowe
6329b670c9 Improve error handling for case that don't have permissions 2016-12-20 07:33:55 -08:00
David Rowe
bf2bcc0b80 Add user feedback on download process 2016-12-20 07:33:55 -08:00
David Rowe
b672b7e177 Fix Clara download failing if move mouse after initiating download 2016-12-20 07:33:55 -08:00
David Rowe
e79f6b1203 Don't raise keyboard for non-text HTML input fields 2016-12-20 07:33:55 -08:00
David Rowe
196473f9fa Provide keyboard in marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
b3cc69d608 Inject keyboard raising and lowering script into marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
420f65b1aa Add keyboard control to marketplaces window 2016-12-20 07:33:55 -08:00
David Rowe
e41d178534 Default collision shap to hull per submesh instead of static 2016-12-20 07:33:55 -08:00
David Rowe
7f809083dc Use Clara.io API for FBX downloads 2016-12-20 07:33:55 -08:00
David Rowe
e1a135591f Code tidying 2016-12-20 07:33:55 -08:00
David Rowe
4cabf49b23 Handle duplicate Clara download asset names 2016-12-20 07:33:55 -08:00
David Rowe
0ccff32365 Delete temporary directory after content has been used 2016-12-20 07:33:55 -08:00
David Rowe
7e8fc12258 Automatically download Clara model to ATP and add to world 2016-12-20 07:33:55 -08:00
David Rowe
09ee7b1bd4 Hide brief flash of browser window used for download 2016-12-20 07:33:55 -08:00
David Rowe
a4b2077d5a Set auto adding for Clara downloads 2016-12-20 07:33:55 -08:00
David Rowe
467741f348 Add parameter that enables automatically adding download model to world 2016-12-20 07:33:55 -08:00
David Rowe
5f7a2f3b3c Canonical default browser URL 2016-12-20 07:33:55 -08:00
David Rowe
211cf7a81a Make Clara.io download more robust 2016-12-20 07:33:55 -08:00
Brad Hefta-Gaub
c65471e880 Merge branch 'master' of https://github.com/highfidelity/hifi into removeLogSpam 
Conflicts:
	libraries/script-engine/src/FileScriptingInterface.cpp
 2016-12-19 22:27:24 -08:00
Brad Hefta-Gaub
0c9ff87feb add support for an HMD script debug log window 2016-12-19 19:34:14 -08:00
Chris Collins
61c60fca2d Merge pull request #8968 from ctrlaltdavid/21089 
Clara.io marketplace improvements
 2016-12-19 18:21:45 -08:00