Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-03 22:43:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
48764 commits 76 branches 59 tags 1.2 GiB
Commit graph

18299 commits

Author SHA1 Message Date
Atlante45
f8be4227d9 Fix Blast screen typos 2016-11-14 12:06:25 -08:00
Howard Stearns
fac5d1e12e group snapshots by place 2016-11-12 17:00:54 -08:00
Howard Stearns
17428d7ecb tab-like filtering of suggestions by type 2016-11-12 15:23:11 -08:00
Howard Stearns
fcbf4f421a no scroll margins 2016-11-12 10:04:15 -08:00
Chris Collins
0876dbc809 Merge pull request #9050 from sethalves/last-edited-by 
lastEditedBy property for entities
 2016-11-11 16:02:18 -08:00
Brad Hefta-Gaub
0dc7f0bf17 Merge pull request #9055 from jherico/fix_stats 
Fix buffer count in stats display
 2016-11-11 13:31:55 -08:00
Brad Davis
0aec9400c7 Fix buffer count in stats display 2016-11-11 12:54:19 -08:00
Chris Collins
b9b90cc646 Merge pull request #9047 from jherico/stutter 
Add stutter tracking
 2016-11-11 11:39:00 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
5629db9109 Merge pull request #9049 from birarda/max-min-av-scale 
add a min/max avatar scale in domain-server settings
 2016-11-11 06:11:02 -08:00
Brad Hefta-Gaub
a90a0fe8ba Merge pull request #8976 from druiz17/FixMenuOutOfView 
Fixed menu out of view with HMD and Xbox controller
 2016-11-10 18:49:34 -08:00
Brad Hefta-Gaub
6db3556dc5 Merge pull request #9048 from howard-stearns/disable-viewpoint-menus-in-hmd 
Disable viewpoint menus in hmd
 2016-11-10 17:52:50 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
Stephen Birarda
88c63332de protect flipped min/max scale in avatar mixer settings 2016-11-10 16:21:48 -08:00
Brad Davis
16060d50af Merge pull request #9041 from jherico/disable_incremental 
Remove incremental texture transfers
 2016-11-10 15:43:20 -08:00
Stephen Birarda
272d0c845e add clarifying comments about target scale changes 2016-11-10 15:25:15 -08:00
Stephen Birarda
d5722c1654 fix clamping of scale and DRY it up 2016-11-10 15:03:13 -08:00
howard-stearns
4d18a3cc3d expose menu enablement to javascript 2016-11-10 15:01:06 -08:00
Stephen Birarda
53769f4edf change scale for avatar if domain limited scale changes 2016-11-10 14:58:04 -08:00
Stephen Birarda
9fdde49d14 clamp target scale changes on both ends 2016-11-10 14:54:42 -08:00
Stephen Birarda
6f442a74b1 request settings from agents and debug results 2016-11-10 14:43:15 -08:00
Stephen Birarda
77ede81fc9 limit MyAvatar scale to limits from domain settings 2016-11-10 13:27:13 -08:00
Brad Davis
c7d68aa9cf Add stutter stat logging 2016-11-10 13:15:35 -08:00
Brad Davis
90f55f0cd5 Add stutter tracking 2016-11-10 11:56:38 -08:00
Brad Hefta-Gaub
ff559aa4a1 Merge pull request #9042 from hyperlogic/feature/jsdoc 
Generate JS documentation from comments in C++ source
 2016-11-10 10:17:39 -08:00
Brad Davis
db98a742b6 Remove incremental transfers 2016-11-10 08:35:35 -08:00
Anthony J. Thibault
839b1a3c5e Added some jsdoc comments to the C++ source 2016-11-09 18:09:10 -08:00
samcake
f5fd4bf8d1 Merge pull request #9014 from jherico/texture_derez 
Re-enable downsampling for non-sparse textures
 2016-11-09 17:18:03 -08:00
Brad Hefta-Gaub
770bf35d2b CR feedback 2016-11-09 14:31:18 -08:00
Brad Hefta-Gaub
cf3d1011f4 remove scripts from avatar attached entities for other avatars 2016-11-09 12:26:57 -08:00
Brad Davis
192c72ff99 Update menu, initial state for texture management 2016-11-09 12:09:25 -08:00
Howard Stearns
666d2dd2fc Merge pull request #9031 from davidkelly/dk/2178 
Log snapshot upload and user story creation errors
 2016-11-08 12:11:16 -08:00
Howard Stearns
0a56f7c4fe Merge pull request #9009 from howard-stearns/fix-numeric-keyboard-for-window-prompt 
fix numeric keyboard for hmd Window.prompt
 2016-11-08 12:05:13 -08:00
David Kelly
1766ebab2c Added a bit more logging 2016-11-08 09:08:34 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable 
Update master with Stable hotfix
 2016-11-07 18:48:54 -08:00
David Kelly
3105299670 Log snapshot upload and user story creation errors 
Plus, if the body of the error is empty, put something in there so
the script will not think it was successful.
 2016-11-07 18:13:10 -08:00
Chris Collins
eec8e2f19b Merge pull request #9000 from samcake/punk 
Add Frame Timing and GPU memory to the Stats and user activity log
 2016-11-07 16:17:20 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
Seth Alves
24556fc70d Merge pull request #8980 from huffman/feat/default-to-hmd 
Update interface to default to HMD display plugin
 2016-11-07 13:36:39 -08:00
Dante Ruiz
e22c36b4b7 fixed menu pop up delay 2016-11-07 17:16:24 +00:00
Andrew Meadows
ccdf383151 Merge hifi/master into hifi/out-of-body-experience 2016-11-07 08:24:26 -08:00
howard-stearns
84eb1721e7 fix numeric keyboard for hmd Window.prompt 2016-11-04 17:02:14 -07:00
Atlante45
ae29fe8ab2 Logging improvements 2016-11-04 14:26:19 -07:00
samcake
449add6b34 Fix bad variable initialization 2016-11-04 13:29:27 -07:00
Ryan Huffman
0cec62b3a3 Revert "Update interface to default to HMD display plugin" 
This reverts commit bbef071723.
 2016-11-04 12:27:15 -07:00
Ryan Huffman
0dac2c999e Revert "Remove unused 'first' variable" 
This reverts commit 26e0d02d60.
 2016-11-04 12:27:04 -07:00
Ryan Huffman
3ad9c1a797 Add check to go into HMD on first run if available 2016-11-04 12:26:20 -07:00
samcake
76aa541d4a Adding the frame gpu and batch timer 2016-11-04 11:49:52 -07:00
Andrew Meadows
836aad7d0b Merge pull request #8997 from howard-stearns/raise-desktop-when-showing-it 
raise desktop when showing it
 2016-11-04 10:45:05 -07:00
samcake
3db1831841 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2016-11-04 09:59:28 -07:00
samcake
7655f906f1 Starting adding a timer for the frame 2016-11-03 19:26:30 -07:00
howard-stearns
c5ee1941d1 raise desktop when showing it 2016-11-03 17:02:47 -07:00
Brad Hefta-Gaub
7cca8f0a66 Merge pull request #8993 from samcake/blue 
Prevent sparse texture on AMD gpus for now
 2016-11-03 16:48:52 -07:00
samcake
1086585559 fixing the test to actually capture ati correctly and add the report to the ui 2016-11-03 15:15:05 -07:00
Clément Brisset
00a94bdd6d Merge pull request #8974 from huffman/feat/help-select-xbox-tab 
Update help window to auto select xbox or vive controller tab on availability of device
 2016-11-03 14:42:23 -07:00
Brad Hefta-Gaub
206f1ead1a Merge pull request #8990 from howard-stearns/centered-toolbar 
centered toolbar
 2016-11-03 14:18:32 -07:00
howard-stearns
b6e440f891 delete this and formatting 2016-11-03 13:26:50 -07:00
howard-stearns
7c45a78cb0 Merge branch 'master' of https://github.com/highfidelity/hifi into use-snapshot-data-from-file 2016-11-03 13:17:47 -07:00
howard-stearns
3a072b5bf9 tell desktop about preference changes 2016-11-03 12:17:28 -07:00
howard-stearns
6aad78c8e8 Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar 2016-11-03 11:23:47 -07:00
Zach Fox
9a22c29788 Get ready for merge 2016-11-03 11:20:08 -07:00
Zach Fox
e9e1d0cb2f Remove erroneous exclamation mark 2016-11-03 11:10:32 -07:00
Zach Fox
b74c1d3476 tabs to spaces 2016-11-03 10:42:15 -07:00
Zach Fox
a12e0325bf Making progress... 2016-11-03 10:39:55 -07:00
howard-stearns
f3d4821579 constrain toolbar based on setting. (ui for settings to come.) 2016-11-03 10:39:53 -07:00
howard-stearns
10309cc699 Merge branch 'master' of https://github.com/highfidelity/hifi into centered-toolbar 2016-11-02 15:38:24 -07:00
howard-stearns
90ebbb79c1 centered toolbar 2016-11-02 15:37:53 -07:00
Ryan Huffman
3d160cca75 Merge pull request #8969 from huffman/feat/task-manager-app-name 
Add "High Fidelity" to sandbox and interface description in Windows Task Manager
 2016-11-02 14:21:19 -07:00
Dante Ruiz
a948e03ed8 changed old icon to new icon 2016-11-02 08:23:10 -07:00
Ryan Huffman
26e0d02d60 Remove unused 'first' variable 2016-11-01 16:40:41 -07:00
Ryan Huffman
bbef071723 Update interface to default to HMD display plugin 2016-11-01 16:23:53 -07:00
Zach Fox
b98c6cb50f Change 'Snapshot' to 'snapshot' and use smaller font 2016-11-01 14:49:18 -07:00
howard-stearns
52cc03c5a2 Get snapshot location data from file, which now uses shareable place info. 2016-11-01 14:44:39 -07:00
Zach Fox
c4b59eafbb Add 'Snapshot' text. My very first commit! 2016-11-01 14:09:25 -07:00
Ryan Huffman
3147ea9e33 Update help window to auto select xbox or vive controller tab on availability of device 2016-11-01 13:43:55 -07:00
Ryan Huffman
5f8cee787f Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename 2016-11-01 09:07:56 -07:00
Ryan Huffman
0cc98d4501 Add VersionInfo.rc to interface 2016-11-01 09:00:08 -07:00
Chris Collins
6698b1617b Merge pull request #8945 from thoys/patch-8 
Fix Oculus hand controllers to only work in HMD
 2016-10-31 11:02:40 -07:00
Chris Collins
3b6faefe05 Merge pull request #8931 from sethalves/possible-fix-for-2068 
Possible fix for 2069
 2016-10-31 10:21:01 -07:00
Brad Hefta-Gaub
8fbac58091 remove mute icons 2016-10-30 09:33:02 -07:00
Seth Alves
3ad748cfe2 Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 16:41:39 -07:00
Stephen Birarda
207d26091c Merge pull request #8953 from Atlante45/being-of-light 
Update being of light model
 2016-10-28 15:36:19 -07:00
Chris Collins
d9d9119dcb Merge pull request #8951 from zzmp/fix/crash-on-web-wasapi 
fix crash on shutdown from web audio captures
 2016-10-28 15:23:39 -07:00
Atlante45
8ebe92487a Update being of light model 2016-10-28 14:56:36 -07:00
Brad Hefta-Gaub
cec982b004 Merge pull request #8952 from jherico/openvr_min_spec 
Updating min spec overlay image
 2016-10-28 14:47:21 -07:00
Brad Davis
93be00fe79 Updating min spec overlay 2016-10-28 14:45:24 -07:00
Zach Pomerantz
be23668ca8 delete websurfaces on shutdown 2016-10-28 14:29:52 -07:00
Seth Alves
e15043754c Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068 2016-10-28 11:36:09 -07:00
Andrew Meadows
fe716b3641 Merge pull request #8941 from thoys/patch-7 
QuickFix for weird avatar when switch Vive -> Desktop mode
 2016-10-28 11:14:40 -07:00
Thijs Wenker
597e52636a Fix Oculus hand controllers to only work in HMD 2016-10-28 19:22:44 +02:00
Brad Hefta-Gaub
4f6cbf762d Merge pull request #8942 from jherico/openvr_min_spec 
Updates for min spec check for Steam
 2016-10-27 20:08:35 -07:00
Brad Hefta-Gaub
97f622f003 Merge pull request #8940 from hyperlogic/bug-fix/web-engine-crash-when-swiching-domains 
Fix for crash in QtWebEngineCore when rapidly switching domains
 2016-10-27 20:01:31 -07:00
Brad Davis
23fc865d40 Updates for min spec check 2016-10-27 19:28:46 -07:00
Thijs Wenker
2dcbe18e5b Fix for weird avatar Switch Vive -> Desktop mode 2016-10-28 04:07:20 +02:00
Anthony J. Thibault
1fc310434e Fix for crash in QtWebEngineCore when rapidly switching domains 
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
 2016-10-27 18:55:24 -07:00
Brad Davis
e9db8be435 Fix linux build 2016-10-27 16:51:52 -07:00
Brad Davis
018d945b85 Display warning overlay instead of scene when below min spec 2016-10-27 15:51:26 -07:00
Brad Davis
012e215f62 Merge pull request #8922 from ZappoMan/report45hzTarget 
when vive is on i5 report a correct target frame rate so we can see that in metaverse stats
 2016-10-27 14:03:07 -07:00
Clément Brisset
745f6546dd Merge pull request #8932 from huffman/fix/gamepad-help-image 
Update help image for gamepad to include grab and click lasers
 2016-10-27 13:31:15 -07:00
Brad Hefta-Gaub
bfe6ebb44f some tweaks 2016-10-27 12:04:46 -07:00
Brad Hefta-Gaub
510786bc0f Merge pull request #8923 from Atlante45/steamvr 
Add getter for SteamVR's buildID to SteamClient
 2016-10-27 11:38:35 -07:00
Ryan Huffman
5326202313 Update help image for gamepad to include Note 2016-10-27 10:54:49 -07:00
Chris Collins
ab8e5759b0 Merge pull request #8929 from ZappoMan/addAudioStatsToMenu 
add a menu item to run audio stats script
 2016-10-27 10:43:20 -07:00
Seth Alves
f47aeae2a7 stop passing bare pointers to EntityTreeRenderer all around 2016-10-27 10:10:22 -07:00
Brad Hefta-Gaub
c6d89f181a CR feedback 2016-10-27 10:08:16 -07:00
Brad Hefta-Gaub
d778b3b4ce fix the timing of the launchedFromSteam property 2016-10-27 10:00:48 -07:00
Brad Hefta-Gaub
76344f3253 add a menu item to run audio stats script 2016-10-26 22:41:56 -07:00
Andrew Meadows
5e273664db improved ray tests for HMD driving 2016-10-26 17:28:35 -07:00
Andrew Meadows
38e4ac0ae9 Merge master into out-of-body-experience 2016-10-26 16:59:31 -07:00
Brad Davis
1c89fa2291 Make threaded submit in OpenVR controllable from menu 2016-10-26 15:28:42 -07:00
Atlante45
f26ddc6f8b Add getter for SteamVR's buildID to SteamClient 2016-10-26 14:51:48 -07:00
Brad Hefta-Gaub
e464858c4c use SteamClient::isRunning() instead of command line param 2016-10-26 14:08:18 -07:00
Brad Hefta-Gaub
5f2b4c2a7f CR feedback 2016-10-26 13:27:11 -07:00
Brad Hefta-Gaub
f95a731249 add app property when the app was launched from steam 2016-10-26 13:22:03 -07:00
Chris Collins
d25a4fb1cb Merge pull request #8910 from zzmp/fix/qml-audio-shutdown-order 
fix shutdown order of qml/audio
 2016-10-26 11:37:54 -07:00
Brad Hefta-Gaub
863bf067b7 Merge pull request #8893 from jherico/texture_force_sparse 
Changes to texture loading rules
 2016-10-25 18:22:42 -07:00
Brad Hefta-Gaub
b0b950e132 Merge pull request #8898 from ctrlaltdavid/fix-overlaywebwindow-keyboard 
Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes
 2016-10-25 17:59:46 -07:00
Brad Davis
ce627eeea1 Updated metrics 2016-10-25 17:49:51 -07:00
Zach Pomerantz
4913654f44 Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-audio-shutdown-order 2016-10-25 17:49:30 -07:00
Brad Hefta-Gaub
56b0995047 Merge pull request #8909 from hyperlogic/bug-fix/crash-on-exit-fix 
Crash on exit fix for render items
 2016-10-25 17:34:46 -07:00
Chris Collins
3b31b28622 Merge pull request #8904 from sethalves/fix-a-couple-crash-on-exits 
fix a couple of crash-on-exits
 2016-10-25 17:03:21 -07:00
Zach Pomerantz
78a04255ab amend qml/audio ordering comment 2016-10-25 16:35:56 -07:00
Brad Hefta-Gaub
001cfc7e15 Merge pull request #8901 from samcake/blue 
Adding more detailed counters for texture memory consumption
 2016-10-25 16:19:56 -07:00
Zach Pomerantz
5413d97089 cleanup qml before audio 2016-10-25 15:54:08 -07:00
Anthony Thibault
23aa626755 Destroy render scene & engine before Application is destroyed 
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.

There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal.  Also, we guard against null
scene pointer dereferences.  Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
 2016-10-25 15:28:37 -07:00
Brad Hefta-Gaub
822e088240 tweak format of gl_info 2016-10-25 15:20:10 -07:00
Brad Hefta-Gaub
e22a2e9e2f add gl info and gpu free memory to user stats 2016-10-25 14:56:54 -07:00
Brad Hefta-Gaub
272055b6ee add location and build info to user activity stats 2016-10-25 14:19:44 -07:00
Seth Alves
3903a51062 fix a couple of crash-on-exits 2016-10-25 13:58:48 -07:00
samcake
507d3e5a39 IMprove the counting and namoing of the new couters the gl swapchain 2016-10-25 12:28:07 -07:00
Brad Hefta-Gaub
1bbf0179dd Merge pull request #8894 from ZappoMan/xboxLasers 
Adds support for "lasers" to the Oculus+xbox controller
 2016-10-25 09:18:00 -07:00
Chris Collins
9846614468 Merge pull request #8879 from AndrewMeadows/show-physics-stats 
add Bullet profile info to PerformanceTimer stats
 2016-10-25 06:29:27 -07:00
sam
6b2b68e691 trying to add counters for the default FBO 2016-10-25 03:36:23 -07:00
David Rowe
34b9d3eecc Update OverlayWebWindow keyboard visibility per HMD/desktop mode changes 2016-10-25 20:25:34 +13:00
Brad Hefta-Gaub
62f63f32a7 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 20:24:29 -07:00
samcake
58b81e3b0c Adding counter for the amount of memory used in texture for Framebuffers 2016-10-24 18:34:16 -07:00
Anthony J. Thibault
69bd4ccea2 Show hand controllers when out-of-body for more then 3/4 of a second 
Without the timer, the hands can flicker in and out of visibility when lightly brushing against collision.
 2016-10-24 18:16:05 -07:00
Clément Brisset
dd45500313 Merge pull request #8891 from huffman/fix/disconnected-dialog-updates 
Fix several aspects of the "disconnected" dialog
 2016-10-24 15:39:16 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Ryan Huffman
e0c109d6ca Simplify ConnectionMonitor to only rely on domainConnectionRefused instead of authRequired 2016-10-24 14:45:41 -07:00
Ryan Huffman
bbf5afeb8d Remove use of start() w/o param in ConnectionMonitor 2016-10-24 14:35:38 -07:00
Ryan Huffman
5077ec2044 Remove unused indicateDomainConnectionFailure 2016-10-24 14:35:09 -07:00
Ryan Huffman
f3ef0cebed Update ConnectionMonitor to not show poopup on domain connection refusal 2016-10-24 14:27:28 -07:00
Andrew Meadows
42c6996aee fix warning about unused variable 2016-10-24 14:05:28 -07:00
Brad Davis
da9eb0433c Remove workaround for QML HDPI offscreen rendering bug 2016-10-24 11:51:40 -07:00
Ryan Huffman
e7023b3d99 Add ConnectionFaiureDialog qml 2016-10-24 10:52:46 -07:00
Ryan Huffman
5b58e8ae97 Fix ConnectionHandler not handling connected-but-need-auth condition 2016-10-24 10:44:33 -07:00
Ryan Huffman
84bcefc147 Update ConnectionMonitor to increase timeout on startup 2016-10-24 10:28:13 -07:00
Ryan Huffman
32b5c84bec Update ConnectionMonitor to init at end of startup 2016-10-24 10:27:27 -07:00
Andrew Meadows
8ecc23f62b HMD drive stops against simple walls 2016-10-24 08:26:44 -07:00