Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-26 14:29:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40761 commits 74 branches 59 tags 1.2 GiB
Commit graph

16171 commits

Author SHA1 Message Date
Chris Collins
e47c8896db Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h 
Application: fix third-person and fullscreen-mirror toggle
 2016-03-15 11:50:22 -07:00
Anthony Thibault
addde84bee Merge pull request #7363 from markej/master 
Fill in the Downloads: line of the stats window
 2016-03-15 10:42:09 -07:00
Anthony J. Thibault
7539eec134 Application: fix third-person and fullscreen-mirror toggle 2016-03-15 10:11:56 -07:00
Brad Hefta-Gaub
11e88f965d Merge pull request #7347 from hyperlogic/tony/prevent-roll-in-goto-location 
MyAvatar: prevent roll and pitch in avatar via snapshot url.
 2016-03-14 18:58:49 -07:00
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Mark Johnson
2834ff2935 Change Q: -> Pending: 2016-03-14 11:45:05 -07:00
Anthony Thibault
1e94d9bdf5 interface/src/avatar: cppcheck fixes 2016-03-13 18:56:15 -07:00
Anthony Thibault
b921ac7757 MyAvatar: prevent roll and pitch in avatar via snapshot url. 2016-03-13 11:32:48 -07:00
Mark Johnson
b7a47d7bf2 Tabs -> Spaces 2016-03-12 17:35:57 -08:00
Mark Johnson
47d3f418e3 Merge remote-tracking branch 'highfidelity/master' 2016-03-12 17:30:22 -08:00
Mark Johnson
00829db375 Fill in the downloads line of the stats window 
Will show the active download, current download limit and how many
pending requests
 2016-03-12 17:27:43 -08:00
Anthony Thibault
ea95295e66 ApplicationOveraly: Fix for gray line at top of HMD UI overlay 2016-03-12 14:52:26 -08:00
Brad Hefta-Gaub
c93ed7c6f7 Merge pull request #7321 from ctrlaltdavid/20829 
Restyle HMD menus
 2016-03-11 20:43:27 -08:00
Anthony Thibault
9fb897476e Application: fix for mouse control in third-person camera 
Process the keyboard & mouse input plugin after the userInputMapper()->update().
 2016-03-11 17:29:18 -08:00
David Rowe
8b9319b29e Merge branch 'master' into 20829 2016-03-12 13:09:59 +13:00
David Rowe
3deb30d699 Remove no longer need font type 2016-03-12 13:06:29 +13:00
David Rowe
3bf1afb80b HMD submenus not allcaps 2016-03-12 12:56:38 +13:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands 
Smoother hand motion when using hand controllers
 2016-03-11 15:08:59 -08:00
Chris Collins
ae596d79f1 Merge pull request #7317 from jherico/hmd_worn 
Expose a property in display plugins to determine if the device is visible to the user
 2016-03-11 11:46:06 -08:00
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -08:00
Anthony J. Thibault
5eeb4ca594 Fix one frame lag controller lag/jitter 
Move userInputMapper->update() after inputPlugin->pluginUpdate().
 2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
9b89654d6a Merge pull request #7312 from jherico/crashes 
Better threaded handling of QML overlays
 2016-03-11 08:45:08 -08:00
Seth Alves
0d15706f34 Merge pull request #7315 from hyperlogic/tony/avatar-speed-stat-fix 
Stats: fix for avatar velocity stat being stuck at 0.1
 2016-03-11 06:37:23 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834 Merge pull request #7320 from zzmp/feat/shader-includes 
Compile shaders into separate dir for inclusion
 2016-03-10 21:07:49 -08:00
Anthony J. Thibault
ab19d3e5a2 Moved animation after physics, hand poses are in world frame. 
There are still some debug hacks enabled so I can test in the vive room.
 2016-03-10 20:44:35 -08:00
Zach Pomerantz
11867aa71d Compile shaders to their own folders 2016-03-10 20:10:54 -08:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
David Rowe
e175c19754 Style checkbox for menu items 2016-03-11 15:51:27 +13:00
David Rowe
fb0f97264c Style HMD menu items 2016-03-11 15:24:35 +13:00
Philip Rosedale
e87ef52a4c Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay 
More reliable and usable UI sphere overlay location
 2016-03-10 17:43:50 -08:00
Brad Davis
e452020126 Better threaded handling of QML overlays 2016-03-10 15:50:07 -08:00
Anthony J. Thibault
c0880a570e Stats: fix for avatar velocity stat being stuck at 0.1 2016-03-10 15:15:46 -08:00
David Rowe
2b45971f8c Style HMD menu backgrounds 2016-03-11 11:42:49 +13:00
samcake
ad7d567932 Fixing the overlay renderItem access issue 2016-03-10 14:09:34 -08:00
Philip Rosedale
e1f91ae8b0 Merge pull request #7311 from hyperlogic/tony/raise-your-hands-in-the-air 
MyAvatar: Allow user to raise hands directly overhead.
 2016-03-10 13:45:15 -08:00
Anthony J. Thibault
6d11dd465c Application: reset avatar on displayMode change 
but not HMD sensor.
 2016-03-10 13:12:09 -08:00
Zach Pomerantz
b627a17ce9 Allow px/color skybox without tex 2016-03-10 12:58:49 -08:00
Andrew Meadows
a5e94ec087 Merge pull request #7307 from ctrlaltdavid/update-glyphs 
Update HiFi glyphs font file
 2016-03-10 12:55:32 -08:00
David Rowe
bbe507ec05 Add file headers and update Qt versions in VR menu QML files 2016-03-11 09:53:10 +13:00
Anthony J. Thibault
4a78300607 MyAvatar: Allow user to raise hands directly overhead. 
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head.  Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
 2016-03-10 10:20:17 -08:00
Brad Hefta-Gaub
ee727b0632 Merge pull request #7304 from Atlante45/master 
Fix messed up LogDialog multi-lines
 2016-03-10 09:23:35 -08:00
Brad Hefta-Gaub
82ca78b37b Merge pull request #7300 from sethalves/fix-detach-crash 
fix removing attachments
 2016-03-10 08:23:52 -08:00
David Rowe
4c3f374f02 Update HiFi glyphs font file 
Has some new, soon to be used characters, but no other changes.
 2016-03-10 15:10:44 +13:00
Anthony J. Thibault
5f1b8805cf Removed unnecessary include 2016-03-09 17:37:51 -08:00
Atlante45
f6e01bbd36 Fix messed up LogDialog multi-lines 2016-03-09 17:31:04 -08:00