Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 03:23:33 +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
Seth Alves
a01fb6f1dc if an action changes its own arguments, cause reserialisation 2015-07-09 14:32:34 -07:00
Bing Shearer
85f6fdb8cf Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample) 2015-07-09 14:20:10 -07:00
Bing Shearer
25708678f6 Fixed shutdown procedure for Datagrams so that there is no crash on exit 2015-07-09 14:18:53 -07:00
Seth Alves
050c472d6a Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation 2015-07-09 13:39:37 -07:00
Brad Hefta-Gaub
489a8b4b3d Merge pull request #5285 from jherico/homer 
Move log file writing to a separate thread
 2015-07-09 12:22:13 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -07:00
Seth Alves
08d63b7fd8 first attempt at palm rotation 2015-07-09 11:03:02 -07:00
Anthony J. Thibault
2ac6b6cd32 misc. changes 2015-07-09 09:57:12 -07:00
Brad Davis
2fff560ff9 Fixing log file viewer 2015-07-09 09:54:35 -07:00
Brad Hefta-Gaub
fb07956689 Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix 
fix for mirror rendering on windows
 2015-07-09 08:38:55 -07:00
Brad Davis
63dfd570f1 Adding priority support to GenericThread 2015-07-08 22:54:31 -07:00
Brad Davis
08d1364f81 Move file log persistence to a separate thread 2015-07-08 22:35:23 -07:00
Anthony J. Thibault
1be0e7ebc3 fix for mirror rendering on windows 
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
  I think this was working on Mac due to the different code paths in
  GLBackendTransform::updateTransform for core vs legacy gl profile.
 2015-07-08 21:33:27 -07:00
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow 
Adding more NSight instrumentation
 2015-07-08 20:28:18 -07:00
Brad Davis
625cc86f83 Merge pull request #5283 from ZappoMan/optimizeByteCountCoded 
Optimize ByteCountCoded<> to not do extra heap allocations
 2015-07-08 18:35:02 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
Seth Alves
7bea4a54a3 Merge pull request #5274 from AndrewMeadows/argon 
cleanup of EntityActionInterface and friends
 2015-07-08 17:54:52 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Anthony J. Thibault
0f30da64bc added Plugin interface to ViveControllerManager 
mostly I just added this to add the isSupported method, so it wouldn't
attempt to initialize if there was no HMD attached.
 2015-07-08 16:31:52 -07:00
Sam Gateau
4c44eb63da Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4 Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
Sam Gondelman
64118d9118 started moving hydra to use UserInputMapper::Poses, needs testing 2015-07-08 13:38:48 -07:00
Anthony J. Thibault
07141fd1e3 rotation and thrust work in both 2d and hmd mode 
known issue, hmd does thrust doesnt work when avatar collisons are disabled.
 2015-07-08 12:25:57 -07:00
Philip Rosedale
574758eae9 Merge pull request #5252 from ctrlaltdavid/20601 
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
 2015-07-08 11:37:40 -07:00
Andrew Meadows
a0a1b01ea9 coalesce dupe action data members: _id and _type 2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7 make some arguments const, cleanup some #includes 2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821 some ObjectAction methods should be const 2015-07-07 17:50:08 -07:00
Anthony J. Thibault
754e55553a modified rotation in MyAvatar::updatePosition, reenabled trackpad input 2015-07-07 17:29:46 -07:00
Anthony J. Thibault
15cf008f13 hand controllers and arrow keys now work 2015-07-07 17:29:45 -07:00
David Rowe
abc54f2e3f Polished fonts, colors, etc. 2015-07-07 17:08:02 -07:00
David Rowe
b123e280d6 Add release numbers to associated text 2015-07-07 16:22:01 -07:00
Anthony J. Thibault
4f8cf0af8c moved sdl2manager to input-plugins 2015-07-07 15:24:39 -07:00
Anthony J. Thibault
d75353eeb2 added left/right hand click actions, vive controller should be able to emulate mouse events 2015-07-07 14:35:55 -07:00
Howard Stearns
1c2972bd7c Expose avatar collisions to scripts, and include velocityChange in exposed collision data. 2015-07-07 11:49:55 -07:00
Brad Davis
a04921e74b Merge branch 'master' into plugins 2015-07-07 11:10:51 -07:00
Anthony J. Thibault
5293effc2e more work in progress vive room tracking 
Found and disabled torso twist
use an old copy of the hmd pose before physics, and the most up to date
one after physics.
 2015-07-07 00:12:48 -07:00
Atlante45
2ba6bd3afc Double display name offset 2015-07-06 18:39:43 -07:00
Anthony J. Thibault
834b75f4c4 work in progress room scale tracking work. 
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
 2015-07-06 18:25:42 -07:00
Atlante45
687f9dda4a Restore old offset behaviors 2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard 2015-07-06 18:05:43 -07:00
Sam Gondelman
f69b755166 merge with hifi/plugins 2015-07-06 17:41:45 -07:00
Brad Davis
bd938d5f4c Merge pull request #5263 from ZappoMan/inBoundStats 
Additional inbound entity stats
 2015-07-06 17:12:19 -07:00
Brad Davis
95000eec3c Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-07-06 16:22:03 -07:00
ZappoMan
05f28064bf add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor 2015-07-06 16:03:42 -07:00
Sam Gateau
fe633cd545 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-06 15:04:02 -07:00
David Rowe
5046f4c1ac Update upgrade dialog 
- Strip out "<br />"s
- Show information for all new versions since current, not just latest
- Display scrollbar if content too long to show all at once
- "version" / "versions" behind depending on if one or more
- Align buttons with heading and text
- Darken text so that is more readable
 2015-07-06 13:19:42 -07:00
Brad Davis
21562c0766 Merge pull request #5258 from ericrius1/nakedGLStripping 
Removing naked GL calls from overlay code
 2015-07-06 10:25:50 -07:00
Atlante45
85df510b4b Use depth bias to avoid z-fighting on text3d overlays 2015-07-04 18:40:37 -07:00
Atlante45
9bf6c439aa Use depth bias to avoid z-fighting on display name 2015-07-04 18:34:19 -07:00
Atlante45
32cf4dac78 Fix displayname z-fighting 2015-07-04 16:06:38 -07:00
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