Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 08:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26077 commits 72 branches 59 tags 1.2 GiB
Commit graph

11432 commits

Author SHA1 Message Date
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
David Rowe
6071e44ba4 Regularize debug messages for Faceshift and DDE 2015-04-25 11:35:14 -07:00
David Rowe
c37eb3de8a Fix DDE shutdown 2015-04-25 11:34:50 -07:00
David Rowe
736691e3ec Refactor face tracking FPS calculation 2015-04-25 11:33:32 -07:00
Seth Alves
b69cba1aba respond to code-review 2015-04-25 10:50:18 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
9fbd5d79e4 Removing duplicate declaration 2015-04-24 17:46:56 -07:00
Brad Davis
dab8761c71 Merge remote-tracking branch 'upstream/master' into ui-refactor 2015-04-24 16:46:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
e5df17eb99 Merge pull request #4691 from ZappoMan/defaultAvatars 
fix default avatars on first run
 2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub
dbb1e3c820 Merge pull request #4682 from jherico/offscreen 
Attempting to fix backspace issue in new UI
 2015-04-24 16:10:42 -07:00
Brad Hefta-Gaub
4fccb74855 Merge pull request #4692 from huffman/checkbox-fix 
Checkbox fix
 2015-04-24 16:08:52 -07:00
Clément Brisset
23ac8b1c8c Merge pull request #4693 from ctrlaltdavid/faceshift-fps 
Log Faceshift FPS after a reset
 2015-04-24 23:59:37 +02:00
David Rowe
e33f3c9d00 Remove unnecessary #include 2015-04-24 13:42:56 -07:00
Ryan Huffman
547b0e5ee6 Update style of webview to only be set when 'fusion' exists 2015-04-24 13:42:03 -07:00
Andrew Meadows
7cd9023e23 build Avatar shape on SkeletonModel load 2015-04-24 13:26:26 -07:00
Andrew Meadows
79cb55eabc rename setJointStates() --> initJointStates() 2015-04-24 13:26:26 -07:00
Andrew Meadows
c4395e75bb cleanup and comments 2015-04-24 13:26:26 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
1ff8c67576 More work on menus and some code cleanup 2015-04-24 12:54:11 -07:00
David Rowe
a141ebbf93 Log Faceshift FPS after a reset 2015-04-24 12:49:41 -07:00
Ryan Huffman
df591f9ad7 Set style of webview 2015-04-24 11:49:33 -07:00
ZappoMan
37928dcd6d fix default avatars on first run 2015-04-24 11:30:18 -07:00
Atlante45
fb5a0c8b01 Only send touchUpdateEvent if it is one 
ie. not for touchBeginEvent
 2015-04-24 18:50:45 +02:00
Clément Brisset
9c5f384080 Merge pull request #4683 from ctrlaltdavid/dde-revert 
Revert DDE start-up permission change
 2015-04-24 14:34:00 +02:00
Clément Brisset
efc5e5d52b Merge pull request #4684 from ctrlaltdavid/dde-fps 
Log DDE FPS after a reset
 2015-04-24 14:28:26 +02:00
Brad Davis
c0d562ed55 Merge branch 'offscreen' into m_and_m 2015-04-23 23:45:11 -07:00
Brad Davis
a4619c8e59 Merge branch 'master' into offscreen 2015-04-23 23:41:36 -07:00
Brad Davis
1d316a1872 Still working on menus 2015-04-23 23:41:09 -07:00
Brad Davis
f17387fab4 Working on menus 2015-04-23 21:23:21 -07:00
David Rowe
1678d77af6 Log DDE FPS after a reset 2015-04-23 17:18:32 -07:00
Brad Davis
8cb298a55b Working on menus 2015-04-23 14:23:15 -07:00
Brad Davis
3ba0df5201 Fixing headers 2015-04-23 14:23:13 -07:00
Brad Davis
8269b9925b Adding first pass at message box 2015-04-23 14:23:12 -07:00
Brad Davis
a9d65f168b Working on marketplace dialog 2015-04-23 14:23:11 -07:00
David Rowe
d10621f329 Revert DDE start-up permission change 2015-04-23 14:16:59 -07:00
Brad Davis
ae804357d8 Attempting to fix backspace issue in new UI 2015-04-23 14:10:54 -07:00
Brad Hefta-Gaub
ad7293d4ad Merge pull request #4679 from jherico/offscreen 
Fix a couple of bugs with the new offscreen UI
 2015-04-23 12:45:51 -07:00
Brad Davis
ac7b373231 Throttle rendering needs to ensure it's active context 2015-04-23 10:27:28 -07:00
Ryan Huffman
b31f95a002 Fix cube rendering not working with transparency 2015-04-23 09:34:23 -07:00
Brad Hefta-Gaub
82d3302d1b Merge pull request #4644 from jherico/offscreen 
Working on new-UI implementations of address bar and login
 2015-04-23 07:17:45 -07:00
Brad Davis
eab4ad9ea9 More coding standard stuff 2015-04-22 20:16:41 -07:00
Brad Davis
732e9723cd Messed up rename 2015-04-22 19:24:43 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Brad Davis
8d8c4babba Coding standard fixes 2015-04-22 19:06:22 -07:00
David Rowe
35e2b87a70 Rename DDE menu items 2015-04-22 13:15:57 -07:00
David Rowe
649d4736cd Merge branch 'master' into dde-miscellaneous 2015-04-22 13:00:40 -07:00
David Rowe
63d0efcdec Open and close avatar selector with Ctrl-A 2015-04-22 09:48:09 -07:00
Brad Davis
e68f149aac Fixing bad merge 2015-04-21 13:18:53 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Seth Alves
284215d46a Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-21 09:53:15 -07:00
Thijs Wenker
85e9a794a3 ability to run multiple interfaces on single Windows machine by switching user accounts (or using run as) 2015-04-21 03:58:39 +02:00
Seth Alves
64c23b8e8b Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 16:56:24 -07:00
David Rowe
1af17fa9e7 Use voice to control DDE mouth 
Add voice blend coefficient values to DDE values.
 2015-04-20 16:14:36 -07:00
Clément Brisset
b64d7fc17c Merge pull request #4662 from birarda/remove-visage 
remove visage support
 2015-04-20 20:06:21 +02:00
David Rowe
766087c032 Run DDE "readonly" 
Try to fix some people having to run Interface in admin mode on Windows
 2015-04-20 10:29:53 -07:00
David Rowe
8268dc95ac Include DDE reset in sensors reset 2015-04-20 10:28:17 -07:00
Seth Alves
f452e47577 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 08:49:33 -07:00
Brad Hefta-Gaub
29971a5c59 Merge pull request #4664 from samcake/orange 
Teaching Project, Cleaning the interface for the default Sun light properties and more
 2015-04-19 09:57:04 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Stephen Birarda
511240da5a remove Visage from FaceTracker comment 2015-04-17 14:29:51 -07:00
Stephen Birarda
6b615c1ba1 remove Visage from menu header 2015-04-17 14:28:20 -07:00
David Rowe
931c46345e Move visibility methods into DiscoverabilityManager 2015-04-17 14:15:50 -07:00
Stephen Birarda
30e580e207 remove visage from Menu 2015-04-17 13:42:30 -07:00
Stephen Birarda
604bc2abe1 remove visage related files 2015-04-17 13:40:31 -07:00
Stephen Birarda
3055359d4c remove visage references from Application 2015-04-17 13:40:18 -07:00
Sam Gateau
11879f6142 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 13:04:00 -07:00
Philip Rosedale
3814fbc0c2 Merge pull request #4658 from ctrlaltdavid/dde-filtering 
DO NOT MERGE - DDE filtering
 2015-04-17 15:41:03 -04:00
Seth Alves
292ba20cf3 pull andrew's measure-acceleration branch 2015-04-17 11:35:12 -07:00
Sam Gateau
f1e0d5855e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 11:33:39 -07:00
David Rowe
ee48024831 Remove uninitialized method reference 2015-04-17 11:31:48 -07:00
David Rowe
6b085ca668 Move method out of Menu class 2015-04-17 10:53:04 -07:00
David Rowe
c823fcd083 Code tidying 2015-04-17 10:35:48 -07:00
Clément Brisset
516acee1c7 Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart 
Fix stop/reload all scripts affecting already-stopped scripts
 2015-04-17 16:29:23 +02:00
Clément Brisset
e780d8e482 Merge pull request #4648 from ctrlaltdavid/dde-shutdown 
Terminate DDE process gracefully
 2015-04-17 16:28:32 +02:00
Brad Davis
fd0c130dc2 Working on simplifying new dialog creation 2015-04-16 22:20:49 -07:00
Bradley Austin Davis
759acfa175 Working on getting the offscreen UI working on retina 2015-04-16 19:30:31 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
ZappoMan
41e7b75a8d revert mac version of HMD tools back to meta-H 2015-04-16 17:14:18 -07:00
David Rowe
d60ee3b6e2 Add velocity filtering to DDE eyelids 2015-04-16 16:28:22 -07:00
David Rowe
c46f21152f Add velocity filtering to DDE head movement 
Based on filtering code in Faceshift.cpp.
 2015-04-16 15:47:02 -07:00
David Rowe
3e484ee208 Add menu item for enabling DDE filtering 2015-04-16 15:04:25 -07:00
David Rowe
23d56f5bd0 Remove current DDE filtering 2015-04-16 14:51:55 -07:00
Brad Davis
a624ff43c4 Nothing to see here, move along 2015-04-16 14:10:29 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Andrew Meadows
1acb90e23a merge upstream/master into andrew/isothermal 2015-04-16 13:48:47 -07:00
Sam Gateau
9466cf9345 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-16 10:27:13 -07:00
Clément Brisset
3c67c69745 Merge pull request #4651 from ZappoMan/HMDToolsTweaks 
Some small tweaks
 2015-04-16 16:10:43 +02:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
ZappoMan
ffb5ea50b1 expose avatar settings to JS 2015-04-15 17:00:50 -07:00
ZappoMan
1a1fe11111 switch HMD tools hot-key 2015-04-15 17:00:20 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00
David Rowe
2f970ae962 Terminate DDE process gracefully 2015-04-15 11:07:00 -07:00
Sam Gateau
cd1bbb2855 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 10:16:28 -07:00
Brad Hefta-Gaub
72f9ae3e85 Merge pull request #4643 from ctrlaltdavid/fix-auto-start-animation 
Fix auto start animation
 2015-04-15 10:14:26 -07:00
Clément Brisset
d6ee1c708d Merge pull request #4642 from ZappoMan/avatarUI 
New Avatar UI
 2015-04-15 19:13:23 +02:00
Brad Davis
1563b05278 Merge branch 'master' into offscreen 2015-04-15 10:01:15 -07:00
Ryan Huffman
f8e4ff8072 Update Application:stopAllScripts to skip finished scripts 2015-04-15 09:54:30 -07:00
Brad Hefta-Gaub
6d6b66f19a Merge pull request #4641 from huffman/window-close-quit 
Quit application when main window is closed
 2015-04-15 09:42:52 -07:00
Sam Gateau
5ebbdaca05 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 09:00:50 -07:00
Sam Gateau
1046356abb FIx the include that was using the wrong \ in the path... 2015-04-15 09:00:20 -07:00
Brad Hefta-Gaub
a105f579ce Merge pull request #4621 from jherico/oculus_crash 
Attempt to stop the crashing on exit caused by the Oculus SDK
 2015-04-15 08:52:17 -07:00
Atlante45
2f2be70eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio 2015-04-15 17:30:57 +02:00
Atlante45
c2c1ccc2b7 Remove generated audio options from menu 2015-04-15 15:50:22 +02:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Sam Gateau
fec52f6b10 Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly 2015-04-14 18:27:24 -07:00
David Rowe
2c5201f116 Fix animation not automatically starting at start-up 2015-04-14 16:54:14 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
ZappoMan
174e9f2133 more tweaks to preferences UI 2015-04-14 12:38:29 -07:00
Ryan Huffman
4d34ba7bdf Update main window to quit app when closed 2015-04-14 10:57:47 -07:00
ZappoMan
9262585bab first cut at moving avatar appearance into separate dialog box 2015-04-14 10:38:22 -07:00
Andrew Meadows
abb40ca080 cleanup: split stats dump out of stepSimulation 2015-04-14 09:00:36 -07:00
Sam Gateau
c34c5f6075 adding the Fremabuffer to be used for shadows and main rendering 2015-04-14 08:47:52 -07:00
David Rowe
f509d08378 Handle DDE already running 2015-04-13 23:12:13 -07:00
David Rowe
b7f7cebb80 Handle DDE stopping unexpectedly 2015-04-13 22:41:17 -07:00
David Rowe
3b6a35c38f Merge branch 'master' into 20447 2015-04-13 17:22:34 -07:00
David Rowe
13c038879d Don't repeat constant values 2015-04-13 17:13:03 -07:00
David Rowe
2c4f049851 Change OSX DDE program path per build system requirements 2015-04-13 17:11:27 -07:00
Triplelexx
722ac46668 Merge branch 'master' into myavatar-targetvelocity 2015-04-14 00:11:10 +01:00
Triplelexx
d2b643d389 Add targetVelocity into MyAvatar simulation 
MyAvatar sets a target velocity to achieve, this is parsed in the
preSimulation controller step.
 2015-04-13 23:57:08 +01:00
Andrew Meadows
f969517ab0 Merge pull request #4633 from Atlante45/master 
Fix ghost avatars
 2015-04-13 08:45:01 -07:00
Andrew Meadows
0a5ae8e7e1 Merge pull request #4610 from thoys/20367 
CR for Job #20367 - Enable getPublicScripts, and getRunningScripts
 2015-04-13 08:42:39 -07:00
Atlante45
809c7919aa Fix ghost avatars 2015-04-13 15:57:36 +02:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol 
Acceleration and owner in wire protocol
 2015-04-10 09:07:47 -07:00
Thijs Wenker
cf403a7ad8 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-09 23:47:20 +02:00
Thijs Wenker
0cb5ee5bd1 - Scripts JS object renamed to ScriptDiscoveryService. 
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
 2015-04-09 23:46:49 +02:00
samcake
91d6046051 Merge pull request #4622 from jherico/starfield_hack_fix 
Ensure blending is enabled during starfield rendering
 2015-04-09 09:45:14 -07:00
Seth Alves
73a1265624 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-09 09:21:06 -07:00
Brad Davis
5efb960645 Ensure blending is enabled during starfield rendering 2015-04-09 09:18:53 -07:00
Brad Davis
f496175fb9 Attempt to stop the crashing on exit caused by the Oculus SDK 2015-04-09 09:17:23 -07:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting 
CR for Animation fixes
 2015-04-09 11:39:13 +02:00
Seth Alves
30a8b61df3 quiet compiler 2015-04-08 15:39:21 -07:00
Philip Rosedale
b949353b0b Merge pull request #4611 from AndrewMeadows/isentropic 
use DynamicCharacterController
 2015-04-08 08:03:01 -07:00
Brad Davis
9b34003e2d Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close 
Quit VRMode before aboutToQuit runs
 2015-04-07 17:06:29 -07:00
Philip Rosedale
af3073e6c3 Merge pull request #4584 from jherico/menu 
Stop the menu from breaking on leaving HMD mode
 2015-04-07 16:41:41 -07:00
Andrew Meadows
40c94fa00e merge upstream/master into andrew/isentropic 2015-04-07 16:23:38 -07:00
Andrew Meadows
b5f0c57dd1 jumping and hovering works with dynamic controller 2015-04-07 15:07:46 -07:00
Brad Davis
c1a1157df9 Merge branch 'master' into menu 2015-04-07 14:41:17 -07:00
David Rowe
09b929b729 Restart looped animation running at shutdown when Interface starts 2015-04-07 14:02:24 -07:00
David Rowe
670d455b90 Fix manually entered attachment model URL not being used 2015-04-07 13:47:37 -07:00
David Rowe
ccf3afadfb Fix manually entered joint mask value not being applied 2015-04-07 13:43:58 -07:00
David Rowe
082a9196ff Fix manually entered animation URL not being able to be started 2015-04-07 13:43:04 -07:00
Clément Brisset
61028d12b5 Merge pull request #4600 from jherico/render_crash_on_exit 
Ensure the frame timer doesn't re-engage on exit
 2015-04-07 22:17:47 +02:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Brad Davis
2f4c3057f3 Merge pull request #4604 from Atlante45/oculus_pick_offset 
Oculus pick offset
 2015-04-07 11:48:21 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
e63b39f061 oops missed one 2015-04-07 09:15:40 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Thijs Wenker
af34add63c added example for the new Scripts functions: 
example\misc\scriptsExample.js
 2015-04-07 17:39:50 +02:00
Atlante45
5e3ed1c8e4 Compute correct mouse position 2015-04-07 17:15:16 +02:00
Atlante45
1cc4384404 Add new frame of reference for cursor 2015-04-07 17:13:30 +02:00
Atlante45
ae6ee54569 Fix ray collision not using inverse rot 2015-04-07 17:11:02 +02:00
Atlante45
73f9276c74 Fix warning 2015-04-07 17:10:31 +02:00
Thijs Wenker
a783f03025 New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional. 2015-04-07 16:48:11 +02:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Thijs Wenker
484b014fa7 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-07 01:07:04 +02:00
Thijs Wenker
2b23108e61 ScriptsScripting Interface 2015-04-07 01:06:39 +02:00
Andrew Meadows
435ce106eb Add DynamicCharacterController prototype 2015-04-06 16:03:13 -07:00
David Rowe
ce104e8c40 Merge branch 'master' into 20447 2015-04-06 15:18:19 -07:00
Brad Davis
74cf4b57b3 Ensure the frame timer doesn't re-engage on exit 2015-04-06 11:25:47 -07:00
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
d6f74aa0ad Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-06 09:56:16 -07:00
Atlante45
a120e50cc0 Account for actual eye position in oculus pick ray 2015-04-06 18:29:02 +02:00
Andrew Meadows
96a834183f Merge pull request #4594 from jherico/oculus3 
Enable Direct HMD mode only on windows
 2015-04-06 09:24:53 -07:00
Atlante45
a3f8076641 Quit VRMode before aboutToQuit runs 2015-04-06 17:55:48 +02:00
Clément Brisset
efbd74f539 Merge pull request #4597 from huffman/light-overlays 
Light overlays
 2015-04-06 16:02:44 +02:00
Sam Gateau
10269bd556 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
David Rowe
765d66eee5 Fix running without DDE available 2015-04-04 19:20:44 -07:00
David Rowe
65c1fea689 Increase DDE head translation to make avatar better reflect RL 2015-04-04 19:08:23 -07:00
David Rowe
1eb5716ab7 Shut down DDE when Interface shuts down 2015-04-04 19:04:47 -07:00
David Rowe
00f5469fa8 Add menu item that resets DDE tracking 2015-04-04 17:31:32 -07:00
Seth Alves
e06dada756 Merge pull request #4592 from AndrewMeadows/thermonuclear 
profiling for physics simulation
 2015-04-04 15:00:44 -07:00
David Rowe
0d42c7a1c1 Start and stop DDE as separate process 2015-04-03 19:16:07 -07:00
David Rowe
f6bf1d4141 Disable DDE code if not Windows or OSX 2015-04-03 17:41:19 -07:00
ZappoMan
0bc1b02895 improvements to tracking model names 2015-04-03 17:24:53 -07:00
ZappoMan
50479d5d5e set name to Default when using default url 2015-04-03 17:06:54 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
Bradley Austin Davis
f75ddb95f5 Enable Direct HMD mode only on windows 2015-04-03 17:01:21 -07:00
Ryan Huffman
ce2c23de51 Fix color not working for wire circle3d 2015-04-03 16:28:12 -07:00
ZappoMan
aaf191b6dc first cut at new avatar preferences UI 2015-04-03 14:31:43 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
7718680091 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-03 10:33:24 -07:00
Andrew Meadows
88ee1c313a Merge pull request #4583 from huffman/fix-script-editor-icons 
Update script editor to set icons programatically
 2015-04-03 09:31:58 -07:00
Bradley Austin Davis
44c9d4a742 Working on removing some of the warnings in the xcode build 2015-04-02 16:12:44 -07:00
Andrew Meadows
2089a8c2dd temporary debug setup: dump physics stats on F key 2015-04-02 15:33:06 -07:00
Andrew Meadows
eaef08abd5 add break to Key_Comma switch case 2015-04-02 15:25:55 -07:00
Sam Gateau
f96079f4f9 fixed the getViewFUrstum warning in DEBUG mode 2015-04-02 14:43:15 -07:00
Brad Davis
605cf19f6f Merge pull request #4565 from ctrlaltdavid/20422 
CR for #20422 - Add the ability to manage friends via Interface
 2015-04-02 14:10:40 -07:00
Andrew Meadows
a824403132 Merge pull request #4582 from sethalves/island 
Comma toggles rendering of collision hulls; more changes to vhacd stuff
 2015-04-02 10:37:17 -07:00
Bradley Austin Davis
8a757a4b6e Further work on menu handling on OSX in fullscreen / VR mode 2015-04-02 10:27:11 -07:00
Bradley Austin Davis
fb2b1204db Stop the menu from breaking on leaving HMD mode 2015-04-02 10:16:52 -07:00
Seth Alves
41ec2fdbe3 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-02 09:19:54 -07:00
Ryan Huffman
df5a03b447 Update script editor to set icons programatically 2015-04-02 09:10:47 -07:00
Andrew Meadows
fc4e6e9355 merge upstream/master into andrew/bispinor 2015-04-02 09:04:15 -07:00
Andrew Meadows
f804b2311d remove hover-friendly behavior 2015-04-02 08:40:47 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master 
use non-persistent settings to avoid lobby crash confusion
 2015-04-02 17:37:24 +02:00
David Rowe
349cc3241d Restore minimized windows to view 2015-04-01 18:59:34 -07:00
David Rowe
49de54de48 Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
Seth Alves
abf83bcf9e Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-01 18:26:26 -07:00
Seth Alves
79b1a6aeb0 comma key toggles rendering of collision hulls 2015-04-01 17:45:47 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Andrew Meadows
b537625e59 Merge pull request #4574 from ZappoMan/crashOnExit 
fix crash on shutdown related to entity scripts connecting to signals
 2015-04-01 17:26:33 -07:00
Brad Hefta-Gaub
ad27d7353b Merge pull request #4386 from jherico/oculus_old_renderer 
DO NOT MERGE - Update Oculus SDK integration
 2015-04-01 17:17:32 -07:00
Stephen Birarda
ee088e12f3 leverage scene scripting values to toggle rendering 2015-04-01 17:06:06 -07:00
Brad Hefta-Gaub
e5757575de Merge pull request #4578 from samcake/orange 
tweak the default specular value for the Primitive entities to less shiny
 2015-04-01 16:36:53 -07:00
Bradley Austin Davis
58908f44ef Fixing crash on exit when using (or used) VR mode 2015-04-01 16:05:46 -07:00
Sam Gateau
4a6046b07c tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much 2015-04-01 15:50:04 -07:00
Bradley Austin Davis
fd47d4f3a5 Working on putting some more timing measurement into the code 2015-04-01 15:47:51 -07:00
Andrew Meadows
b37384d759 exit hover now not quite automatic when over floor 
remove MyAvatar::jump() method for more general API
 2015-04-01 15:13:27 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
Stephen Birarda
526c9217a1 fix signup link from login dialog 2015-04-01 14:43:56 -07:00
Bradley Austin Davis
3b77118baa Merge branch 'master' into oculus_old_renderer 2015-04-01 14:09:29 -07:00
Andrew Meadows
245729cba8 fix for avatar unable to jump into hover on mac 2015-04-01 13:47:40 -07:00
ZappoMan
aac824fb99 fix crash on shutdown 2015-04-01 13:47:25 -07:00
Bradley Austin Davis
a7dc1d26e6 Working on SDK vs client distortion performance differences 2015-04-01 13:23:55 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
David Rowe
e519928320 Move friends window to own class 2015-04-01 11:38:32 -07:00
ZappoMan
da9a8e8a97 CR feedback 2015-04-01 09:27:58 -07:00
ZappoMan
827e37b920 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-01 09:09:50 -07:00
Bradley Austin Davis
e520a62bcf Merge branch 'master' into oculus_old_renderer 2015-04-01 09:09:06 -07:00
Sam Gateau
ad11503466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-31 23:12:17 -07:00
Stojce Slavkovski
8514a39812 Use constants for URLs 2015-04-01 07:24:16 +02:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
Bradley Austin Davis
db9ab3e699 Merge branch 'master' into oculus_old_renderer 2015-03-31 18:25:34 -07:00
Bradley Austin Davis
eb816f7f6a Adding support for eye per frame mode and offscreen render scaling 2015-03-31 18:24:58 -07:00
Philip Rosedale
d57959503b Merge pull request #4560 from AndrewMeadows/bispinor 
improved bounding shape calculation for Mery model
 2015-03-31 18:19:34 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Andrew Meadows
ef10e5734d bounding box for skeleton with bad mesh weights 2015-03-31 16:53:33 -07:00
Stephen Birarda
61806935bb add a networking constants class with metaverse URL 2015-03-31 16:40:21 -07:00
ZappoMan
d68143675a first simple pass at using marketplace windows in preferences 2015-03-31 16:24:27 -07:00
Brad Hefta-Gaub
b6f670a8d8 Merge pull request #4554 from samcake/yellow 
Better support for Nvidia Optimus Laptop
 2015-03-31 15:56:01 -07:00
Bradley Austin Davis
a7eebfd002 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-31 15:42:01 -07:00
Sam Gateau
b4d11e2eb5 Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used 2015-03-31 15:18:59 -07:00
Bradley Austin Davis
6757dfcc0c Working on 0.5.0.1 port and addressing the direct HMD/v-sync conflict 2015-03-31 14:52:21 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -07:00
Bradley Austin Davis
c4c6cf82a2 Working on migration to SDK 0.5.0.1 2015-03-31 13:27:11 -07:00
Bradley Austin Davis
56b5ad2e6b Merge branch 'master' into oculus_old_renderer 2015-03-31 11:10:23 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
Sam Gateau
ee4b9a483b found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 18:04:44 -07:00
Philip Rosedale
ce05d3104a Merge pull request #4535 from ZappoMan/scriptCaching 
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
 2015-03-30 18:02:52 -07:00
ZappoMan
64fdca7d6d fix no root joint warning 2015-03-30 17:32:42 -07:00
Sam Gateau
ee3ec3fe1a found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 17:28:58 -07:00
ZappoMan
3475bfb396 fix typos 2015-03-30 17:04:47 -07:00
Bradley Austin Davis
5e5bdec88d Merge branch 'master' into oculus_old_renderer 2015-03-30 16:36:00 -07:00
Andrew Meadows
9b13f186e3 remove character from PhysicsEngine on shutdown 2015-03-30 15:51:58 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions 
Multi hull collisions
 2015-03-30 12:11:56 -07:00
Andrew Meadows
2404fb126f Merge pull request #4527 from sethalves/valgrind 
Valgrind told me to do it
 2015-03-30 11:56:17 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00
Sam Gateau
ab9be0cb41 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-30 10:11:08 -07:00
Sam Gateau
2a58a65a8f back to the office monday morning, State almost working in the full piupeline 2015-03-30 10:10:39 -07:00
Seth Alves
7de15cda87 quiet compiler 2015-03-30 09:30:13 -07:00
Philip Rosedale
099a2b5319 Merge pull request #4521 from ctrlaltdavid/20416 
CR for Job #20416 - Update notification.js to include a notification about being blocked from a server
 2015-03-30 08:49:29 -07:00
David Rowe
cbf2012bf5 Add menu items that set visibility 
And synchronize visibility settings between Interface and users.js.
 2015-03-29 18:35:56 -07:00
ZappoMan
3bda65f4fe if installing a body, and you have no head, make your head the default head 2015-03-28 19:19:11 -07:00
ZappoMan
80df8caefb Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-03-28 18:43:03 -07:00
Seth Alves
fc1e45fc58 valgrind says this is used before it's initialized 2015-03-28 17:10:46 -07:00
Seth Alves
986bc71e93 quiet compiler 2015-03-28 17:10:26 -07:00
David Rowe
be69c0b58f Add add/remove friends menu item 
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
 2015-03-28 13:05:23 -07:00
ZappoMan
002fba8018 first cut at predicting FST type for set avatar 2015-03-27 16:56:03 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-27 15:55:20 -07:00
Andrew Meadows
5b85a2aa44 merge upstream/master into andrew/inertia 2015-03-27 13:56:54 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
ZappoMan
6189926105 add type hint to FST in model packager 2015-03-27 13:23:29 -07:00
Philip Rosedale
6550b4e311 Merge pull request #4509 from AndrewMeadows/inertia 
character transitions into "hover" when stepping over abyss
 2015-03-27 13:16:36 -07:00
David Rowe
90c1da2094 Merge branch 'master' into 20416 
Conflicts:
	examples/notifications.js
 2015-03-27 12:13:29 -07:00
Brad Hefta-Gaub
2255c30d58 Merge pull request #4512 from Atlante45/ordered_fst 
Hint order for FST files
 2015-03-27 09:41:50 -07:00
Andrew Meadows
e75bb3cd9c merge upstream/master into andrew/inertia 2015-03-27 08:14:36 -07:00
Stephen Birarda
647e2d7829 Merge pull request #4517 from ZappoMan/menuCleanup 
menu and display tweaks at Philip's request
 2015-03-26 20:06:16 -07:00
Andrew Meadows
821ac605f5 smoother motion on steps 
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
 2015-03-26 19:48:52 -07:00
Seth Alves
16875338bf Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-26 18:55:43 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00
Stephen Birarda
ba82436d95 add user heartbeat if they choose not to send location 2015-03-26 16:50:40 -07:00
ZappoMan
6cff99f9d6 menu and display tweaks 2015-03-26 16:36:46 -07:00
Atlante45
716e9bfe4f Hint order for FST files 2015-03-26 15:40:48 +01:00
ZappoMan
9e34dda7c9 Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-25 16:54:37 -07:00
Brad Hefta-Gaub
918154e407 Merge pull request #4491 from huffman/export-json 
Update export entities to export as JSON
 2015-03-25 16:49:23 -07:00
ZappoMan
c031ce15a7 dead code 2015-03-25 16:45:51 -07:00
ZappoMan
19feeacc51 dead code 2015-03-25 16:38:57 -07:00
ZappoMan
f46067b634 better tracking of being done with downshifting 2015-03-25 16:30:33 -07:00
Clément Brisset
b81e89ad3d Merge pull request #4488 from ctrlaltdavid/20407 
CR for 20407 - Make Sixense emulate mouse only if controllers aren't at the base
 2015-03-26 00:24:17 +01:00
ZappoMan
68e730af45 handle throttle render case and clean up code logic to be more obvious 2015-03-25 15:48:50 -07:00
Seth Alves
c0b1ff4a57 Merge pull request #4500 from AndrewMeadows/inertia 
avatar can jump when using CharacterController
 2015-03-25 14:48:54 -07:00
Ryan Huffman
1c0e7e26a2 Merge pull request #4507 from birarda/friends-only-location 
make friends-only discoverability mode work as described
 2015-03-25 13:48:08 -07:00
Stephen Birarda
f075674415 Merge pull request #4502 from huffman/webwindow-open-url 
Add more functionality to WebWindow (get/set url, raise)
 2015-03-25 13:25:29 -07:00
ZappoMan
0c2a630a59 Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-25 12:51:21 -07:00
ZappoMan
ec2b11640c more tweaks to LOD logic 2015-03-25 12:51:13 -07:00
Stephen Birarda
7a9c1e20ab use new AccountManager API in DiscoverabilityManager 2015-03-25 12:04:47 -07:00
Stephen Birarda
89e5fef808 send friends_only key for discoverability 2015-03-25 11:46:08 -07:00
Leonardo Murillo
c3c1d4a5ae Switching to .com 2015-03-25 12:36:37 -06:00
Ryan Huffman
bb4417acc6 Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url 2015-03-25 10:49:24 -07:00
Clément Brisset
e6ac502fb5 Merge pull request #4497 from huffman/update-edit-help 
Update edit help
 2015-03-25 14:09:22 +01:00
Andrew Meadows
d497620976 avatar can jump with E key when walking 2015-03-24 23:05:46 -07:00
Andrew Meadows
b87360f0f5 merge upstream/master into andrew/inertia 2015-03-24 17:41:07 -07:00
Andrew Meadows
44eca08fa4 PhysicsEngine doesn't need AvatarData 
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
 2015-03-24 17:38:35 -07:00
Philip Rosedale
fe61387121 Merge pull request #4498 from ZappoMan/LODUITweaks 
Some LOD UI Tweaks
 2015-03-24 17:34:27 -07:00
Ryan Huffman
d54526b8bb Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl 2015-03-24 15:43:36 -07:00
ZappoMan
b67cf3af24 more tweaks to LOD tools dialog 2015-03-24 14:33:06 -07:00
ZappoMan
f43b8bbe8e make AvatarLODMultiplier based on octreeSizeScale 2015-03-24 13:59:46 -07:00
Ryan Huffman
3f986229d1 Rename edit-entities-commands.html to edit-commands.html 2015-03-24 13:43:10 -07:00
ZappoMan
619428c325 move LOD FPS settings to Preferences 2015-03-24 13:32:22 -07:00
Stephen Birarda
1a6865b41b send immediate location update when domain changes 2015-03-24 13:15:30 -07:00
Ryan Huffman
2fc0ef80d0 Add SVO_JSON_EXTENSION to accepted extensions 2015-03-24 10:40:46 -07:00
Ryan Huffman
6d932508ff Add support for .svo.json extension 2015-03-24 10:27:53 -07:00
ZappoMan
fa122a227b tweaks to the LOD Tools UI 2015-03-23 16:44:07 -07:00
Ryan Huffman
61dc31ffe7 Update export entities to export as JSON 2015-03-23 14:09:45 -07:00
David Rowe
cb6abfb2e6 Display notification if domain connection refused 2015-03-23 12:05:56 -07:00
ZappoMan
9fb53e3d72 CR feedback 2015-03-23 11:13:42 -07:00
David Rowe
3de7222007 Make Sixense emulate mouse only if controllers aren't at the base 2015-03-23 09:06:15 -07:00
ZappoMan
19c8e526e1 add guards to _jointStates array size 2015-03-23 08:47:06 -07:00
Bradley Austin Davis
1d56266044 Merge branch 'master' into oculus_old_renderer 2015-03-20 09:56:54 -07:00
Brad Hefta-Gaub
3d6d79ae3a Merge pull request #4478 from sethalves/maximum-capacity 
Maximum capacity redux
 2015-03-20 09:28:22 -07:00
Brad Hefta-Gaub
96bfb96936 Merge pull request #4468 from ctrlaltdavid/20399 
CR for 20399 - Fix near field clipping on avatars with large heads
 2015-03-19 20:02:17 -07:00
Andrew Meadows
a7dbd6779f Merge pull request #4467 from huffman/avatar-thrust 
Fix thrust not being applied w/ Physics + Avatar
 2015-03-19 16:40:10 -07:00
ZappoMan
5f825211df Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars 2015-03-19 15:12:06 -07:00
Seth Alves
baa8e9c86f remove uneeded #includes 2015-03-19 13:05:30 -07:00
Seth Alves
817a6130ef return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list 2015-03-19 13:01:57 -07:00
ZappoMan
24132968fe oops 2015-03-19 12:41:44 -07:00
ZappoMan
26670f9e41 remove unneeded debug 2015-03-19 12:15:12 -07:00
ZappoMan
c5314aceac more DRYing up of code 2015-03-19 11:57:57 -07:00
ZappoMan
5814a14152 removed dead code 2015-03-19 11:42:00 -07:00
ZappoMan
e6cefa946c more DRYing of code 2015-03-19 11:41:03 -07:00
ZappoMan
3c41ecd091 cleanup accepted files implementation 2015-03-19 11:29:41 -07:00
Brad Davis
31c7c93aa3 Merge branch 'master' into oculus_old_renderer 2015-03-19 10:05:22 -07:00
ZappoMan
8e0141b8e9 first cut at fst drag/drop support 2015-03-19 08:48:13 -07:00
samcake
c0a66a05f4 Merge pull request #4463 from ZappoMan/LODTweaks 
MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased
 2015-03-18 16:55:39 -07:00
Brad Davis
872012856f Merge branch 'master' into oculus_old_renderer 2015-03-18 15:35:49 -07:00
Brad Davis
0c465ce2b5 Merge pull request #4460 from ZappoMan/runJSFiles 
MVP task - Allow a script to be added to a users "running script" from the marketplace
 2015-03-18 12:52:44 -07:00
David Rowe
c114442325 Merge branch 'master' into 20399 2015-03-18 12:44:29 -07:00
David Rowe
648a2e3b1d Set clip distance on rendering frustum rather than camera 
This fixes wrong clipping distance used for rendering in FPV if also
have rear view mirror.
 2015-03-18 12:43:49 -07:00
ZappoMan
8239a295cb Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks 2015-03-18 11:54:05 -07:00
ZappoMan
a2e012f7a9 Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles 2015-03-18 11:53:19 -07:00
Brad Davis
07ee350c09 Removing reported logspam from release builds 2015-03-18 10:24:53 -07:00
Brad Hefta-Gaub
53ae4b48bc Merge pull request #4459 from ctrlaltdavid/20400 
CR for 20400 - Name tags going through the head
 2015-03-17 21:54:13 -07:00
Brad Hefta-Gaub
a5294ae3fa Merge pull request #4436 from sethalves/persist-entities-as-json 
Optionally persist entities as json
 2015-03-17 21:53:17 -07:00
Brad Davis
d066271e4e Merging from master 2015-03-17 18:28:58 -07:00
Brad Hefta-Gaub
55d9560c9e Merge pull request #4469 from jherico/frustumFetchCheck 
Fix broken aspect ratio in mirror
 2015-03-17 17:06:21 -07:00
Brad Davis
1662230289 Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only 2015-03-17 16:44:29 -07:00
David Rowe
7b54443bda Adjust clip distance as HMD head moves backwards 2015-03-17 16:33:20 -07:00
David Rowe
a04bd09b83 Set clip near distance per skeleton model if no separate head model 2015-03-17 16:32:59 -07:00
Brad Davis
e616308911 Adding runtime check to ensure that the correct frustum is fetched during rendering 2015-03-17 16:28:44 -07:00
Ryan Huffman
870f1112e4 Fix thrust not being applied w/ Physics + Avatar 2015-03-17 16:17:44 -07:00
Brad Davis
895a0d7b85 Correcting frustum usage by the avatar renderer that was causing aspect ratio problem 2015-03-17 16:14:35 -07:00
Brad Davis
c88f6f8f07 Adding some documentation on the change 2015-03-17 13:49:06 -07:00
ZappoMan
1e03335012 implement scripting interface for LODManager 2015-03-17 13:18:29 -07:00
Brad Davis
71e59cfa88 Fix: Mini-mirror doesn't render avatar head when in first person mode 2015-03-17 13:15:15 -07:00
Ryan Huffman
d097b4409e Add title to non-toolbar WebWindows 2015-03-17 10:40:51 -07:00
ZappoMan
e5be8d01b6 tweaks to automatic-LOD adjustments 2015-03-17 10:36:39 -07:00
Ryan Huffman
1e1c60847b Add WebWindow::getURL 2015-03-17 09:07:01 -07:00
Ryan Huffman
8088b01356 Add WebWindow::raise 2015-03-17 09:06:48 -07:00
Ryan Huffman
46f6c9f888 Add WebWindow::setURL 2015-03-17 09:06:31 -07:00
ZappoMan
749bc1ee9b support for loading of JS files by drag, web page urls, and openfile events 2015-03-17 08:38:39 -07:00
Brad Hefta-Gaub
d33d3afb52 Merge pull request #4454 from Atlante45/fix_mouse_visible_in_oculus 
Hide cursor at MainWindow level when in VRMode
 2015-03-17 08:06:05 -07:00
Atlante45
1f8a874ce6 Hide cursor in 3D TV mode too 2015-03-17 12:34:13 +01:00
David Rowe
d08a25f1a3 A more realistic default head height 2015-03-16 15:48:10 -07:00
David Rowe
913527eaa3 Calculate head height based on skeleton model mesh if no head model 
This fixes the problem of some skeleton models with heads having
display names rendering through them.
 2015-03-16 15:47:54 -07:00
Brad Davis
0d0e3b5eeb Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-16 12:22:51 -07:00
Brad Davis
5aa4277d9b Removing a superfluous clear from Application.cpp. It's only required in client distortion mode 2015-03-16 12:22:35 -07:00
Atlante45
c5010c4d55 Hide cursor at MainWindow level when in VRMode 2015-03-16 14:19:24 +01:00
Seth Alves
806280f9cc Merge branch 'linux-tools-window-freakout' of github.com:sethalves/hifi into persist-entities-as-json 2015-03-15 09:00:24 -07:00
Seth Alves
bfa38521ed linux desktops are often configured as point-to-focus. don't autohide tools window on linux 2015-03-15 07:59:32 -07:00
Seth Alves
6c4b808813 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-15 07:10:56 -07:00
David Rowe
08c95555dd Calculate head height based on model mesh rather than joints 
This fixes the problem of some head models having display names
rendering through them.
 2015-03-14 09:47:47 -07:00
Brad Davis
f699a9c6f2 Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-13 20:31:06 -07:00
Stephen Birarda
dcff4f5956 use HIGH_FIDELITY_USER_AGENT for DataWebPage 2015-03-13 18:25:17 -07:00
Stephen Birarda
859f81cdd7 some & squishes missed in review 2015-03-13 18:12:31 -07:00
Stephen Birarda
641581a825 Merge pull request #4446 from huffman/marketplace-window 
Marketplace window
 2015-03-13 17:51:44 -07:00
Ryan Huffman
235b5d77ae Add missing include to DataWebPage 2015-03-13 17:38:36 -07:00
Ryan Huffman
47e63719ee Handle svo request in DataWebPage as import requests 2015-03-13 17:35:33 -07:00
Ryan Huffman
aca509d5cc Add Application::improtSVOFromURL 2015-03-13 17:35:06 -07:00
Philip Rosedale
009551c4dd Merge pull request #4441 from AndrewMeadows/isentropic 
more correct shape for avatar collision capsule
 2015-03-13 17:33:16 -07:00
Ryan Huffman
9d5c0cf4e3 Add layout to WebWindowClass to that it maximizes the webview 2015-03-13 17:25:24 -07:00
Ryan Huffman
1193d86d7b Update webwindow to use datawebview 2015-03-13 16:39:25 -07:00
Ryan Huffman
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -07:00
Ryan Huffman
53b5c7e971 Update WebWindow to raise when being set to visible 2015-03-13 14:11:01 -07:00
Ryan Huffman
dc3453a878 Add Window.raiseMainWindow() 2015-03-13 14:10:46 -07:00
Stephen Birarda
2b08c20900 Merge pull request #4440 from birarda/master 
remove the close activity from Interface
 2015-03-13 13:46:59 -07:00
Ryan Huffman
7ef1964a52 Add user agent for WebWindow 2015-03-13 11:52:02 -07:00
Ryan Huffman
93cdb3a293 Add option for non-tool window WebWindows 2015-03-13 11:51:40 -07:00
Ryan Huffman
2a84d9a6ab Fix issue with .svo's not loading when the url has parameters 2015-03-13 10:06:49 -07:00
Andrew Meadows
924ebe1e54 propagate skeleton's bounding box into AvatarData 2015-03-13 09:39:47 -07:00
Andrew Meadows
645fc7dbc9 remove unused variable 2015-03-13 09:39:06 -07:00
Brad Davis
7e50d6359e Merge remote-tracking branch 'upstream/master' into oculus_old_renderer 2015-03-12 22:54:44 -07:00
Brad Hefta-Gaub
fadd1a09e5 Merge pull request #4433 from ZappoMan/fix3DTV 
fix rendering of models in 3D TV mode
 2015-03-12 16:42:37 -07:00
Brad Hefta-Gaub
a6b5a73844 Merge pull request #4431 from ZappoMan/windowsMenuAssert 
Fix windows assert
 2015-03-12 16:42:10 -07:00
Andrew Meadows
be252147e2 merge upstream/master into andrew/isentropic 2015-03-12 16:38:59 -07:00
Andrew Meadows
6bd857c4ea update Avatar in PhysicsEngine on load new body 2015-03-12 16:35:12 -07:00
Andrew Meadows
1f3a267b16 compute correct bounding shape dimensions 2015-03-12 16:34:47 -07:00
Andrew Meadows
2fad4153a9 remove unused Avatar::getBoundingRadius() 2015-03-12 16:34:27 -07:00
Stephen Birarda
0fe843db01 Revert "remove the launch activity from UserActivityLogger" 
This reverts commit bc6ac9081f.
 2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f remove the launch activity from UserActivityLogger 2015-03-12 15:08:05 -07:00