Stephen Birarda
e2c3b626b3
add a DataWebDialog for authenticated access to data-web html
2014-09-18 09:05:25 -07:00
Stephen Birarda
7848c63fae
handle name location shortcut explicitly to work around bug
2014-09-17 14:43:48 -07:00
Brad Hefta-Gaub
e69e90b5b4
Merge pull request #3405 from thoys/20017
...
Code Review for Job #20017
2014-09-12 15:34:50 -07:00
Stephen Birarda
3b21348a63
make sure AddressManager signal is connected to before file event
2014-09-12 15:22:51 -07:00
Stephen Birarda
29dae39ad7
handle location lookup for offline user or not found
2014-09-12 15:01:08 -07:00
Thijs Wenker
df0cbd54fc
Merge branch 'master' of https://github.com/highfidelity/hifi into 20017
...
Conflicts:
interface/src/Application.cpp
2014-09-12 23:04:05 +02:00
Brad Hefta-Gaub
b209b70094
Merge pull request #3404 from birarda/data-web-domain-lookup
...
initial transition to new metaverse API
2014-09-12 13:45:40 -07:00
Brad Hefta-Gaub
fc33de28a0
Merge pull request #3399 from huffman/19831
...
Code Review for Job #19831
2014-09-12 13:45:20 -07:00
Stephen Birarda
f0ead98a2a
put back LocationScriptingInterface so it works prior to replacement
2014-09-12 13:28:18 -07:00
Thijs Wenker
dd47b7afc6
Merge branch 'master' of https://github.com/highfidelity/hifi into 20017
...
Conflicts:
interface/src/scripting/WindowScriptingInterface.cpp
2014-09-12 22:04:21 +02:00
Stephen Birarda
348bcdb37a
resolve conflicts on merge with upstream master
2014-09-12 11:23:16 -07:00
Stephen Birarda
93ff34baaa
force address bar lookup through handleLookupString
2014-09-12 11:21:38 -07:00
Stephen Birarda
ab7df8679d
fix broken hifi linking
2014-09-12 11:19:22 -07:00
Stephen Birarda
b77a3f4904
cleanup application file event handler
2014-09-12 10:15:51 -07:00
Stephen Birarda
1f2020d169
some url handling repairs, move existing error reply handlers to new format
2014-09-12 10:13:33 -07:00
Stephen Birarda
7896119228
remap two goToUrl calls to AddressManager
2014-09-12 09:56:40 -07:00
Philip Rosedale
8428b1a4ba
Merge pull request #3401 from chansensturm/audio-noise
...
New stereo audio panning object
2014-09-11 17:53:55 -07:00
Craig Hansen-Sturm
ecae9d5e85
compiler warnings
2014-09-11 17:20:15 -07:00
Stephen Birarda
b56ea5c936
centralize path creation from position and orientation to AddressManager
2014-09-11 17:17:47 -07:00
Stephen Birarda
de24842cf0
fix stuck drive keys for Avatar when modifier released
2014-09-11 11:48:26 -07:00
Ryan Huffman
4315d63fb5
Merge branch 'master' of github.com:highfidelity/hifi into 19831
2014-09-11 11:13:13 -07:00
Stephen Birarda
aaabe6b1e1
handle domain changes via address bar
2014-09-11 10:45:45 -07:00
Stephen Birarda
dd1b23044f
hook meta+enter up to address bar display
2014-09-11 10:24:04 -07:00
Stephen Birarda
71f2c0b542
initial addition of the AddressManager with location switch hooked up
2014-09-11 10:14:00 -07:00
Andrzej Kapolka
fe249ef348
Make sure the frustum that we use for culling contains the current camera
...
information.
2014-09-10 15:51:10 -07:00
Andrzej Kapolka
423e6d0594
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-09-10 13:51:46 -07:00
Andrzej Kapolka
2cba7b37bf
Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion.
2014-09-10 13:51:14 -07:00
wangyix
7a2897fb6b
fixes/patches for win32/vs2013 startup and shutdown
2014-09-10 12:24:59 -07:00
Thijs Wenker
cb907c1891
GlobalServicesScriptingInterface added, functions and properties functional
2014-09-10 13:57:38 +02:00
Andrzej Kapolka
a9eb35448a
Comment fix.
2014-09-08 15:39:20 -07:00
Andrzej Kapolka
e9964c71c9
Fix for rear view mirror.
2014-09-08 14:13:28 -07:00
Andrzej Kapolka
1ef9126482
Migrating to device-independent coordinates.
2014-09-08 13:59:19 -07:00
Brad Hefta-Gaub
a77739f31c
Merge pull request #3369 from ctrlaltdavid/20007
...
Code Review for Job #20007
2014-09-06 15:36:29 -07:00
David Rowe
5ebe6962a4
Make scripts loaded with Script.load() not persist
2014-09-06 09:59:47 -07:00
Andrzej Kapolka
0b2d0a0b07
Fix for mouse events.
2014-09-05 17:30:19 -07:00
Andrzej Kapolka
c2cd23a54c
Mouse coordinate fix.
2014-09-05 17:07:37 -07:00
Andrzej Kapolka
5bdad18ade
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-09-05 16:45:15 -07:00
Andrzej Kapolka
7f6b3d3649
Dimension fixes for Retina displays.
2014-09-05 16:44:45 -07:00
Andrzej Kapolka
37b4fe5166
Fix for deferred lighting/ambient occlusion when glow effect is disabled.
2014-09-05 14:16:12 -07:00
Andrzej Kapolka
b278857091
Wireframe option, fix for shadow menu group.
2014-09-05 13:51:22 -07:00
Ryan Huffman
e590f992f6
Merge branch 'master' of git://github.com/highfidelity/hifi into 19831
2014-09-05 10:18:02 -07:00
Ryan Huffman
d54dc5f2aa
Merge branch 'master' of github.com:highfidelity/hifi into 19935
...
Conflicts:
interface/src/Menu.h
2014-09-04 12:05:17 -07:00
Clément Brisset
cc6d70c5ab
Merge pull request #3336 from huffman/19995
...
Code Review for Job #19995
2014-09-04 11:37:35 -07:00
AndrewMeadows
8223481ecb
Merge pull request #3341 from huffman/19967
...
Code Review for Job #19967
2014-09-03 16:51:19 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
MarcelEdward
e62834c197
This patch updates Application::updateLocationInServer() in Application.cpp
...
The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds.
This function had an LastLocationObject in which only send in the location info to the data web in case the location changed.
Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.
2014-09-03 16:43:39 +02:00
Ryan Huffman
ece3390b4e
Fix bug with dropping hifi images not working on Windows
...
URLs on Windows included three forward-slashes, ex `file:///C:...`.
Using `toLocalFile()` correctly stringifies the location.
2014-09-01 22:14:28 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
David Rowe
1d3a176f5f
Rename method
2014-08-28 13:53:47 -07:00
David Rowe
46c1a9d59a
Make login dialog automatically show only once per domain visit
2014-08-28 11:25:13 -07:00
