Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47698 commits 71 branches 56 tags 1.2 GiB
Commit graph

47698 commits

This branch
This branch
All branches
Author SHA1 Message Date
howard-stearns
f7742b99a9 update crowd-agent reference 2016-10-25 15:35:11 -07:00
howard-stearns
65ac73bfc0 use s3 instead of gh-pages 2016-10-25 15:29:48 -07:00
howard-stearns
6116060858 Merge branch 'master' of https://github.com/highfidelity/hifi into improve-domain-check 2016-10-25 14:58:58 -07:00
howard-stearns
9561142c43 improvements 2016-10-25 14:58:27 -07:00
howard-stearns
2fbb2338c5 don't complain about other's finishedSound messages 2016-10-25 14:56:05 -07:00
Chris Collins
164955dc81 Merge pull request #8903 from huffman/feat/update-content-set 
Update home content set
 2016-10-25 14:11:06 -07:00
Ryan Huffman
cc3a1d8c67 Update home content set 2016-10-25 13:54:16 -07:00
Ryan Downe Karpf
7a4302057a Merge pull request #8900 from huffman/fix/disable-controller-hide-on-equip 
Update vive controller display to not hide on equip
 2016-10-25 13:16:31 -07:00
Brad Hefta-Gaub
2b2b55aab0 Merge pull request #8902 from birarda/walking-dead 
don't change DF or buffer sizes for ice-server
 2016-10-25 11:45:48 -07:00
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
Ryan Huffman
af749605ea Update vive controller display to not hide on equip 2016-10-25 08:27:20 -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
Chris Collins
325cd0ae61 Merge pull request #8870 from ctrlaltdavid/21084 
Reinstate "reload" button for entity scripts in entities editor
 2016-10-24 22:17:14 -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
Brad Hefta-Gaub
76ca3aa546 fix residual head laser 2016-10-24 15:25:06 -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
Howard Stearns
ab21487a6d Merge pull request #8890 from howard-stearns/fix-home-portal-destination 
add home portal entity script and make it go to correct welcome
 2016-10-24 14:49:00 -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
45ae61d551 Merge pull request #8892 from Atlante45/sandbox 
Sandbox logs to file
 2016-10-24 14:31:56 -07:00
Ryan Huffman
f3ef0cebed Update ConnectionMonitor to not show poopup on domain connection refusal 2016-10-24 14:27:28 -07:00
Brad Hefta-Gaub
8e6bbb3b61 Merge pull request #8874 from jherico/texture_memory_redux 
New texture memory scheme
 2016-10-24 14:22:54 -07:00
Atlante45
812265363c Reorder object construction 2016-10-24 13:31:54 -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
Atlante45
4661d6e2d1 Move log file to already existing Sandbox directory 2016-10-24 11:24:35 -07:00
Atlante45
143fc644d3 Added some shutdown debug 2016-10-24 11:11:30 -07:00
howard-stearns
963fd68cd9 remove backwards compatability 2016-10-24 11:06:32 -07:00
Atlante45
b0a22599e7 Make log global 2016-10-24 10:58:21 -07:00
Atlante45
b2e68a1075 Print log to file as well 2016-10-24 10:58:21 -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
howard-stearns
4c4ec37eb3 add home portal entity script and make it go to correct welcome 2016-10-24 10:28:32 -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
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 Hefta-Gaub
8efa394bfa Merge pull request #8886 from jherico/more_gpu_stats 
Add free GPU memory to the displayed stats
 2016-10-23 20:33:15 -07:00
Brad Davis
861b69aa94 Add free GPU memory to the displayed stats 2016-10-23 13:07:38 -07:00