Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 14:32:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
48146 commits 67 branches 56 tags 1.2 GiB
Commit graph

48146 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
da83fd9fa4 try, try again 2016-11-13 12:56:16 -08:00
Seth Alves
946dc256f0 try, try again 2016-11-13 12:15:35 -08:00
Seth Alves
359f05426c try, try again 2016-11-13 12:14:48 -08:00
Seth Alves
45bcf626aa try, try again 2016-11-13 11:48:49 -08:00
Seth Alves
f8fb5b9709 avoid some more static/global QStrings in plugins 2016-11-13 11:29:19 -08:00
Seth Alves
9b4a8427e6 global/static QString 2016-11-13 11:09:27 -08:00
Seth Alves
9868ddd602 global/static QStrings in plugins appear to cause crashes during shutdown 2016-11-13 10:22:14 -08:00
Seth Alves
804f25740d these qDebugs happen too late and cause a crash 2016-11-13 10:21:27 -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
Chris Collins
6581a51bc9 Merge pull request #9052 from davidkelly/dk/2226 
Add ability to mute user
 2016-11-11 16:02:08 -08:00
Ryan Huffman
2203607044 Merge pull request #9056 from Atlante45/networking 
Protect against empty packet lists
 2016-11-11 15:28:46 -08:00
Clément Brisset
e38da75115 Merge pull request #9053 from huffman/feat/whitelist-ac-ip 
Add AC ip address whitelist to domain server
 2016-11-11 15:03:21 -08:00
Ryan Huffman
528b8e93f0 Remove extraneous logging in DomainServer for whitelist 2016-11-11 14:33:34 -08:00
Atlante45
a38846aeed Protect against empty packet lists 2016-11-11 14:32:52 -08:00
Ryan Huffman
fc1a7255f6 Remove unneeded 'this->' 2016-11-11 14:24:28 -08:00
David Kelly
6063a63f44 cr feedback 2016-11-11 14:23:59 -08:00
Ryan Huffman
e177004d71 Fix ds not restarting when changing ac whitelist 2016-11-11 14:23:16 -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
Ryan Huffman
d522d03bd2 Add repeated message suppression to request assignment packets 2016-11-11 11:29:52 -08:00
David Kelly
96f6cb7ae4 whitespace 2016-11-11 11:24:06 -08:00
David Kelly
3d7e075897 Added mute to mod.js script 2016-11-11 11:18:24 -08:00
Ryan Huffman
969cbf4cb0 Update domain server subnet whitelist description 2016-11-11 10:46:40 -08:00
Ryan Huffman
bd1bcaf1a4 Clean up subnet whitelist implementation 2016-11-11 10:38:56 -08:00
Ryan Huffman
d691aa3302 Update naming for subnet whitelist in ds 2016-11-11 10:32:45 -08:00
Ryan Huffman
e1466c0d47 Fix NULL -> nullptr 2016-11-11 10:21:58 -08:00
Ryan Huffman
ca6a74d63d Add whitelist filtering to assignment requests 2016-11-11 10:19:53 -08:00
Ryan Huffman
63cfbf55ca Add ip address whitelist processing to domain server 2016-11-11 10:19:21 -08:00
Ryan Huffman
edb8d14507 Add ac address whitelist to domain server settings 2016-11-11 10:18:16 -08:00
Brad Davis
162f24decd Add stutter tracking for Oculus 2016-11-11 10:12:41 -08:00
David Kelly
9c8f22e0e7 straight to audio mixer 
since we can get the canKick there too.  (doh)
 2016-11-11 09:30:58 -08:00
Seth Alves
15c247fc5e quiet warnings 2016-11-11 06:37:22 -08:00
Seth Alves
899dec8b10 Merge branch 'master' of github.com:highfidelity/hifi into last-edited-by 2016-11-11 06:11:49 -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
13b19171e7 Merge pull request #9046 from jherico/steam_i5_enable 
Change minimum cores to 3 to enable OpenVR
 2016-11-10 18:51:16 -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
f55b660820 Merge pull request #9033 from huffman/fix/usersjs-hide-show-laser 
Fix users.js maximize button unclickable with hand controllers
 2016-11-10 17:53:17 -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
David Kelly
186451fcbe Merge pull request #9027 from samcake/green 
Fix crashes in OpenGLVersionChecker
 2016-11-10 17:22:29 -08:00
David Kelly
80d4033767 oops forgot one thing... 2016-11-10 17:13:50 -08:00
Stephen Birarda
7f46714645 drop the incorrect scale from domain settings 2016-11-10 16:53:56 -08:00
Stephen Birarda
020942c826 better handling for a flipped min/max scale 2016-11-10 16:50:36 -08:00
David Kelly
285520dff7 Initial cut 
No script work yet, just first stab at underpinnings
 2016-11-10 16:24:35 -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
f14037979a fix a typo in help text for minimum scale 2016-11-10 15:31:23 -08:00
Seth Alves
850361f222 lastEditedBy property for entities 2016-11-10 15:26:28 -08:00
Stephen Birarda
272d0c845e add clarifying comments about target scale changes 2016-11-10 15:25:15 -08:00
howard-stearns
b20d4a4b03 Merge branch 'master' of https://github.com/highfidelity/hifi into disable-viewpoint-menus-in-hmd 2016-11-10 15:15:51 -08:00