Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 14:16:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27822 commits 71 branches 56 tags 1.2 GiB
Commit graph

3650 commits

Author SHA1 Message Date
David Rowe
c20cd40275 Merge branch 'master' into 20601 
Conflicts:
	interface/src/avatar/Head.cpp
 2015-07-02 09:51:47 -07:00
Brad Hefta-Gaub
f16b8d5083 Merge pull request #5246 from jherico/inter_idle_timing 
Instrument the inter-idle time and tweaking the timeout setting
 2015-07-02 09:01:44 -07:00
David Rowe
026f6d3690 Add mouth as third gaze target in addition to left and right eyes 2015-07-01 21:22:30 -07:00
David Rowe
4ced0dc6c4 Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw 2015-07-01 20:24:47 -07:00
David Rowe
26cbb14f45 Alternative look-at gaze left/right with face trackers too 
Instead of looking at one or other eye depending on look direction.
 2015-07-01 20:09:36 -07:00
David Rowe
fada70fe02 Remove redundant code 2015-07-01 18:32:33 -07:00
David Rowe
bc4c635106 Fix gazing at avatar (when no head tracking or HMD) 
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
 2015-07-01 18:31:16 -07:00
Sam Gateau
d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Brad Davis
88a733181e Fixing comment to reflect code 2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01 CR comments and fixing the microsecond display 2015-07-01 16:53:12 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29 Merge pull request #5247 from ericrius1/handRender 
Fixed broken rendering of hydra visualization paraphernalia
 2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09 Instrument the inter-idle time and tweaking the timeout setting 2015-07-01 16:14:17 -07:00
ericrius1
8b00864175 hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Clément Brisset
eb3bddfe4c Merge pull request #5209 from ctrlaltdavid/20589 
QA for #20589 - Vertical field of view preference change should be applied immediately
 2015-07-01 13:53:25 -07:00
David Rowe
6a48b56e0f In mirror mode look directly at the camera in both normal and HMD view 2015-07-01 13:32:50 -07:00
Howard Stearns
af4b804d37 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-27 12:50:13 -07:00
Seth Alves
97cd5b8b99 Merge pull request #5223 from SamGondelman/cameraMode 
misc. key binding/camera fixes
 2015-06-27 10:55:34 -07:00
Sam Gondelman
2f0fcba1eb key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode 2015-06-26 17:28:02 -07:00
Howard Stearns
9a04fdf10a Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-26 16:24:27 -07:00
Howard Stearns
98f165f2ae Avatar collision sounds. 
collisionsSoundURL can be set in preferences:
  Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav.
  Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
 2015-06-26 16:23:16 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Seth Alves
a0d77c061c lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does 2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad Merge pull request #5206 from SamGondelman/cameraMode 
fix bug that was preventing camera mode switches
 2015-06-25 18:55:13 -07:00
David Rowe
377979e380 Make field of view preference change be applied immediately 2015-06-25 15:41:10 -07:00
Sam Gondelman
56944afd39 avatar doesn't move in independent mode, alphabetized menu options 2015-06-25 12:36:36 -07:00
Brad Hefta-Gaub
77bbb23a1e Merge pull request #5175 from hyperlogic/ajt/first-person-avatar 
Render a different model when in first person view.
 2015-06-24 18:54:47 -07:00
Anthony J. Thibault
b88d7c2e05 Added FIXME comment to preRender 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21 Render a different model when in first person view. 
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
 2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub
734a11e12a Merge pull request #5199 from jherico/scale_rez_fix 
Fixing misplaced UI on scale resolution
 2015-06-24 16:10:33 -07:00
Sam Gondelman
19ec080e2b Merge with master 2015-06-24 15:04:03 -07:00
Ryan Huffman
4df1bea4ec Merge pull request #5167 from SamGondelman/hmdControls 
hmdControls.js for movement when wearing an HMD
 2015-06-24 14:40:31 -07:00
Brad Davis
fb2fb06371 Fixing misplaced UI on scale resolution, PC edition 2015-06-23 15:42:32 -07:00
Sam Gondelman
778e19ac11 fixed camera mode issue 2015-06-23 11:45:08 -07:00
Sam Gondelman
824c219fa0 started fixing camera mode issue 2015-06-23 09:26:38 -07:00
Bradley Austin Davis
f833121032 Fixing the initial missing UI on retina displays, again 2015-06-22 19:55:52 -07:00
Brad Davis
4cd1c52987 Fixing HMD position offset bug in picking & stereo rendering in HMD 2015-06-22 11:20:48 -07:00
Brad Davis
3231bbba5a Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-22 09:44:16 -07:00
bwent
c315bcec24 Expose mouseDoublePressEvents to js 2015-06-19 15:52:27 -07:00
Brad Davis
cc6b589ae5 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-19 14:48:38 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Brad Davis
9bef5f011b Reverting mirror functionality 2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f Merge branch 'master' into overlay 2015-06-18 21:56:11 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes 
center player in view mode
 2015-06-18 18:02:47 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c actionEvent signal, captureActions, began work on hmdControls.js 2015-06-18 09:52:36 -07:00
Brad Davis
5c4fa77acd Merge branch 'temp' into overlay 2015-06-18 00:59:31 -07:00
Brad Davis
a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-17 19:53:31 -07:00
David Rowe
67206332e6 Make individual reload buttons reload scripts 2015-06-17 16:11:30 -07:00
David Rowe
2a00586e21 Fix missing hack 
Matches hack in stopScript().
 2015-06-17 16:11:29 -07:00
David Rowe
17f7d76025 Redownload scripts that are loaded via Script.load() when reloading all 2015-06-17 16:11:28 -07:00
David Rowe
5dab977c28 Add a reload script button after each script in list of running scripts 2015-06-17 16:11:26 -07:00
David Rowe
f220d40bb8 Re-download scripts upon Reload All 2015-06-17 16:11:25 -07:00
Bradley Austin Davis
1705eb8f80 Reverting some changes, putting overlay rendering in its own state manager 2015-06-17 16:08:19 -07:00
Brad Davis
8a1b519071 Working on overlays 2015-06-17 16:06:06 -07:00
Brad Davis
ae1c9603b9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:13:04 -07:00
Bradley Austin Davis
11fff7c6e5 debugging stack on OSX 2015-06-17 13:49:42 -07:00
Bradley Austin Davis
2172445db7 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 12:56:41 -07:00
Brad Davis
4282c044ef Working on mirror and overlay 2015-06-17 12:01:39 -07:00
Andrew Meadows
61f62f96b0 Merge pull request #5129 from SamGondelman/master 
Integrating gamepads/hydras to input mapping system, zooming
 2015-06-17 11:39:38 -07:00
Brad Davis
1e90aaf9c3 Working on overlays still, mirror rendering and overlay order 2015-06-17 11:35:30 -07:00
Brad Davis
5ded9e7eb9 Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 10:50:01 -07:00
ZappoMan
467609f2b6 standardize skybox and atmosphere batch 2015-06-17 09:44:26 -07:00
ZappoMan
b5731135dd cleanup 2015-06-17 09:08:41 -07:00
Brad Davis
2bf53b625e Working on overlays and stats 2015-06-17 02:00:13 -07:00
ZappoMan
006899d73f more hacking almost working 2015-06-16 22:23:14 -07:00
Brad Davis
4762e1a00c Merge remote-tracking branch 'upstream/master' into overlay 
Conflicts:
	interface/src/Application.cpp
 2015-06-16 21:01:00 -07:00
Brad Davis
659fa2387c Working on overlays / stats 2015-06-16 21:00:13 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
ZappoMan
722ac618f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix 2015-06-16 17:08:15 -07:00
ZappoMan
167e7d1377 first cut at atmospheres in batch (doesn't work) 2015-06-16 14:05:14 -07:00
Brad Davis
4f8ea3f624 Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-16 09:58:20 -07:00
Brad Davis
ba13b7820c Working on overlay refactor 2015-06-16 09:58:03 -07:00
Sam Gondelman
22961fcc9d added camera mode to keep player in center of view 2015-06-15 15:44:56 -07:00
Leonardo Murillo
c065269ba7 Merging with upstream 2015-06-15 11:58:52 -06:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Brad Davis
e44b21ee0b Working on functional overlays 2015-06-13 10:36:52 -07:00
Brad Davis
737e418878 Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" 
This reverts commit 0cdc2b53fe.
 2015-06-13 10:02:54 -07:00
Sam Gondelman
1a8df6509f userinputmapper supports hydra, but some hydra events still register as mouse events 2015-06-12 18:22:56 -07:00
Philip Rosedale
c834937472 Merge pull request #5122 from huffman/fix-rear-view-mirror 
Fix rear view mirror
 2015-06-12 15:49:38 -07:00
Ryan Huffman
ad77374732 Fix setting of _renderMode 2015-06-12 13:03:33 -07:00
ZappoMan
0cdc2b53fe Revert "Merge pull request #5106 from jherico/render_cursor" 
This reverts commit 4d18bd7cec, reversing
changes made to 24fda9a733.
 2015-06-12 12:57:24 -07:00
Sam Gondelman
b4e108cd3b added zooming to default joystick controls 2015-06-12 10:16:00 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Sam Gondelman
72cc070f0a enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot 2015-06-11 18:24:32 -07:00
Brad Davis
9148b866bb Merge branch 'render_cursor' into cursor_manager 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-11 16:19:57 -07:00
Sam Gondelman
b8b61e7c62 integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js 2015-06-11 15:51:21 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -07:00
Brad Davis
fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 02:21:02 -07:00
Brad Davis
ef52035300 Working on functional overlays 2015-06-11 02:20:51 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Bradley Austin Davis
1dfc9c89eb Fix doubled cursor on OSX 2015-06-10 13:57:48 -07:00
Leonardo Murillo
3bd0c7bd87 Code Review changes 2015-06-10 14:35:52 -06:00
Brad Davis
ca1af77763 Working on cursor manager 2015-06-10 13:24:56 -07:00
Leonardo Murillo
869461a01b Code Review changes 2015-06-10 14:14:00 -06:00
Leonardo Murillo
8f72763f17 Merge branch 'master' of github.com:highfidelity/hifi into auto-updater 2015-06-10 13:18:20 -06:00