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
41659 commits 2 branches 0 tags 1.1 GiB
Commit graph

41659 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
510d167c87 Merge branch 'master' into 20855 2016-03-31 08:43:35 +13:00
Stephen Birarda
bbbfa7227f changes to electron app for Sandbox rename 2016-03-30 12:41:13 -07:00
Stephen Birarda
2ea0309955 change setup options and prompts to close running applications 2016-03-30 12:08:56 -07:00
Stephen Birarda
238f9e9298 remove the Stack Manager migration section 2016-03-30 12:07:45 -07:00
Stephen Birarda
724c95fbd6 leave executable name for server-console 2016-03-30 12:05:17 -07:00
Stephen Birarda
6bdedeb5ce change packaging parameters for Sandbox/Interface 2016-03-30 11:59:49 -07:00
Stephen Birarda
4210bc178e default the inactive timestamp for healthy startup 2016-03-30 11:44:55 -07:00
Stephen Birarda
e5adfc40b2 use the inactivity timer for ice-server lockup check 2016-03-30 11:42:41 -07:00
Stephen Birarda
92e9e6a3fa use the NetworkAccessManager to get a single QNetworkAccessManager 2016-03-30 11:35:41 -07:00
Brad Hefta-Gaub
b72c28854c Merge pull request #7510 from howard-stearns/end-audio-menu-pain 
End audio devicer selection menu pain
 2016-03-30 11:33:10 -07:00
Stephen Birarda
1771875186 use one QNetworkAccessManager for the ice-server 2016-03-30 11:31:46 -07:00
Zach Pomerantz
1234514e8f Correctly represent light fbo fmt 2016-03-30 11:22:44 -07:00
samcake
0ee1f039e9 Telling like it is... 2016-03-30 11:15:10 -07:00
Stephen Birarda
24acf7584a don't respond to http other than /status 2016-03-30 11:10:14 -07:00
Brad Hefta-Gaub
699b3a9dd7 Merge pull request #7499 from birarda/udt-fixes 
fix an overflow in portable high resolution clock on windows
 2016-03-30 10:54:00 -07:00
howard-stearns
37e6fce30b Disconnect menuItemEvent before setIsOptionChecked, and then reconnect. 2016-03-30 10:48:54 -07:00
Brad Davis
f569cbf70e Add debugging output, fix timewarp 2016-03-30 10:40:32 -07:00
Brad Davis
8123617fe1 Improve failure detection logging 2016-03-30 10:40:31 -07:00
Brad Davis
80d397555d Fixing input API, DLL path for Oculus 2016-03-30 10:40:30 -07:00
Brad Davis
78626f7938 Add warning logging if we can't find a 1.x Oculus dll 2016-03-30 10:40:29 -07:00
Brad Davis
bd9813bbf5 Only enable the Oculus plugin in the presence of the 1.x runtime 2016-03-30 10:40:29 -07:00
Brad Davis
d056c41e25 Update to latest Oculus SDK, add input device support 2016-03-30 10:40:28 -07:00
samcake
11b6952eff Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 09:49:17 -07:00
samcake
b492c4b52c DUmb fix to the flickering issue by overshooting the inside volume of the light and avoid the failing region 2016-03-30 09:32:40 -07:00
Brad Hefta-Gaub
d99dcf5450 Merge pull request #7487 from hyperlogic/tony/animated-culling 
Improved render bounding boxes for animated models
 2016-03-30 09:27:43 -07:00
Brad Hefta-Gaub
6fdedb8f34 Merge pull request #7508 from howard-stearns/import-export-parents 
Make export/import and copy/paste be parent/child-clean.
 2016-03-30 09:06:33 -07:00
Brad Hefta-Gaub
c64b2bb236 Merge pull request #7495 from Atlante45/fix/audio-client 
Fix crash in Audio Client
 2016-03-30 09:00:07 -07:00
Brad Hefta-Gaub
32308c7810 Merge pull request #7501 from zzmp/fix/parse-tex 
Respond to error from free in texture parsing
 2016-03-30 08:53:15 -07:00
Brad Hefta-Gaub
15a042cef1 Merge pull request #7506 from zzmp/fix/gl-reset-pipelines 
Fix ordering of GL backend state reset commands to Field key
 2016-03-29 23:29:14 -07:00
David Rowe
0a83df2281 Fix textarea selection highlight 2016-03-30 19:25:45 +13:00
David Rowe
db72e3efbb Increase maximum window height 2016-03-30 19:22:34 +13:00
David Rowe
cfc5c36f05 Fix dropdowns 2016-03-30 19:16:04 +13:00
David Rowe
0b70da1581 Improve layout of scale controls 2016-03-30 19:02:28 +13:00
David Rowe
f4b9ffe26f Reorder sections 2016-03-30 18:07:45 +13:00
David Rowe
fdf45e0134 Use "-group" classification for section expand and collapse 2016-03-30 17:34:31 +13:00
David Rowe
1c5e414c15 Reinstate original property "-section" classifications 2016-03-30 16:10:32 +13:00
Brad Hefta-Gaub
92ddf9d7ac Merge pull request #7507 from AndrewMeadows/broken-time-machine 
fix "deadlock" when setting clock backwards
 2016-03-29 19:38:45 -07:00
Seth Alves
bd5757d586 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-29 18:33:22 -07:00
Seth Alves
7c0bb72aff started on making ~ mean the application directory in script paths 2016-03-29 18:32:46 -07:00
Brad Hefta-Gaub
d63728bd55 Merge pull request #7502 from huffman/fix-asset-client 
Fix bug where a pending asset request could receive a pending message after deletion
 2016-03-29 18:15:03 -07:00
Brad Hefta-Gaub
8a47c5a35f Merge pull request #7504 from zzmp/log/building-web-surface 
Log OffscreenQml lifetime
 2016-03-29 18:11:16 -07:00
samcake
be27eaff24 Moving the scripts for render that where in utilities/tools/render to utilities/render, adding counters for lights 2016-03-29 17:51:24 -07:00
howard-stearns
5381be6902 Whitespace 2016-03-29 17:06:19 -07:00
howard-stearns
86a77d4f55 Remove unused/non-existent include. 2016-03-29 16:55:17 -07:00
howard-stearns
eef9de4d4f Remove obsolete remapIDs. 2016-03-29 16:28:02 -07:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
howard-stearns
4ebf816166 cleanup 2016-03-29 16:17:19 -07:00
Ryan Huffman
fdbd58765c Remove printSupported from printSystemInformation 2016-03-29 16:06:55 -07:00
David Rowe
1cb08952ae Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-30 12:01:45 +13:00
Zach Pomerantz
6ae03fe72e Sync ordering of gl fields/reset commands 2016-03-29 15:52:29 -07:00