Commit graph

41783 commits

Author SHA1 Message Date
Stephen Birarda
0a8072164d be less redundant in prompt for running applications 2016-03-30 13:44:16 -07:00
Seth Alves
f5333423ff remove unused variable 2016-03-30 13:43:06 -07:00
Seth Alves
bb43347599 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-30 13:33:59 -07:00
Seth Alves
26e01bbacd rewrite a bunch of path/url mangling code 2016-03-30 13:33:49 -07:00
Stephen Birarda
c2c7ae89db remove bottom section from server-console splash 2016-03-30 13:27:44 -07:00
Stephen Birarda
7c0c48458e remove padding from stack manager migration block 2016-03-30 13:25:47 -07:00
Stephen Birarda
53c16280bd remove code for stack manager migration 2016-03-30 13:22:57 -07:00
Stephen Birarda
8be3931bbf repair shortcut name for desktop interface 2016-03-30 13:20:31 -07:00
ericrius1
5c680e9982 Merge remote-tracking branch 'james/homereset' into atpHomeReset 2016-03-30 13:19:11 -07:00
James B. Pollack
cfa22a694e update textures 2016-03-30 13:16:10 -07:00
Stephen Birarda
02d93e2a11 cleanup fixes for old shortcuts in NSIS script 2016-03-30 13:09:36 -07:00
James B. Pollack
12f8d83a6f plant stuffs 2016-03-30 13:02:46 -07:00
Stephen Birarda
bd3d08db3b prepend Interface with High Fidelity in setup options 2016-03-30 13:00:23 -07:00
Stephen Birarda
8e9b337701 replace the server console logo with a sandbox logo 2016-03-30 12:56:09 -07:00
Stephen Birarda
a200e56f92 remove old startup menu item for Server Console 2016-03-30 12:52:11 -07:00
Stephen Birarda
05163367e1 delete old start menu items from before rename 2016-03-30 12:49:55 -07:00
Stephen Birarda
4940639e11 clear old desktop shortcuts from before rename 2016-03-30 12:48:11 -07:00
Stephen Birarda
2d1c4243f5 prepend desktop shortcuts with High Fidelity 2016-03-30 12:47:18 -07:00
Stephen Birarda
d80f612c62 continue to ignore old server console output directory 2016-03-30 12:44:10 -07: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
ericrius1
6d4c0e940a json changes to posters 2016-03-30 10:26:17 -07:00
ericrius1
1597ee57e2 added json 2016-03-30 10:18:00 -07:00
ericrius1
cbb6c5fe98 added portkey to posters 2016-03-30 10:07:04 -07:00
James B. Pollack
b15e182e80 doll transformer 2016-03-30 10:06:06 -07:00
James B. Pollack
4a3650b309 reset atp 2016-03-30 10:05:16 -07:00
James B. Pollack
096bb4e340 rotate tank things and add some mouse callbacks to tilt maze 2016-03-30 09:51:59 -07:00
samcake
11b6952eff Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-30 09:49:17 -07:00
James B. Pollack
8e1fec2943 Merge branch 'homereset' of https://github.com/imgntn/hifi into homereset 2016-03-30 09:44:07 -07:00
James B. Pollack
b2f6357928 rotate tank things 2016-03-30 09:44:04 -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