Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 00:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37270 commits 25 branches 0 tags 1.1 GiB
Commit graph

763 commits

Author SHA1 Message Date
EdgarPironti
1ab683643c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-04 00:36:38 -08:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
Howard Stearns
4a54f2052e Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 17:42:38 -08:00
samcake
4d62c532f5 Removing dead config files 2015-11-03 15:35:13 -08:00
howard-stearns
a7162eefbe Add alphaVar for ik. 2015-11-03 13:10:25 -08:00
EdgarPironti
d99838de9c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 12:25:19 -08:00
samcake
78e3f8ebbc Merge pull request #6281 from AlessandroSigna/master 
Vive - fix input drifting
 2015-11-03 10:19:59 -08:00
EdgarPironti
5d695da630 Do not merge - Spacemouse 2015-11-02 23:31:10 -08:00
Howard Stearns
b74ed36883 Fix outro start times, and introduce away states (which are not used in C++ code, but are used in script). 2015-11-02 20:39:31 -08:00
AlessandroSigna
b77945d430 Vive - fix input drifting 
Conflicts:
	libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
 2015-11-02 16:06:17 -08:00
Brad Hefta-Gaub
d359aa3b65 more tweaks 2015-11-02 13:41:16 -08:00
Brad Hefta-Gaub
46bedf7667 more tweaks to hydra mappings 2015-11-02 13:35:49 -08:00
Anthony J. Thibault
2236573a9d Merge branch 'master' into tony/anim-sync-blend 2015-11-02 12:18:11 -08:00
Brad Hefta-Gaub
b00f572e1a add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag 2015-11-02 09:21:15 -08:00
Anthony J. Thibault
e3e759248f Merge branch 'master' into tony/anim-sync-blend 2015-11-02 08:37:10 -08:00
Brad Hefta-Gaub
70b9aa5ff1 remove right click context menu until we can make it work with camera move better 2015-11-02 07:42:52 -08:00
Brad Hefta-Gaub
e899229cde tweaks to how VrMenu is shown 2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
77816d818a make RY map to jump 2015-10-31 16:00:22 -07:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
Brad Hefta-Gaub
22324eb281 more tweaking of keyboard input routes 2015-10-30 14:55:33 -07:00
Brad Hefta-Gaub
ce7fed2292 fix json 2015-10-30 13:16:31 -07:00
Brad Hefta-Gaub
b2f27054f4 Merge pull request #6239 from AlessandroSigna/controllers 
ViveController - input mapping
 2015-10-30 10:39:26 -07:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
Brad Hefta-Gaub
70f3156328 make sure CompositeEndpoints properly report readability more axis based keyboard inputs 2015-10-29 22:37:12 -07:00
Brad Hefta-Gaub
8a03383adc use makeAxis for some keyboard support 2015-10-29 22:19:33 -07:00
AlessandroSigna
01d3805148 ViveController - mapping of buttons 2015-10-29 18:44:43 -07:00
Anthony J. Thibault
047614b2eb New left and right grab animations. 2015-10-29 16:18:39 -07:00
Brad Hefta-Gaub
b070306c2c tweak comfort mode filters 2015-10-29 15:53:17 -07:00
Brad Hefta-Gaub
c962697b18 Merge pull request #6230 from samcake/controllers 
Controllers : Comfort mode is working through the stanadrd mapping
 2015-10-29 14:59:42 -07:00
samcake
d73eafddd1 COmfort mode working with the COntroller system observing the menu state 2015-10-29 13:48:16 -07:00
AlessandroSigna
ffd2b39874 Fix vive controller - update to new input plugin register 2015-10-29 13:18:37 -07:00
samcake
8f908f9877 Adding the stepYaw to the Standard mapping 2015-10-29 12:08:11 -07:00
EdgarPironti
596b315286 Fixed standard.json 2015-10-27 11:35:30 -07:00
AlessandroSigna
5bce95189b fix keyboard mapping (keyboardMouse.js) 2015-10-26 18:14:57 -07:00
Brad Davis
f38303a9a5 Adding vive default mapping 2015-10-26 10:36:31 -07:00
Anthony J. Thibault
8689170415 Removed sync and timescale from AnimBlendLinear node. 
AnimBlendLinearMove will now be used instead.
 2015-10-22 16:40:53 -07:00
Anthony J. Thibault
a66f31bb20 Added AnimBlendLinearMove node 
AnimBlendLinearMove is now in use by forward, backward and strafe movements.
Tuned rig moving average speeds to be more sensitive.
 2015-10-22 16:33:31 -07:00
Brad Davis
a9aea9b477 Working on TestController display 2015-10-22 15:53:19 -07:00
Brad Davis
8c163a52e9 Attempting to fix log graphs 2015-10-22 15:49:58 -07:00
samcake
2ebf862da9 Merge pull request #6148 from jherico/controllerFunctions 
Fixing controller functions & makeAxis
 2015-10-22 11:56:58 -07:00
Brad Davis
7ed9ed8500 Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS 
make handControllerGrab.js work with new API
 2015-10-22 11:40:48 -07:00
Brad Hefta-Gaub
67f2a0c6c8 CR feedback on mappings 2015-10-22 11:39:51 -07:00
Brad Davis
5d4cbfdacb Resolving ambiguity between functions and inputs differently 2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84 Fixing function based routes, makeAxis 2015-10-22 09:50:23 -07:00
Brad Hefta-Gaub
3e7364608b make handControllerGrab.js work with new API 2015-10-22 09:17:29 -07:00
Brad Davis
afcec347ff Wiring yaw action to avatar 2015-10-21 21:35:19 -07:00
Brad Davis
044a28212d Wiring step yaw to the avatar 2015-10-21 20:44:38 -07:00
Brad Davis
637654adea Wiring up step yaw 2015-10-21 18:46:09 -07:00
Anthony J. Thibault
c83af43d0e Added strafe and backward blending 2015-10-21 17:34:09 -07:00
Brad Davis
4a1df286fd Cleanup of enums and JS names 2015-10-21 15:57:37 -07:00
Brad Davis
b9b03bd842 Working on conditional and filter parsing 2015-10-21 14:40:33 -07:00
Brad Davis
de57c3b4d6 Merge remote-tracking branch 'upstream/controllers' into controllers 
Conflicts:
	libraries/controllers/src/controllers/UserInputMapper.cpp
 2015-10-20 21:59:00 -07:00
samcake
da26d0dee1 Adding the hand poses channels in the controller mapping files 2015-10-20 18:19:44 -07:00
Brad Davis
cd940325c2 Merge remote-tracking branch 'upstream/controllers' into controllers 2015-10-20 17:48:29 -07:00
Brad Davis
0e419e3fbb Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 17:47:37 -07:00
Anthony J. Thibault
41cce4320a Merge branch 'tony/anim-sync-blend' into test 2015-10-20 17:39:13 -07:00
Anthony J. Thibault
5cd2786c1d First pass at Rig timeScaling and blending between slow, walk and run. 2015-10-20 16:37:05 -07:00
Brad Davis
eacd6af032 Get conditional routes working 2015-10-20 16:32:00 -07:00
Andrew Meadows
d02fe784a9 css and cfg filetypes are text in .gitattributes 2015-10-20 13:58:44 -07:00
Anthony J. Thibault
11f2d29bf8 AnimBlendLinear: bugfixes for sync flag added timeScale 2015-10-20 10:36:37 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Brad Davis
ef6c4f6f66 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:15:36 -07:00
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -07:00
Anthony J. Thibault
0c36180e2f avatar-animation.json: Adjustment to sidestep endFrame, to prevent stalling at end 2015-10-19 15:49:53 -07:00
Anthony J. Thibault
2b4788929f AnimBlendLinear: Untested implementation of sync flag. 
Move accumulateTime into AnimUtil.
 2015-10-19 15:49:49 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Brad Davis
22602fb6f6 Fixing line endings 2015-10-19 10:00:16 -07:00
Brad Davis
184303d3c9 Using JS mappings for joystick, updating test code 2015-10-18 20:44:32 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
samcake
f675035fd1 Merge pull request #6101 from jherico/controllers 
Hydra controller updates and test code
 2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -07:00
Brad Davis
4f8e2c9f6b Fix JSON format errors 2015-10-15 13:18:04 -07:00
Thijs Wenker
9d2ae661e1 removed some XML from start-script button which possible caused an error before 2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10 ScriptEditor Improvements: 
- fixed run icon
 2015-10-14 21:00:50 +02:00
Brad Davis
910629c287 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-13 13:32:05 -07:00
Andrew Meadows
22786dea7d cleanup 2015-10-12 13:35:26 -07:00
U-GAPOS\andrew
f01847de14 experimental HMD hips tracking 2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258 initial hip translation from IK 
works for 2D 3rd person but probably not well for HMD
 2015-10-12 11:39:54 -07:00
samcake
297c3c9ed0 Fixing json issues 2015-10-09 17:37:51 -07:00
samcake
c02d33c17c Adding example mapping files 2015-10-09 17:27:50 -07:00
Anthony J. Thibault
0cebeb7fe9 Separated AvatarMixer inbound and outbound bandwidth on stats overlay 
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
 2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub
521aaa0998 Merge pull request #5974 from Atlante45/extra_debug 
Remove extra debug
 2015-10-01 14:42:45 -07:00
Atlante45
b37bf2b1b6 Remove extra debug 2015-10-01 13:18:22 -07:00
Andrew Meadows
b192d0a9cd make neck IK target type same as head 2015-09-29 17:39:17 -07:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD. 
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
 2015-09-24 17:54:32 -07:00
Andrew Meadows
17e3e9394f allow head translation for 3rd person screenie IK 2015-09-24 12:38:46 -07:00
Anthony J. Thibault
a454584496 Updated default avatar-animation.json 2015-09-23 10:59:52 -07:00
Andrew Meadows
7060befd1c Merge pull request #5862 from howard-stearns/user-specified-animation-graph 
user-specified animation graph
 2015-09-22 10:48:28 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
Howard Stearns
8b701b8a5b Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec. 
Takes effect when you save (if you have enabled the anim graph under developer->avatar).
An empty string gives you the default behavior.
 2015-09-21 10:26:04 -07:00
Sam Gateau
c37cdce750 Merging back with master 2015-09-10 17:53:50 -07:00
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Stephen Birarda
25aeda2e18 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
Howard Stearns
086afc47b1 Avatar animations on by default. (Using the now old animation machinery.) 
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
 2015-09-04 14:24:37 -07:00
Leonardo Murillo
232fd72e53 Revert "Address bar now closes when you click outside of it" 2015-09-01 16:32:29 -06:00
Seiji Emery
e0f6db2152 Coding style 2015-08-28 16:36:44 -07:00
Seiji Emery
c704fb7b12 Fixed to follow signal naming conventions, and added null check 2015-08-28 11:01:30 -07:00
Seiji Emery
9353eaf35a Added signal to detect + close address bar when user clicks outside of it 2015-08-28 10:33:30 -07:00
Sam Gateau
8ea8eea08d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-08-28 08:13:10 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Howard Stearns
b3a919a5ca Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-27 13:46:12 -07:00
Brad Hefta-Gaub
176860c612 Merge pull request #5649 from larsnaesbye/master 
Move i18n to own dir, update FA
 2015-08-27 10:46:29 -07:00
Sam Gateau
4f7b857130 Merge 2015-08-27 10:01:39 -07:00
Howard Stearns
0e18395fd0 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-26 12:04:28 -07:00
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Ryan Huffman
dc5d5cbb63 Add asset server ping to stats 2015-08-25 15:06:40 -07:00
Lars Christensen
324f592719 updated FontAwesome to v4.4 2015-08-25 01:55:52 +02:00
Sam Gateau
5a8e20ec77 merging 2015-08-21 16:34:13 -07:00
Howard Stearns
dc75b238a8 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 
And update with current code.
 2015-08-18 15:35:37 -07:00
Seth Alves
551f0aaba3 show how many times per second Application::idle is called 2015-08-18 01:41:17 -07:00
ericrius1
3910cb0d69 Merge branch 'master' into polyLineInProgress 2015-08-07 10:12:02 -07:00
Sam Gateau
95682e6270 Introducing the Normal fitting algorithm for better normal in the deferred buffer 2015-08-05 17:17:00 -07:00
ericrius1
b2753507dc cleanup of comments and dead code 2015-08-03 09:35:47 -07:00
David Rowe
f943dc8492 Use single file robot model as fallback for full avatar models 
Fixes having only a skeleton with no head if an invalid full model file
is configured.
 2015-07-29 19:34:05 -07:00
Brad Davis
914b47069b Working on line height 2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282 Working on line spacing 2015-07-17 14:19:39 -07:00
Bradley Austin Davis
c5e0298f8d Working on mac sizing 2015-07-17 12:22:38 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
David Rowe
daf34053a8 Tweak button positions 2015-07-09 10:15:28 -07:00
David Rowe
db7f1d6d27 Change font to Trebuchet 2015-07-09 09:35:22 -07:00
David Rowe
abc54f2e3f Polished fonts, colors, etc. 2015-07-07 17:08:02 -07:00
David Rowe
cd258262d2 Use proper Interface logo 2015-07-07 16:21:24 -07:00
David Rowe
1774ad9c53 Rework buttons 2015-07-07 15:59:34 -07:00
David Rowe
98cd706528 Add border around update details 2015-07-07 15:48:39 -07:00
David Rowe
0994cd97dc Rework header and add logo 
Use HiFi logo as placeholder for now until Interface SVG is available.
 2015-07-07 15:14:15 -07:00
David Rowe
085d87e035 Make background squared, white, and dragable 2015-07-07 14:16:45 -07:00
David Rowe
46e58cd106 Rework dialog container and layout 2015-07-07 13:56:47 -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
Stephen Birarda
3dc3d8b4c1 make the tooltip background darker 2015-06-29 11:05:59 -07:00
Stephen Birarda
133247ec6d Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo 2015-06-29 10:57:16 -07:00
Stephen Birarda
f93ad34282 add spacing above and below tooltipPic 2015-06-29 10:57:09 -07:00
Brad Davis
5cfa22396c Merge pull request #5219 from venkatn93/master 
Changing tooltip reticle
 2015-06-29 10:51:16 -07:00
Niraj Venkat
9101b4ad70 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-26 16:28:01 -07:00
Niraj Venkat
fe8d539cf5 changing link icon 2015-06-26 16:27:04 -07:00
Stephen Birarda
ff33922716 handle conflicts on merge with upstream master 2015-06-26 15:33:35 -07:00
Stephen Birarda
5b660e8c91 Merge pull request #5214 from venkatn93/master 
Changing formatting of tooltip
 2015-06-26 18:27:59 -04:00
Niraj Venkat
87fce44271 Changing formatting of tooltip 2015-06-26 14:41:38 -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
Stephen Birarda
7e19a540fd add the new placeholder image 2015-06-26 14:13:23 -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
c6df573933 fix some OS X warnings, add description to tooltip 2015-06-26 10:50:31 -07:00
Niraj Venkat
23f4f7d824 Place name is underlined 2015-06-25 15:56:40 -07:00
Niraj Venkat
8ea01b45ae Word wrap implementation 2015-06-25 15:46:43 -07:00
Niraj Venkat
6b14a64c8c Formatting changes and teleport on click 2015-06-25 15:15:44 -07:00