Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-19 06:57:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
44100 commits 6 branches 1 tag 1.1 GiB
Commit graph

44100 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley Austin Davis
f3c47acbb2 Fix offset when UI transform is not identity 2016-06-14 09:49:25 -07:00
Bradley Austin Davis
175dbb8924 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-14 09:48:56 -07:00
Brad Davis
196ab401e5 Merge pull request #8046 from SamGondelman/proceduralRaymarch 
Exposed orientation and eye position to procedural entity shaders
 2016-06-14 09:48:07 -07:00
Brad Hefta-Gaub
19352a12ea Merge pull request #8056 from imgntn/editbugztab 
Fix tabbing behavior in edit.js
 2016-06-14 09:14:10 -07:00
Brad Hefta-Gaub
7da29daf9d Merge pull request #8036 from ctrlaltdavid/20955 
Fix image2d overlay color property
 2016-06-13 19:21:59 -07:00
Howard Stearns
d05987de6d Merge pull request #8042 from jherico/lasers 
First pass prototype of laser rendering in OpenVR plugin
 2016-06-13 18:06:15 -07:00
Bradley Austin Davis
6707f889b8 Fixing laser offset, support laser in Oculus 2016-06-13 17:33:18 -07:00
Bradley Austin Davis
aab42ff841 Merge branch 'settings' into lasers 2016-06-13 15:43:03 -07:00
Andrew Meadows
1a37653364 Merge pull request #8039 from sethalves/quiet-es-sim-spam 
fix problem related to server-side extrapolation of children of avatars
 2016-06-13 15:37:33 -07:00
Bradley Austin Davis
b9bf797753 Fixing issues with unclosed groups in settings persistence 2016-06-13 15:26:48 -07:00
Seth Alves
f8f62a4ff1 remove unused function 2016-06-13 15:10:52 -07:00
Bradley Austin Davis
62051ad297 Working on touch 2016-06-13 14:40:15 -07:00
Howard Stearns
213479c530 Merge pull request #8043 from hyperlogic/bug-fix/hmd-ui-center-improvements 
HMD UI re-centering while driving improvements.
 2016-06-13 14:28:50 -07:00
Seth Alves
eba518cb65 try to make code that converts bullet-calculated values to parent-frame values more effecient 2016-06-13 14:26:41 -07:00
Seth Alves
998a5594c0 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-13 13:41:32 -07:00
Chris Collins
b14f9cd312 Merge pull request #8041 from sethalves/fix-avatar-entity-locking 
Fix avatar entity locking
 2016-06-13 13:10:32 -07:00
James B. Pollack
188590a891 cleanup 2016-06-13 13:08:22 -07:00
James B. Pollack
567118f4a9 cleanup 2016-06-13 13:08:12 -07:00
James B. Pollack
342fc07d29 select active element in edit.js after change 2016-06-13 13:06:56 -07:00
Brad Davis
130c0dda31 PR feedback 2016-06-13 13:04:11 -07:00
Brad Davis
bb3722d915 trying again to fix mac build. 2016-06-13 13:04:11 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -07:00
Anthony J. Thibault
21e67fc4d8 Another unused variable warning 2016-06-13 12:03:42 -07:00
Anthony J. Thibault
1ca1f98034 Fix unused variable warning 2016-06-13 12:01:42 -07:00
Seth Alves
52245f25f2 rework code that transforms global _server* values into parent-frame values 2016-06-13 11:48:45 -07:00
Howard Stearns
b0f6b59207 Merge pull request #8040 from hyperlogic/bug-fix/equip-hotspot-render 
Only render equip-hotspots for objects with attach points.
 2016-06-13 11:29:39 -07:00
Howard Stearns
357ccc17aa Merge pull request #8030 from howard-stearns/fix-paused-interactions-with-mouse 
fix paused interactions with mouse
 2016-06-13 11:28:47 -07:00
Anthony J. Thibault
ab4bef7d55 Fixes based on PR feedback 
* The "Clear Overlay When Driving" avatar preference is obeyed.
* sensor reset will also center the ui.
 2016-06-13 11:19:47 -07:00
Seth Alves
99bfc76dd3 Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-13 11:14:26 -07:00
Seth Alves
fbd765ab41 Merge branch 'quiet-es-sim-spam' of github.com:sethalves/hifi into quiet-es-sim-spam 2016-06-13 11:14:17 -07:00
Anthony J. Thibault
ccf85c1f7c Merge branch 'vive-ui' into bug-fix/hmd-ui-center-improvements 2016-06-13 09:48:58 -07:00
Brad Hefta-Gaub
fc1a154a6a Merge pull request #8053 from audreyt/patch-1 
Update BUILD_OSX.md
 2016-06-13 07:47:30 -07:00
Brad Hefta-Gaub
92909af52c Merge pull request #8044 from ctrlaltdavid/20957 
fix model export
 2016-06-12 19:43:51 -07:00
Brad Hefta-Gaub
da28b0f3e7 Merge pull request #8048 from ctrlaltdavid/20961 
fix import of invalid JSON file failing silently
 2016-06-12 19:42:53 -07:00
Brad Hefta-Gaub
a9729830b0 Merge pull request #8052 from sethalves/fix-permissions-grid-1 
fix some permissions-grid bugs
 2016-06-12 17:20:50 -07:00
唐鳳
1ec145298f Update BUILD_OSX.md 
Qt5.6 removed QTWebKit which hifi depends on. Before we complete the migration listed in https://wiki.qt.io/Porting_from_QtWebKit_to_QtWebEngine the build instruction need to tap into qt55 in historical brew versions.
 2016-06-12 21:07:49 +08:00
Seth Alves
924c949af5 permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things 2016-06-11 15:16:45 -07:00
Seth Alves
e79767a121 authed username wasn't being saved in permissions, so that interface would get briefly disconnected when their permissions changed. 2016-06-11 15:16:02 -07:00
Brad Hefta-Gaub
27c6df660c Merge pull request #8009 from sethalves/permissions-grid 
Permissions grid
 2016-06-10 20:39:26 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
Anthony J. Thibault
f6ed5a1dae Bugfixes based on feedback 
* When the overlay is hidden because your head is too close to the sphere,
  instead of coming back immediately, it waits until the avatar's velocity is near zero
  for a period of time.
* Hooked up jump and fly to MyAvatar::hasDriveInput()
* Added an internal state machine to OverlayConductor to manage hiding/showing transitions.
* The overlay menu state is now tied directly to the overlay, so it will change state as the
  overlay is dynamically hidden/shown from code.
* Removed slot going directly from MenuOption::Overlays directly to OverlayConductor::setEnable().
 2016-06-10 18:33:40 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
Chris Collins
006eb8fe64 Merge pull request #8031 from birarda/api-recheck-on-fail 
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
 2016-06-10 15:26:42 -07:00
SamGondelman
7b21d71180 try to fix cmake error 2016-06-10 14:09:04 -07:00
SamGondelman
53435fc730 removed extra argument 2016-06-10 14:04:33 -07:00
SamGondelman
f32e29ac2d small changes 2016-06-10 13:46:02 -07:00
SamGondelman
da98ee0916 reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition 2016-06-10 13:42:19 -07:00
Seth Alves
41c399897a remove some debug prints 2016-06-10 12:08:13 -07:00
Seth Alves
4a49ade21b Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam 2016-06-10 11:50:06 -07:00