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

12147 commits

Author SHA1 Message Date
ZappoMan
74733452da some tweaks to make stats dialog more readable 2015-07-04 11:25:27 -07:00
ZappoMan
40cdd8646e add packets per second to octree processing stats 2015-07-03 15:53:53 -07:00
David Rowe
3f38a835d8 Fix look-at vectors not rendering if not looking at me 2015-07-03 13:49:10 -07:00
Eric Levin
3d06b011aa adding batch to renderHUD 2015-07-03 13:27:00 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Eric Levin
9d3995ae25 Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping 2015-07-03 09:42:19 -07:00
Brad Davis
ba7c3a2c27 Attempting to get UI and navigation keys/mouse working 2015-07-03 07:10:33 -07:00
Brad Davis
2a1776303d Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-07-03 06:17:35 -07:00
Brad Davis
ed5835ff05 Trying to get mac display plugins working: 2015-07-02 22:29:22 -07:00
Bradley Austin Davis
0034a14fc1 Working on mac functionality 2015-07-02 18:14:12 -07:00
Sam Gondelman
3f6fbd058c merge with standing-mode, hands relative to neck 2015-07-02 17:44:19 -07:00
ZappoMan
a54cf67064 add stats for processing time per packet 2015-07-02 17:28:53 -07:00
ZappoMan
8916dd2056 add stats for elements and entities per second 2015-07-02 17:00:35 -07:00
ZappoMan
0c0b8dbbc1 add stats for elements and entities per incoming packet 2015-07-02 16:19:13 -07:00
David Rowe
87ca7626d7 Merge branch 'master' into 20601 2015-07-02 15:45:32 -07:00
David Rowe
9efeda9716 Adjust gaze target for someone looking at me 2015-07-02 15:43:23 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
ZappoMan
b568e895ec Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
ericrius1
8be1fd28e5 stripping naked gl calls from overlays to allow vive and oculus plugins to work 2015-07-02 13:57:00 -07:00
David Rowe
3a92878544 Reinstate making someone looking at me look at my camera instead of face 2015-07-02 13:47:52 -07:00
ZappoMan
5c4d4893de added bytes per edit stats 2015-07-02 13:44:28 -07:00
ZappoMan
63b585da0f added updates per second stat 2015-07-02 13:28:12 -07:00
Brad Hefta-Gaub
b11172affb Merge pull request #5254 from jherico/timing_menu_log 
Inhibiting log spam unless a menu item is selected
 2015-07-02 12:48:01 -07:00
Brad Davis
d5fe6f0bdb Inhibiting log spam unless a menu item is selected 2015-07-02 12:34:32 -07:00
Philip Rosedale
fba569d7db Merge pull request #5218 from huffman/fix-hmd-displayname-orientation 
Fix avatar displayname to point towards camera
 2015-07-02 12:19:40 -07:00
ZappoMan
b13a4b2a71 add edit update stats 2015-07-02 11:07:47 -07:00
Clément Brisset
b616fff222 Merge pull request #5220 from howard-stearns/avatar-collision-sounds 
Avatar collision sounds
 2015-07-02 10:27:24 -07:00
Sam Gondelman
81efd99ae4 merge with hifi/plugins 2015-07-02 10:13:28 -07:00
David Rowe
c20cd40275 Merge branch 'master' into 20601 
Conflicts:
	interface/src/avatar/Head.cpp
 2015-07-02 09:51:47 -07:00
Anthony J. Thibault
f0d8916d8a First crack at room scale tracking from vive HMD. 
* modifed openvr plugin to return different eye pose matrices.
* avatar position and physics body now follow the head.
* orientation also follows head direction
 2015-07-02 09:47:08 -07:00
Philip Rosedale
0905962d90 Merge pull request #5251 from ctrlaltdavid/20600 
Fix Show Eye Focus and Show Look-at Vectors
 2015-07-02 09:16:20 -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
Howard Stearns
1f3a1f6ac8 Add comments re upcoming physics changes. 2015-07-02 10:07:14 -05:00
Howard Stearns
d0675c7f22 Side-effect new value before emit. 2015-07-02 09:56:02 -05:00
Bradley Austin Davis
54bbc841e2 Working on mac compilability 2015-07-01 23:03:33 -07:00
David Rowe
925fd71262 Fix rendering of look-at vectors 2015-07-01 22:45:47 -07:00
David Rowe
0df9ebeda3 Fix rendering of look-at avatar sphere 
postLighting is never true.
 2015-07-01 22:45:13 -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
Seth Alves
246861221c rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -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
Sam Gondelman
0333adb95b moved controllers to input-plugins, they work now 2015-07-01 18:46:57 -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
a24df5c02f added postLighting check back for rendering avatar Hands 2015-07-01 15:28:48 -07:00
ericrius1
f49f368ec3 removed dead commented out code 2015-07-01 15:16:34 -07:00
ericrius1
8129d0eb1f hydra lasers are now rendering again 2015-07-01 15:12:37 -07:00
ericrius1
8b00864175 hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Sam Gondelman
e54060d6bb more working on poses, LEFT_ and RIGHT_HAND input actions 2015-07-01 14:36:12 -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
Clément Brisset
ede2eec283 Merge pull request #5240 from ctrlaltdavid/fix-textoverlay-size 
Fix TextOverlay font size setting
 2015-07-01 13:52:51 -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
David Rowe
efbccc3a4e Fix storing Oculus eye positions 2015-07-01 13:32:50 -07:00
Brad Davis
b90bb48f73 Fixing display plugins definitions 2015-07-01 13:25:23 -07:00
David Rowe
e85eb246d2 Delete old TextRenderer after new one is in place 2015-07-01 13:19:46 -07:00
Philip Rosedale
8ed4000560 Merge pull request #5239 from SamGondelman/zooming 
DO NOT MERGE - quadratic zooming response
 2015-07-01 12:22:23 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Brad Davis
cd63b8a49d Fix inverted in/out mbps display on stats 2015-07-01 10:10:53 -07:00
Brad Davis
040f7c86ea Working on plugin menu items 2015-07-01 09:05:26 -07:00
Sam Gondelman
a154c809c0 working on using UserInputMapper::Pose, merging 2015-06-30 17:34:34 -07:00
Sam Gondelman
1ea8e85fe8 Merge remote-tracking branch 'jherico/input-plugins' into sam/vive-hand-controllers 2015-06-30 17:30:37 -07:00
David Rowe
215c260c9e Fix TextOverlay font size setting 2015-06-30 17:08:43 -07:00
Brad Davis
b2b571b5a1 Fixing app includes 2015-06-30 15:52:55 -07:00
Brad Davis
db1094418d Restoring from plugins 2015-06-30 15:41:47 -07:00
Sam Gondelman
c9d205de3e quadratic zooming response 2015-06-30 14:04:43 -07:00
Sam Gondelman
aaf84b47f3 Merge remote-tracking branch 'upstream/plugins' into sam/vive-hand-controllers 2015-06-30 10:37:06 -07:00
Brad Davis
e421141ec5 experimenting with input plugins 2015-06-30 09:52:54 -07:00
Seth Alves
0caa8be66e ignore incoming changes for a hold action that's flagged as 'mine' 2015-06-29 19:50:19 -07:00
Seth Alves
88fc74374b if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol 2015-06-29 19:27:10 -07:00
Sam Gondelman
a27196dfee initial testing of hand controller tracking 2015-06-29 17:13:33 -07:00
Seth Alves
0a734c9d3d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership 2015-06-29 16:56:04 -07:00
Seth Alves
a0fd75c54f don't enable hold actions from remote nodes 2015-06-29 16:08:37 -07:00
Seth Alves
fbede0a23f guard against feeding bullet a NaN 2015-06-29 15:54:24 -07:00
Brad Davis
196a92c1b4 A little bit of display plugin API cleanup 2015-06-29 10:55:13 -07:00
Seth Alves
1d122060a6 merge andrew's sim-ownership branch 2015-06-29 09:50:38 -07:00
Howard Stearns
51782bd17d Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-29 09:30:44 -07:00
Brad Davis
a923c044a3 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-28 22:51:46 -07:00
Brad Davis
dcdf47dd66 Fix mouse interaction with overlays in HMDs 2015-06-28 22:51:26 -07:00
David Rowe
386b3d8ae3 Fix text overlay font rendering 
Use the same font size as used in TextRenderer to avoid scaling issues.
 2015-06-27 14:02:49 -07:00
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -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
Seth Alves
7f609dca26 Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire 2015-06-27 10:49:12 -07:00
Seth Alves
567d98dfab Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire 2015-06-27 10:45:34 -07:00
Howard Stearns
dc7360cdc2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-27 08:37:30 -07:00
Brad Davis
7ca63a4ace Fixing overlay rendering in plugins 2015-06-27 00:43:38 -07:00
Brad Davis
267d339ecc Put the 2D plugin first for default usage, enable oculus, disable interleaved 2015-06-27 00:31:29 -07:00
Andrew Meadows
cf74dbe1dc partial progress toward sim ownership negotiations 
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
 2015-06-26 21:57:04 -07:00
Seth Alves
5ecc39b811 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-26 20:06:10 -07:00
Brad Davis
e6fade8c13 Prevent tooltips from appearing with stale data 2015-06-26 18:16:56 -07:00
Brad Davis
3b987c1e73 Fixing always-on link cursor 2015-06-26 18:14:31 -07:00
Brad Davis
69fa18c6c0 Working on overlay in plugins 2015-06-26 18:08:10 -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
Ryan Huffman
760a5bfa37 Fix call to atan2 when params are 0 2015-06-26 17:23:06 -07:00
Brad Davis
d8dad5b86f Fixing bad merge 2015-06-26 17:17:56 -07:00
Brad Davis
5ce79d6800 Merge remote-tracking branch 'upstream/master' into plugins 2015-06-26 17:14:45 -07:00
Brad Davis
4417c00ae4 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.h
	interface/src/Menu.h
 2015-06-26 17:02:16 -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
Ryan Huffman
abe8cfe90f Fix avatar displayname to point towards camera 
Previously it used the camera orientation, which means all display names
have the same orientation, and will all rotate when you turn your head.
Instead, you only want to change the orientation of a particular display
name when you move.
 2015-06-26 16:17:11 -07:00
Stephen Birarda
9b84eabd18 Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo 2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c merge from master 2015-06-26 14:29:40 -07:00
Stephen Birarda
18e2b62ecc initial image replacement for hyperlink preview 2015-06-26 14:12:26 -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
Stephen Birarda
522b715628 remove comment, styling cleanup 2015-06-26 11:41:34 -07:00
Stephen Birarda
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Seth Alves
c95db5672a include argument-packing version in serialized argument data 2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire 2015-06-26 07:20: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
Seth Alves
7c26641560 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-25 17:40:27 -07:00
David Rowe
f47cff1332 Remove duplicate method call 2015-06-25 15:41:27 -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
David Rowe
d38a5a1771 Back out saccade speed limit 2015-06-25 07:38:06 -07:00
Brad Hefta-Gaub
6c4a4866d3 Merge pull request #5202 from Atlante45/overlay 
Overlay have correct bounds
 2015-06-24 19:00:55 -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
c480c85f85 Fixes for switching between fullAvatar and head & body avatars while in first person. 
Need to always add _skeletonModel to the main scene when switching to head/body avatar.
Need to always remove _firstPersonSkeletonModel from main scene when switching to head/body avatar.
 2015-06-24 17:35:23 -07:00
Atlante45
55c490043f Restore InterfaceConfig.h includes 2015-06-24 16:13:42 -07:00
Atlante45
e3d22ef94b Fix overlays getBounds + code cleanup 2015-06-24 16:13:42 -07:00
Anthony J. Thibault
71639a7466 Fix for switching avatars while mirror is not enabled. 
When the avatar is changed via set*URL, we need to set the associated model visibility appropriately.
This way when it gets added to the scene later in preRender, initWhenReady, it will render with the correct visibility settings.
 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
3853395298 Bug fixes for switching between head/body and full body avatars 
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
b88d7c2e05 Added FIXME comment to preRender 2015-06-24 16:10:47 -07:00
Anthony J. Thibault
8f03ead74e Bug fix for two piece avatars. 
The head was not rendering
 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
Atlante45
233d92c315 Some code cleanup 2015-06-24 15:44:47 -07:00
Atlante45
31a98c5b40 Replace pos/rot by a transform in Base3DOverlay 
Also keep getBounds a pure virtual methods
 2015-06-24 15:44:47 -07:00
Atlante45
c22f1aa7e1 Overlay2D return correct getBounds 2015-06-24 15:44:46 -07:00
Atlante45
e8da8e374c Simplify Overlays payloadGetBounds 2015-06-24 15:44:46 -07:00
Atlante45
6bb21b7a48 Use dynamic_pointer_cast instead of static_cast 2015-06-24 15:44:45 -07:00
Brad Hefta-Gaub
1cb7d0c1a5 Merge pull request #5194 from jherico/qml_warnings 
Removing qml warnings
 2015-06-24 15:42:36 -07:00
Clément Brisset
6db4184748 Merge pull request #5171 from huffman/fix-edit-rotate 
Fix edit.js rotation display
 2015-06-24 15:35:15 -07:00
Sam Gondelman
19ec080e2b Merge with master 2015-06-24 15:04:03 -07:00
Philip Rosedale
0bef506be2 Merge pull request #5190 from jherico/mirror_zoom 
Mirror zoom
 2015-06-24 14:43:14 -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
Philip Rosedale
b7c64ef246 Merge pull request #5193 from SamGondelman/master 
hydra dead zone to prevent drifting
 2015-06-24 13:52:48 -07:00
Brad Davis
a5428ae24a Merge remote-tracking branch 'upstream/master' into plugins 2015-06-24 10:39:31 -07:00
Seth Alves
28582ed14d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-23 19:50:35 -07:00
Brad Davis
5818805931 Fixing some merge issues 2015-06-23 17:34:44 -07:00
Andrew Meadows
1ceed98ca2 Merge pull request #5166 from jherico/64bit 
Enable Windows 64 bit builds
 2015-06-23 17:03:42 -07:00
Brad Davis
8f8bda327c Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
 2015-06-23 16:54:32 -07:00