Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 09:28:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46211 commits 25 branches 0 tags 1.1 GiB
Commit graph

5247 commits

Author SHA1 Message Date
Ryan Huffman
8ee3f680c9 Change default skybox ambient intensity from 3.5 to 2.0 2016-08-08 16:03:03 -07:00
Ryan Huffman
eaa77edc25 Replace 'Stars' menu option with 'Default Skybox' 2016-08-08 16:03:03 -07:00
Ryan Huffman
9cbfe195cd Adjust commenting out of old stars rendering code 2016-08-08 16:03:03 -07:00
Ryan Huffman
4c662b0d60 Add static consts for default skybox values 2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd Add default skybox 2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub
55c690d016 Merge pull request #8368 from huffman/feat/domain-connection-display 
Automatically show address bar after disconnected for X seconds
 2016-08-08 15:56:29 -07:00
Atlante45
f08b2f9257 Remove temporary override to reload QML 2016-08-08 15:39:44 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff Invite friends in HMD 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
David Kelly
c8f3a898d2 First cut of a snapshot uploader 
Will need to test end-to-end shortly, etc...
 2016-08-08 15:27:27 -07:00
Ryan Huffman
fb14628a7e Handle case in entity loading priority function where max dim size is <= 0 2016-08-08 10:39:27 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
d48bc96cf9 Add ability to set number of concurrent downloads 2016-08-08 08:53:06 -07:00
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
elisa-lj11
b1b2ea48b2 Made code more QA; extra browser and download widget close upon download 2016-08-04 17:01:19 -07:00
elisa-lj11
a94a304700 Downloads from Clara.io and uploads to asset server 2016-08-04 16:59:38 -07:00
elisa-lj11
6152fa28b7 Download through QML 
It kind of works, not crashing like before, but the weird ghost
file/type error is still happening with multiple downloads
 2016-08-04 16:58:31 -07:00
elisa-lj11
eab7714d70 working within webview to access url 2016-08-04 16:57:19 -07:00
elisa-lj11
76a847d34f testing for URL bug 2016-08-04 16:53:09 -07:00
elisa-lj11
212e4f9cca making quazip work 2016-08-04 16:48:14 -07:00
elisa-lj11
4f33e1502f starting the zip project 2016-08-04 16:46:56 -07:00
Ryan Huffman
8044910bf2 Add show-address-bar when disconnected from domain 2016-08-04 14:39:53 -07:00
Seth Alves
40a5e4abc8 in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk 2016-08-03 13:54:25 -07:00
Anthony J. Thibault
0ab15f0dcd fixed one frame lag on webEntity keyboard highlight overlay. 
Also, made overlay not draw in front.
 2016-08-02 15:35:59 -07:00
Howard Stearns
c2d1f08551 Merge pull request #8342 from highfidelity/dk/snapshot 
Snapshot button
 2016-08-02 15:31:50 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
David Kelly
1d7cdff2bc Snapshot button plus script 
Minor change to allow snapshots to not notify (though the old way
with CTRL+S still does).  Added button to do it, saves them to disk.

The plan is for us to add UI to share (or not) the snapshot.  That's
why we are not going through the notifications.  Also, the
script makes sure to hide/unhide hud and overlays.  Next we will upload
the pick to AWS via data-web (if you are logged in), and _then_ make
the share UI.
 2016-08-01 18:21:01 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
Brad Hefta-Gaub
e879f22c95 fix behavior with no entity server 2016-07-28 15:15:52 -07:00
Bradley Austin Davis
a9740b803f Defer batch execution to the end of the frame generation 2016-07-26 16:13:48 -07:00
Brad Hefta-Gaub
2d199fe3d0 rename function for better clarity 2016-07-26 08:08:44 -07:00
Brad Hefta-Gaub
83dc9ea6bb punish slow scripts and don't send updates while physics is still loading 2016-07-25 21:46:30 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
James B. Pollack
5202038210 Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor 
Vive HMD fixes to prevent user from becoming embedded in the floor.
 2016-07-22 09:04:40 -07:00
samcake
853f31f6ea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-20 10:49:27 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
Anthony J. Thibault
7fd40a5d10 MacOS: fix crash when touchscreen device is nullptr. 2016-07-18 17:08:17 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Zander Otavka
71f62c02fc Add basic implementation of customPrompt 
Still missing the warning and diabling of dynamic checkbox when the
static mesh is selected.
 2016-07-15 17:35:55 -07:00
samcake
a3f6ed6a89 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-15 09:22:34 -07:00
Brad Davis
882139ebcf Allow scripts to override the navigation focus state set by QML dialogs 2016-07-14 12:10:46 -07:00
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
Stephen Birarda
6b6513d5f9 immediately fade out ignored avatars 2016-07-13 15:06:31 -07:00
Stephen Birarda
bb68e777e6 add a scripting interface to ignore users 2016-07-13 15:06:31 -07:00
Brad Hefta-Gaub
487aacde3c Merge pull request #8216 from huffman/feat/improved-domain-loading 
Update max request limit and number of processing threads
 2016-07-13 14:47:24 -07:00
Brad Hefta-Gaub
f8910d475e Merge pull request #8225 from ZappoMan/codecPlugins 
Audio codec plugins
 2016-07-13 14:47:03 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
Ryan Huffman
fcd59ea94f Update target number of processing threads to be based on system 2016-07-12 17:44:23 -07:00
Brad Hefta-Gaub
b8d79ec263 Merge pull request #8179 from SamGondelman/snapshotFix3 
Various snapshot improvements
 2016-07-12 15:28:51 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
samcake
ba7590712a BRinging the intermediate render textures in the pipeline as varyings and not throug the singletonn anymore 2016-07-11 18:33:57 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
Brad Hefta-Gaub
f3f72f3c93 Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-11 13:15:27 -07:00
Stephen Birarda
11aafc0f48 use endsWith for scriptURL check 2016-07-08 16:00:06 -07:00
Stephen Birarda
43967dc9a6 handle running of non .svo.json JSON files from mp CDN 2016-07-08 15:47:56 -07:00
Ryan Huffman
489d2e4ca5 Update max request limit and number of processing threads 2016-07-08 15:33:11 -07:00
Stephen Birarda
5bce924eda keep signature for askToLoadScript 2016-07-08 14:34:42 -07:00
Stephen Birarda
216e47b29a hide the long URL prefix of scripts from marketplace 2016-07-08 09:43:11 -07:00
Brad Hefta-Gaub
9333c7dcca Merge branch 'master' of https://github.com/highfidelity/hifi into codecPlugins 2016-07-06 13:26:19 -07:00
SamGondelman
04184ee1fb added snapshot notification in desktop mode 2016-07-05 17:21:57 -07:00
Brad Davis
d6250d4c5a Fix export entities by region 2016-07-05 10:37:53 -07:00
SamGondelman
218b26b521 removed snapshot share dialog, ctrl s shouldn't leave you moving 2016-07-01 10:58:55 -07:00
SamGondelman
69ffd63ba7 fix snapshot sharing window 2016-06-30 15:42:48 -07:00
Brad Hefta-Gaub
ec0ca1d173 Merge pull request #8146 from huffman/fix/launch-version 
Add version to launch user activity
 2016-06-28 17:13:10 -07:00
Howard Stearns
da61100b6d Merge pull request #8150 from highfidelity/vive-ui 
merge vive-ui to master
 2016-06-28 13:31:55 -07:00
Ryan Huffman
b36a39b2bc Add version to launch user activity 2016-06-28 09:59:59 -07:00
Andrew Meadows
58e05b2e90 Merge pull request #8143 from AlexanderOtavka/remove-cam-slots 
namechange Camera::_rotation --> Camera::_orientation
 2016-06-28 09:49:54 -07:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix 
Mini mirror/multi-monitor bug fixes
 2016-06-27 22:04:39 -07:00
Zander Otavka
235ee4bd46 Refactor Camera scripting interface a little 
get/setRotation has been removed, as it was a duplicate of
get/setOrientation, but undocumented and barely used.  get/setTransform
and get/setPerspective have been changed to methods from slots, since
glm::mat4 is not exposed to the scriping interface so they don't work in
scripting.
 2016-06-27 13:06:12 -07:00
Triplelexx
aae3555b63 update TouchscreenDevice 
* fix threading issue with zoom gesture
* KeyboardMouseDevice touchpad disabled to prevent interference
* device supported based on QTouchDevice::devices().count()
 2016-06-27 21:01:06 +01:00
Brad Davis
f90a351400 Don't reposition windows prior to selecting the initial display plugin 2016-06-24 16:31:24 -07:00
Triplelexx
6542604d13 resolve conflicts with TouchscreenDevice 
updated to master
 2016-06-24 05:19:28 +01:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
Brad Hefta-Gaub
d7bffc3eab first cut at negotiating codecs 2016-06-23 17:14:41 -07:00
howard-stearns
f8391f0062 fix reticle bugs 2016-06-23 16:51:15 -07:00
Brad Hefta-Gaub
be37921845 first cut at codec plugins 2016-06-23 10:42:02 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
Ryan Huffman
2621add8e3 Fix nearby_avatars not tracking 2016-06-22 09:17:28 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Ryan Huffman
6d753e317b Fix more osx warning 2016-06-21 10:51:31 -07:00
Ryan Huffman
a77dea9048 Fix osx warning 2016-06-21 10:30:05 -07:00
Ryan Huffman
cee897d6d3 Fix osx warning 2016-06-20 16:44:07 -07:00
Ryan Huffman
ab057010d6 Add changed display mode tracking 2016-06-20 16:09:34 -07:00
Ryan Huffman
1eaa9e40cd Cleanup nearby avatar tracking 2016-06-20 16:09:17 -07:00
Ryan Huffman
3aac0cc4fb Update fps useractivity with more general stats 2016-06-20 16:02:36 -07:00
Ryan Huffman
7b3b01a96a Add more values to launch UserActivity 2016-06-20 16:02:14 -07:00
Bradley Austin Davis
ec615caa80 Support toolbar API 2016-06-17 13:06:42 -07:00
Bradley Austin Davis
5bc8b53d1b Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-17 10:56:53 -07:00
Brad Hefta-Gaub
d8d4eb65ec Merge pull request #8059 from Atlante45/feat/steamworks 
Initial Steamworks integration
 2016-06-16 18:49:51 -07:00
Ryan Huffman
c7955900ab Add new user activity events 2016-06-16 13:17:18 -07:00
Ryan Huffman
8b3b62aad7 Add UserActivityLogger scripting interface 2016-06-16 10:25:38 -07:00
Bradley Austin Davis
33e9caa636 Simplify overlay conductor, menu interation 2016-06-15 17:24:39 -07:00