Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:53:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
57423 commits 75 branches 59 tags 1.2 GiB
Commit graph

21118 commits

Author SHA1 Message Date
Brad Hefta-Gaub
b063c2f45d Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission 
Cleanup OctreeSendThread::packetDistributor()
 2017-07-13 09:58:28 -07:00
NeetBhagat
11f8f5cffc Solve : implicit conversion from ‘float’ to ‘double’ issue 2017-07-13 18:26:52 +05:30
David Kelly
4b3cf5ee2e Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix 2017-07-12 16:50:51 -07:00
David Kelly
88a449c1af Fixes hmd preview when resizing 2017-07-12 16:49:26 -07:00
Zach Fox
dc1b4b5324 New icons 2017-07-12 16:48:04 -07:00
Zach Fox
8553277c56 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-12 14:18:50 -07:00
Cain Kilgore
43782a29c7 Avatar Scaler - WIP 2017-07-12 22:04:58 +01:00
Seth Alves
59ad3d50ec Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-12 12:45:58 -07:00
Seth Alves
ddf2312dc6 code review 2017-07-12 12:45:52 -07:00
Zach Fox
bd4fe416b4 Cleanup; no magic numbers for default cam params 2017-07-12 12:08:36 -07:00
Zach Fox
9fe6fbd811 View frustums are strange. 2017-07-12 11:37:18 -07:00
utkarshgautamnyu
6b969bc39d added code to record total number of ATP/HTTP/File bytes downloaded during session 
Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update Application.cpp

Update Application.cpp
 2017-07-12 11:13:13 -07:00
Andrew Meadows
364600c447 fix rendering of simulation ownership debug icons 2017-07-12 11:12:47 -07:00
Zach Fox
79cf242fc9 Make far clip plane distance equal to main camera's 2017-07-12 10:51:14 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Dante Ruiz
12206cf711 Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes 2017-07-12 16:56:25 +01:00
Tingjin
80916b62bb Remove unnecessary code 
Remove two lines of unnecessary code.
 2017-07-11 20:52:28 -07:00
Seth Alves
c52e7e180a use const AudioInjectorPointer& in some places 2017-07-11 19:42:03 -07:00
Seth Alves
dbd46fc4b8 Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-11 17:48:29 -07:00
Dante Ruiz
bedd0628b9 allowed tablet to toggle when a dialog is open 2017-07-12 00:51:07 +01:00
Zach Fox
d786820670 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-11 16:16:37 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Seth Alves
ead461dca7 Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-11 14:25:12 -07:00
Seth Alves
3670a04d8e switch bare pointers to AudioInjector objects to be QSharedPointers 2017-07-11 14:24:58 -07:00
Dante Ruiz
2f192fd48a added scroll fix for qt 5.6 2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613 fixed tablet scrolling 2017-07-11 21:16:13 +01:00
NeetBhagat
e08e9d6821 The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale. 2017-07-11 20:42:00 +05:30
NeetBhagat
1a47383d4f Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-11 19:23:46 +05:30
Zach Fox
ea62ef165c Fix image container background 2017-07-10 16:13:45 -07:00
Zach Fox
4a74522884 Ensure tablet button shows up; protections for controller mapping 2017-07-10 15:16:16 -07:00
David Kelly
fcf4bfd59a spacing issue 2017-07-10 13:25:33 -07:00
David Kelly
b87d69b15d Insure spectator camera preview is up when reopening tablet 2017-07-10 13:16:08 -07:00
druiz17
78ba2102f4 Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard 
Fixed goto hmd keyboard not entering text
 2017-07-10 12:50:01 -07:00
Seth Alves
d957b970dd Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal 
Add signal for avatar skeleton changing
 2017-07-10 11:35:24 -07:00
Dante Ruiz
89a072cfee fixed hmd keyboard for goto 2017-07-10 19:05:07 +01:00
David Kelly
1c9c36a8c8 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview 2017-07-10 10:22:31 -07:00
David Kelly
4843b91f47 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-10 09:50:17 -07:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange 
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
 2017-07-10 09:46:09 -07:00
NeetBhagat
378e85e9b2 Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-10 18:29:04 +05:30
NeetBhagat
dd2dbd9b39 Initial Commit to resolve problem :> When Max Avatar scale is set in Sandbox -> setting, take that value as default max value 2017-07-10 18:26:33 +05:30
Sam Gateau
4edea433ce Rename the _pipeline into _shapePipeline in the render::Args 2017-07-10 12:16:53 +02:00
Brad Davis
8043caa9e9 Merge pull request #10925 from jherico/overlay_performance 
Fix terrible script performance when rendering load is too high
 2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6 More tweaks for improved script performance 2017-07-07 22:02:56 -07:00
Brad Davis
148eece065 Tweak frame timing to avoid overloading the main thread 2017-07-07 21:00:33 -07:00
Brad Davis
7e9ea596a0 Add more efficient overlay getters, don't use blocking calls 2017-07-07 21:00:31 -07:00
Zach Fox
d0c521d7b4 Add clarifying comment. 2017-07-07 19:19:48 -07:00
Stephen Birarda
420e9233b6 Revert "fix for invisible avatars after radius ignore" 2017-07-07 16:50:28 -07:00
druiz17
6e44c95d53 Merge pull request #10906 from druiz17/audio-qml-fix 
Made the output audio listview dynamically change height base on content size
 2017-07-07 16:48:15 -07:00
Stephen Birarda
f07ce6d294 Merge pull request #10835 from birarda/bug/invisible-avatars 
fix for invisible avatars after radius ignore
 2017-07-07 16:06:44 -07:00
Zach Fox
e537c494e5 Prevent Image3DOverlays from drifting 2017-07-07 16:04:08 -07:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
Zach Fox
3d14d3755e Merge pull request #10898 from 1P-Cusack/21425 
Add View->Enter First Person Mode in HMD checkbox.
 2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5 Merge pull request #10878 from mnafees/21355 
CR for Job #21355 - Clean up and remove menu hotkeys
 2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab Default 'Enter First Person Mode in HMD' to true. 2017-07-07 15:35:32 -04:00
Liv
060e3a9c5a Add signal for avatar skeleton changing 2017-07-07 11:48:12 -07:00
Zach Fox
e222753aac Merge pull request #10911 from zfox23/PAL_adminFix2 
Set admin status even if QML can't find user in PAL
 2017-07-07 10:24:53 -07:00
Seth Alves
fc8b7c7cc5 Merge pull request #10904 from druiz17/window-root-spam 
fixed log spamming from windowRoot.qml in toolbar mode
 2017-07-07 07:17:08 -07:00
Seth Alves
81cc46beb4 Merge pull request #10909 from jherico/overlay_crashes 
Fixing overlay crashes, for real
 2017-07-07 07:11:52 -07:00
Sam Gateau
156c20d01e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-07-07 10:58:05 +02:00
Zach Fox
ee9cdaff90 Set admin status even if QML can't find user in PAL 2017-07-06 23:26:40 -07:00
NeetBhagat
685b1c2445 Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-07 11:30:54 +05:30
Brad Davis
f8b76d65ab Fixing overlay crashes, for real 2017-07-06 18:01:26 -07:00
Zach Fox
1afa2d3775 Spectator camera icon 2017-07-06 16:24:50 -07:00
David Kelly
b41c470064 first cut, still stereo 2017-07-06 15:59:24 -07:00
Dante Ruiz
1ac415aa14 dynamic listview height 2017-07-06 23:50:32 +01:00
druiz17
b4182fe7ac Merge pull request #10899 from druiz17/calibration-update-2.0 
Updates to the Calibration UI
 2017-07-06 14:24:45 -07:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
Dante Ruiz
b0130896d1 fixed spamming from windowRoot.qml 2017-07-06 22:01:08 +01:00
Dante Ruiz
1fcb3b32d6 fixed letter cap 2017-07-06 20:55:19 +01:00
Seth Alves
0374d24b15 Merge pull request #10901 from druiz17/goto-keyboard-fix 
Fixed the keyboard not showing  up for goto in HMD mode
 2017-07-06 12:46:13 -07:00
LaShonda Hopper
85111131da [Worklist #21420] Resolves issue where domain changes didn't refresh the icon (details below). 
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	modified:   interface/src/Application.cpp
	modified:   scripts/system/edit.js
 2017-07-06 15:27:15 -04:00
Dante Ruiz
2d876377d5 keyboard know disappears when you click of the address line 2017-07-06 20:04:44 +01:00
Dante Ruiz
de5802418f fixed some keybaord logic 2017-07-06 19:27:48 +01:00
Dante Ruiz
4e3dba1767 goto HMD keyboard fix 2017-07-06 19:12:52 +01:00
Dante Ruiz
9e4b5693c7 fixed merge conflicts 2017-07-06 18:49:46 +01:00
anshuman64
e384f6d1b7 Merge pull request #10866 from druiz17/vive-in-desktop 
Allowing Vive controllers and trackers to be used in desktop mode
 2017-07-06 10:40:56 -07:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-06 09:58:00 -07:00
Dante Ruiz
6e1f9d275c chnaged default head offset 2017-07-06 17:54:06 +01:00
David Kelly
1ccf0da7d8 Merge pull request #10897 from davidkelly/dk/cacheSwitchFix 
redo cache switch
 2017-07-06 09:53:01 -07:00
Dante Ruiz
258c21838e finished calibration-ui updates 2017-07-06 17:32:40 +01:00
Andrew Meadows
4fad9d9b1a Merge pull request #10858 from jherico/trace_cores 
Additional threaded tracing of CPU cores
 2017-07-06 08:23:21 -07:00
LaShonda Hopper
9cae868492 [Worklist #21420] Implement Create button disabled state (details below). 
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.

* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.

* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	new file:   interface/resources/icons/tablet-icons/edit-disabled.svg
	modified:   scripts/system/edit.js
 2017-07-06 10:53:46 -04:00
David Kelly
936c21e849 remove unnecessary cacheDir member 2017-07-06 07:24:58 -07:00
Atlante45
95abbd0ad4 Prevent Interface from trying to send packets bigger than an MTU 2017-07-05 17:08:04 -07:00
David Kelly
4a22fbca1b redo cache switch 2017-07-05 17:01:31 -07:00
Dante Ruiz
6c15dffb9d added new glyph 2017-07-06 00:45:59 +01:00
Zach Fox
39bdc20b4f On checkbox language change 2017-07-05 16:13:36 -07:00
Zach Fox
f6583a1b87 Use correct text color for checkboxes 2017-07-05 14:46:59 -07:00
Zach Fox
0af53bb4a5 Instructions and cool static :) 2017-07-05 14:46:59 -07:00
Zach Fox
aea5779ed6 When a display texture isn't set, show preview instructions 2017-07-05 14:46:58 -07:00
Brad Davis
7f1bc07d04 Trying to fix overlay crashes again 2017-07-05 14:30:01 -07:00
David Kelly
89c05244bf remove unnecessary extra update() calls 2017-07-05 13:24:31 -07:00
David Kelly
85813ac908 render issue fixes 2017-07-05 11:29:34 -07:00
Dante Ruiz
b86a8b8338 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-05 18:27:33 +01:00
Zach Fox
44cb48b17d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-05 09:59:57 -07:00
NeetBhagat
440b941730 Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big 2017-07-05 18:47:13 +05:30
Mohammed Nafees
eb354a4333 Cleanup menu shortcut keys 2017-07-05 14:50:48 +05:30
Seth Alves
fad686571a Merge pull request #10874 from jherico/overlay_mutex 
Restore mutex in overlay interface
 2017-07-03 17:25:42 -07:00
Zach Fox
fcc131187d Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup 
Spectator Camera position/orientation update speedup
 2017-07-03 16:44:12 -07:00