Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 17:25:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
41971 commits 75 branches 59 tags 1.2 GiB
Commit graph

41971 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
6bd00f3203 fix da typo 2016-03-30 14:16:10 -07:00
Zach Pomerantz
54b8a9278d Guard model texs 2016-03-30 14:11:45 -07:00
Zach Pomerantz
e4f12c81e0 Get remap textures through getter 2016-03-30 14:11:36 -07:00
ericrius1
286bc5de1d changed json desk lamp to work with parenting 2016-03-30 14:06:51 -07:00
James B. Pollack
cad8d1ff17 reset block 2016-03-30 14:05:22 -07:00
Seth Alves
065c238dd0 Merge branch 'use-local-scripts' of github.com:sethalves/hifi into use-local-scripts 2016-03-30 14:02:21 -07:00
James B. Pollack
cefe672a93 updatez 2016-03-30 14:01:46 -07:00
Seth Alves
62372415be get this working on windows 2016-03-30 14:01:35 -07:00
samcake
3cf2eeb4d5 IMproving the perfplot qml and adding 2 more info 2016-03-30 13:58:32 -07:00
Stephen Birarda
f29647b519 use HF shortcuts for setup options 2016-03-30 13:56:57 -07:00
Stephen Birarda
7d042fc47d keep server-console as sandbox folder in Program Files 2016-03-30 13:54:55 -07:00
James B. Pollack
9e01cbb4ef inner tank for ze fishes 2016-03-30 13:44:40 -07:00
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
David Rowe
3457d1c21e Entities list fixes 
- Fix report of number of entities selected if have two selected
- Don't show yellow focus highlight on row when first click it
 2016-03-31 09:16:31 +13: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
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