Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 23:08:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38448 commits 25 branches 0 tags 1.1 GiB
Commit graph

38448 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
e3f861b20a Merge pull request #6918 from jherico/running-scripts-filter 
Several Small QML fixes
 2016-01-23 22:36:36 -08:00
Brad Hefta-Gaub
7258bd9e3f Merge pull request #6915 from samcake/hdr 
Fixing the Anitialising breaking the transparent rendering
 2016-01-23 22:30:04 -08:00
Brad Davis
3a0f6993c7 Put QML in front of 2D overlays 2016-01-23 22:07:01 -08:00
Brad Davis
a843331626 Still trying to kill OSX warning 2016-01-23 22:07:00 -08:00
Brad Davis
8e57f06de2 Add browser action shortcut to our custom desktop 2016-01-23 22:06:59 -08:00
Brad Davis
12cc873716 Hide focus debugger unless it's explicitly turned on 2016-01-23 22:06:58 -08:00
Brad Davis
5fc43e7018 Render scalable favicons at a fixed size 2016-01-23 22:06:14 -08:00
Brad Davis
e52e35df8c Better initial window positioning 2016-01-23 22:06:13 -08:00
Brad Davis
159794cafd Stop address bar stealing keyboard focus 2016-01-23 22:05:01 -08:00
Brad Davis
d70faf5985 Fix running scripts filter initial state 2016-01-23 22:03:24 -08:00
Brad Davis
5fde166a38 Fix menu Z-order 2016-01-23 22:03:24 -08:00
Brad Hefta-Gaub
4d4d4ca855 Merge pull request #6880 from jherico/preferences3 
Preferences dialog in the overlay
 2016-01-23 21:55:04 -08:00
David Rowe
840bf7cfb4 Fix OSX and Linux build warning 
And a typo noticed in passing.
 2016-01-24 10:53:40 +13:00
David Rowe
9429f48a7c Remove erroneous edit.js call with missing entity ID 
JavaScript exception was being thrown now that entity properties are
undefined if entity is not found.
 2016-01-24 08:39:50 +13:00
David Rowe
d020114e59 Make entity properties return undefined value after entity is deleted 2016-01-24 08:39:49 +13:00
Andrew Meadows
d25f54485c fix crash for emtpy modelUrl in ModelEntityItem 2016-01-22 22:01:30 -08:00
Brad Davis
0e0fcdae74 fixing accidental commit of leap motion disabling. 2016-01-22 20:27:23 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
samcake
483d20d7a3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-22 18:31:30 -08:00
samcake
9f87089c05 Fixing the Anitialising breaking the transparent rendering 2016-01-22 18:25:26 -08:00
Atlante45
d159f8dc38 Answering one shutdown popup closes them all 2016-01-22 18:17:14 -08:00
Leonardo Murillo
c812798314 Merge pull request #6913 from birarda/fixup-and-macdeploy 
fix reference to components install path on OS X
 2016-01-22 19:35:25 -06:00
Brad Davis
858bbbf987 Adding OffscreenUI API for QInputDialog functionality 2016-01-22 17:31:03 -08:00
Brad Davis
27fdb523cb Add directory & avatar browsing preferences 2016-01-22 17:30:10 -08:00
Brad Davis
c7186590ea Support for directory browsing 2016-01-22 17:30:09 -08:00
Brad Davis
2026821d9e Moving preferences to dependency mananger 2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506 First pass on preferences dialog 
Conflicts:
	tests/ui/qmlscratch.pro
 2016-01-22 17:30:07 -08:00
Leonardo Murillo
6cd6c3038f Merge pull request #6911 from birarda/remove-old-interface 
remove old Interface and vcredist_x64.exe while running new installer
 2016-01-22 19:14:41 -06:00
Stephen Birarda
78609ed634 fix reference to components install path on OS X 2016-01-22 17:07:05 -08:00
Brad Hefta-Gaub
0c64d45c18 Merge pull request #6909 from hyperlogic/tony/fly 
MyAvatar: fly animation
 2016-01-22 17:04:53 -08:00
Brad Hefta-Gaub
d1444514e2 Merge pull request #6912 from sethalves/no-bootstrap 
adjust grab script so that avatars can't bootstrap themselves during an object hand-off
 2016-01-22 16:55:31 -08:00
Stephen Birarda
95f9f7e6d6 remove old installer files while running new install 2016-01-22 16:51:52 -08:00
Clément Brisset
860d97edd7 Merge pull request #6910 from birarda/chromium-competition 
fix for crashing web windows, console search filtering
 2016-01-22 16:46:44 -08:00
Stephen Birarda
3c2923f50a Merge pull request #6893 from Atlante45/fix/new-assignment 
Fix DS new assignment feature
 2016-01-22 16:44:35 -08:00
Seth Alves
41a2173901 adjust grab script so that avatars can't bootstrap themselves during an object hand-off 2016-01-22 16:38:28 -08:00
samcake
338342cdec Merge pull request #6859 from zzmp/flag/shadows 
Add shadows behind a render-menu flag
 2016-01-22 16:28:17 -08:00
Atlante45
9330c3d4f3 Fix DS assignment scripts responses 2016-01-22 16:04:38 -08:00
Stephen Birarda
801cbf3fac make sure CONSOLE_INSTALL_APP_PATH is defined before use 2016-01-22 15:59:39 -08:00
Stephen Birarda
4e76f3ccc4 use RMDir for removal of old SC dirs 2016-01-22 15:55:58 -08:00
Stephen Birarda
6951f1aed7 tweak server console deletion requirements 2016-01-22 15:55:58 -08:00
Stephen Birarda
da1902ac72 use CMake InstallRequiredSystemLibraries for MSVC 2016-01-22 15:55:58 -08:00
Stephen Birarda
921d4dccd7 remove anything previously installed by old server-console 2016-01-22 15:55:58 -08:00
Stephen Birarda
971603bd57 make shortcuts to server-console point to right place 2016-01-22 15:55:58 -08:00
Stephen Birarda
53eee27086 use incredibly dumb win path to 64-bit dlls 2016-01-22 15:55:58 -08:00
Stephen Birarda
47a630f0ad manually install msvc DLLs with Interface/DS/AC 2016-01-22 15:55:58 -08:00
Stephen Birarda
055a0ff7d9 check a level up from server-console.exe for win32 2016-01-22 15:55:58 -08:00
Stephen Birarda
9039334af5 reinstate the search filter in log 2016-01-22 15:55:58 -08:00
Stephen Birarda
5743c8046c install the server-console in a subdir on win32 2016-01-22 15:55:58 -08:00
Leonardo Murillo
5d8828e872 Merge pull request #6894 from birarda/console 
use macdeployqt for fixup of components
 2016-01-22 17:49:45 -06:00