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

19638 commits

Author SHA1 Message Date
Stephen Birarda
b753871fc1 don't change DF or buffer sizes for ice-server 2016-10-25 11:20:10 -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
Brad Hefta-Gaub
da0d1f1f13 Merge pull request #8896 from ZappoMan/i5SandboxHeartbeat 
actually make the RunningMarker run on a different thread
 2016-10-25 08:47:06 -07:00
Brad Hefta-Gaub
4cb693315f CR feedback 2016-10-25 08:31:23 -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
Brad Hefta-Gaub
2c28316e39 CR feedback 2016-10-24 20:40:43 -07:00
Brad Hefta-Gaub
ed4279783d CR feedback 2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
62f63f32a7 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 20:24:29 -07:00
Brad Hefta-Gaub
ae6022c498 actually make the RunningMarker run on a different thread 2016-10-24 18:55:25 -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
Chris Collins
48215009c1 Merge pull request #8885 from jherico/qml_limit 
4k display & QML Offscreen rendering fixes
 2016-10-24 15:22:33 -07:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -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
Brad Davis
7900fd3e18 New texture memory scheme 2016-10-24 13:10:41 -07:00
Brad Davis
da9eb0433c Remove workaround for QML HDPI offscreen rendering bug 2016-10-24 11:51:40 -07:00
Ryan Huffman
5b58e8ae97 Fix ConnectionHandler not handling connected-but-need-auth condition 2016-10-24 10:44:33 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Ryan Huffman
b5881146df Merge pull request #8878 from zzmp/fix/half-sec-audio-crash 
reduce sound from crashed avatars
 2016-10-23 20:38:35 -07:00
Brad Davis
861b69aa94 Add free GPU memory to the displayed stats 2016-10-23 13:07:38 -07:00
Brad Davis
7879bf37f2 Fix typo in comment 2016-10-22 18:12:40 -07:00
Brad Davis
b572fb2a91 Only use sparse texture memory for the memory pressure calculation (since that's all we can modify) 2016-10-22 14:49:10 -07:00
Brad Davis
62de2af944 Add more GPU stats, make stats easier to read 2016-10-22 14:38:46 -07:00
Brad Hefta-Gaub
ee1f3ac38c Merge pull request #8881 from jherico/offscreen_texture_memory_stats 
Report offscreen texture memory usage in stats
 2016-10-21 19:15:59 -07:00
Ryan Downe Karpf
f5a116fc92 Merge pull request #8880 from hyperlogic/feature/controller-display 
Show hand controllers in away.js
 2016-10-21 17:43:52 -07:00
Brad Davis
e9ac110072 Correct mip calculation 2016-10-21 17:05:56 -07:00
Zach Pomerantz
3bea1069f2 fix unit conversion for audio fade factor 2016-10-21 16:10:33 -07:00
David Kelly
bdcb58bf8b Merge pull request #8847 from sethalves/fix-audio-mixer-data-race-1 
fix some data-races in logging system
 2016-10-21 15:33:40 -07:00
Anthony J. Thibault
c431c69d60 Merge branch 'master' into feature/controller-display 2016-10-21 13:48:07 -07:00
Andrew Meadows
e44672180a add Bullet profile info to PerformanceTimer stats 2016-10-21 13:22:22 -07:00
Brad Davis
1bd398ae5e Report offscreen texture memory usage in stats 2016-10-21 11:31:37 -07:00
Chris Collins
8481d0baa5 Merge pull request #8872 from birarda/master 
always go to dev welcome when not using stable services
 2016-10-21 06:16:26 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Brad Hefta-Gaub
6279b273fc Merge pull request #8867 from jherico/offscreen_textures 
Fix offscreen QML texture leak, improve texture sharing for same size surfaces
 2016-10-20 17:07:29 -07:00
Philip Rosedale
8c5dd1170e Merge pull request #8871 from howard-stearns/fix-system-hand-laser-flicker 
fix flicker in system (inside the hud) hand-lasers.
 2016-10-20 16:53:57 -07:00
Clément Brisset
b63eb6ba9f Merge pull request #8665 from zzmp/feat/audio-stats 
move audio stats to QML/JS, with graphs
 2016-10-20 16:43:49 -07:00
Stephen Birarda
5886996bc3 always go to dev-welcome when not using stable services 2016-10-20 16:29:40 -07:00
howard-stearns
0141110805 fix flicker in system (inside the hud) hand-lasers. 2016-10-20 15:42:19 -07:00
Brad Davis
c27ee634ea Fix debug compile issues 2016-10-20 13:56:01 -07:00
Brad Davis
9523660027 Fix offscreen QML texture leak, improve texture sharing for same size surfaces 2016-10-20 11:55:25 -07:00
Seth Alves
b31acc421a fix crash on startup 2016-10-20 10:36:14 -07:00
Seth Alves
8ac799ddaf Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1 2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0 
Fix some audio mixer data races
 2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
6109f41ae2 Merge pull request #8859 from Atlante45/seq-num-race 
Fix sequence number race condition
 2016-10-20 08:26:31 -07:00
Brad Hefta-Gaub
4a6101060c Merge pull request #8862 from zzmp/fix/quick-leak 
fix leak from qml surfaces' render controls
 2016-10-20 08:23:28 -07:00
Brad Hefta-Gaub
bf732127ca Merge pull request #8856 from jherico/geometry_ids 
Remove the use of implicit ids in geometry cache
 2016-10-20 08:14:49 -07:00
Brad Hefta-Gaub
9bfc8502f1 Merge pull request #8863 from zzmp/fix/quick-crash 
fix intermittent crash on teleport from contextless Qt connection
 2016-10-19 22:22:51 -07:00
Brad Hefta-Gaub
9008de72e0 Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments 
Adjustment to position and visibility of grab sphere.
 2016-10-19 21:51:02 -07:00