Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48492 commits 2 branches 0 tags 1.1 GiB
Commit graph

48492 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
6f7162132e add release/debug/gprof/valgrind to gitignore 2016-11-27 18:03:02 -05:00
samcake
54543935be Merge pull request #8560 from samcake/hdr 
Introducing Clustered Lighting and improve Lighting performances
 2016-11-23 17:34:40 -08:00
Brad Hefta-Gaub
9f689b1b69 Merge pull request #9116 from highfidelity/stable 
Merge Hotfix back into master.
 2016-11-23 15:30:29 -08:00
samcake
d806b088a9 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-23 15:05:52 -08:00
Brad Davis
6e3ad7a983 Merge pull request #9115 from jherico/fix_camera 
Fix camera in render perf test
 2016-11-23 14:44:57 -08:00
samcake
9478f242d8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-23 10:35:32 -08:00
Brad Davis
f2118614da Fix camera in render perf test 2016-11-23 10:30:52 -08:00
Chris Collins
5359468b91 Merge pull request #9112 from highfidelity/RC-28-HOTFIX 
Beta Release 28 Hotfix - Windows 7 audio fix
 2016-11-23 10:15:03 -08:00
Brad Hefta-Gaub
8b9c6a45e1 Merge pull request #9111 from highfidelity/stable 
Stable to master
 2016-11-22 22:00:32 -08:00
Ken Cooke
b24c81e334 Refactor the audio device format detection. Only use the native format when Qt can correctly determine it. 2016-11-22 20:56:17 -08:00
Chris Collins
8246e3be4b Merge pull request #9109 from samcake/red 
Fix the bad binding for polyline
 2016-11-22 17:32:04 -08:00
samcake
3d0b557af6 Fix the bad binding for polyline 2016-11-22 13:01:02 -08:00
samcake
d764eebc79 removing dead code 2016-11-22 12:10:56 -08:00
Brad Hefta-Gaub
1970deab92 Merge pull request #9107 from kencooke/audio-win7-fix 
Audio fix for Windows 7
 2016-11-22 11:31:34 -08:00
samcake
c494479290 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-22 10:16:08 -08:00
samcake
dfc0b7beac adressed reveiw comments 2016-11-22 10:15:49 -08:00
David Kelly
dcda5d50a0 Merge pull request #9106 from howard-stearns/animate-suggestions-when-available 
animate suggestions when available
 2016-11-22 09:24:48 -08:00
Ken Cooke
d69d77d0ee Refactor the audio device format detection. Only use the native format when Qt can correctly determine it. 2016-11-21 21:36:17 -08:00
David Kelly
811fc0afbe Merge pull request #9096 from howard-stearns/location-cleanup 
location cleanup to make people more aware of their sandbox placename
 2016-11-21 17:33:34 -08:00
howard-stearns
81786bf819 animate suggestions when available 2016-11-21 16:46:10 -08:00
howard-stearns
2beed7e70b proper include_actions for 'places' tab. 2016-11-21 16:22:02 -08:00
Brad Hefta-Gaub
d93e1dd5d0 Merge pull request #9103 from huffman/fix/verbose-ac-searcher-logging 
Add AC Audio searcher for tutorial
 2016-11-21 14:30:50 -08:00
Brad Hefta-Gaub
abed723a01 Merge pull request #9104 from jherico/logspam 
Reduce logspam, change some debug output to warning
 2016-11-21 14:29:19 -08:00
howard-stearns
066a518142 expose metaverse url to javascript and use it rather than hardcoding 2016-11-21 13:07:38 -08:00
Brad Davis
728f8aa238 Reduce logspam, change some debug output to warning 2016-11-21 11:56:32 -08:00
howard-stearns
5b216578d7 Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-21 11:47:30 -08:00
Ryan Huffman
8e1f03db43 Add AC Audio searcher for tutorial 2016-11-21 11:34:49 -08:00
samcake
31232a1078 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-11-21 11:30:26 -08:00
Chris Collins
5bab42b8c9 Merge pull request #9098 from highfidelity/rc-28 
Beta Release 28 - Includes up to Developer Release 5723
 2016-11-21 06:02:06 -08:00
Brad Hefta-Gaub
14857a085a personal space feature 2016-11-19 17:40:57 -08:00
Brad Hefta-Gaub
ac6a1088f9 Merge pull request #9099 from ZappoMan/personalSpace 
first cut at personal space feature
 2016-11-19 16:57:33 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Brad Hefta-Gaub
131ac5796b Merge pull request #9092 from jherico/fix_glow_line 
Glow line replacement without geometry shader
 2016-11-19 13:23:46 -08:00
Brad Davis
362976645b Fix HMD UI glow lines 2016-11-18 17:42:56 -08:00
Brad Davis
3074be7ad0 Glow line replacement without geometry shader 2016-11-18 17:42:55 -08:00
Chris Collins
e9563ef9af Merge pull request #9095 from birarda/mac-perms 
add hardware address based permissions to domain-server
 2016-11-18 17:28:11 -08:00
Brad Hefta-Gaub
3c60000a62 Merge pull request #9093 from sethalves/fix-polyvox-buffer-size 
Fix polyvox buffer size
 2016-11-18 17:26:36 -08:00
howard-stearns
da56457c4a Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-18 17:13:32 -08:00
howard-stearns
f1806eb649 server protocols 2016-11-18 17:05:14 -08:00
Seth Alves
8ee1fac367 don't try to render until mesh is ready 2016-11-18 16:33:48 -08:00
Ryan Huffman
541ef21801 Merge pull request #9094 from Atlante45/edit-js 
Turn Edit.js on when importing entities
 2016-11-18 15:36:50 -08:00
Seth Alves
b2a28147c0 more time 2016-11-18 15:36:29 -08:00
Howard Stearns
1c4b2eba25 Merge pull request #9045 from zfox23/animated_snapshots 
Animated GIF Snapshots
 2016-11-18 15:32:03 -08:00
Seth Alves
47062d29f5 cleanups 2016-11-18 15:27:45 -08:00
Seth Alves
3278478a60 cleanups 2016-11-18 15:26:16 -08:00
Seth Alves
a66a1d392e hack to avoid crash 2016-11-18 15:24:19 -08:00
Zach Fox
3a5a9b359e Quick bugfix 2016-11-18 15:04:35 -08:00
Stephen Birarda
dec4ce79b2 fix comment in mac permission unpack 2016-11-18 14:42:29 -08:00
Stephen Birarda
143225a74c add MAC permission table to domain-server and leverage 2016-11-18 14:40:22 -08:00
Zach Fox
1e97a69b51 Massive performance improvements. 2016-11-18 14:39:30 -08:00