Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 05:00:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43030 commits 75 branches 59 tags 1.2 GiB
Commit graph

43030 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
28b5ef63b8 Merge pull request #7748 from ctrlaltdavid/20890 
Position default toolbar buttons bottom center of screen
 2016-04-26 10:18:40 -07:00
Brad Hefta-Gaub
cf49ba26ad Merge pull request #7760 from hyperlogic/tony/away-reset-avatar 
Reset avatar on exit of away-mode.
 2016-04-26 09:51:47 -07:00
Brad Hefta-Gaub
03321e1fca Merge pull request #7753 from thoys/planky-settings-fix 
Fix for Planky Settings window
 2016-04-26 09:51:21 -07:00
ericrius1
a492262095 Merge remote-tracking branch 'upstream/master' 2016-04-26 09:28:15 -07:00
Brad Hefta-Gaub
716d9e554c removed a bunch of dead code 2016-04-26 09:25:28 -07:00
Ryan Huffman
e5f2658fd9 Update GPUIdent to take address of spInstance directly 2016-04-26 09:23:08 -07:00
Brad Hefta-Gaub
c6be616401 Merge pull request #7758 from sethalves/fix-crash-in-model-loading 
fix a crash in RenderableModelEntityItem::getModel
 2016-04-25 23:50:04 -07:00
Geenz
a1171a33fd Merge remote-tracking branch 'highfidelity/master' 2016-04-25 23:52:39 -04:00
Geenz
d6ee569963 Add sRGB conversions to shaders. 2016-04-25 23:52:33 -04:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
samcake
91bed86b32 ANd one more warning 2016-04-25 19:04:02 -07:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -07:00
samcake
8f2435daf0 No more warnings ? 2016-04-25 18:39:37 -07:00
James B. Pollack
61ff4d0f60 end of day 2016-04-25 18:27:04 -07:00
samcake
e8691c2f20 Fixing comments, code style and constnats 2016-04-25 18:15:52 -07:00
Andrew Meadows
50117e2ff4 add some new tutorial JS files 2016-04-25 17:53:10 -07:00
Andrew Meadows
3a2cb37ce2 move and rename some JS files 2016-04-25 17:50:35 -07:00
Andrew Meadows
e32fface93 add some local assets 2016-04-25 17:46:02 -07:00
Andrew Meadows
4630bdea58 move from examples/ to scripts/templates/ 2016-04-25 17:38:34 -07:00
Andrew Meadows
3f5a5a831e move examples/toybox to unpublishedScripts/DomainContent/Toybox/ 2016-04-25 17:37:40 -07:00
Andrew Meadows
0cc12fdaa6 move from examples/ to scripts/developer/ 2016-04-25 17:36:35 -07:00
Andrew Meadows
582b20227a move from examples/ to scripts/default/ 2016-04-25 17:35:27 -07:00
samcake
0e13b1623b Adding support for Equirectangular skymaps 2016-04-25 15:55:12 -07:00
Anthony J. Thibault
b7f157f4ff Reset avatar on exit of away-mode. 
Exposed MyAvatar.reset(bool) to script.
away.js now calls this on exit of away-mode.
 2016-04-25 14:10:20 -07:00
Clément Brisset
d74b5bdb17 Merge pull request #7756 from sethalves/add-missing-delete 
fix memory leak in AssetMappingModel
 2016-04-25 12:56:26 -07:00
Ryan Huffman
84ed57cf0f Merge pull request #7755 from birarda/hello-worlds-link 
change docs link on Sandbox splash screen
 2016-04-25 11:30:26 -07:00
Geenz
a2142646bb Merge remote-tracking branch 'highfidelity/master' 2016-04-25 13:33:10 -04:00
Geenz
ba5fa70b83 Convert sRGB values for materials. 2016-04-25 13:31:50 -04:00
Anthony Thibault
6dfd174285 Merge pull request #7750 from hyperlogic/tony/thousand-yard-stare 
Avatar eye gaze fix for HMDs
 2016-04-25 10:29:41 -07:00
Anthony Thibault
573e5ffdd8 Merge pull request #7751 from hyperlogic/tony/eye-contact-improvements 
Eye contact improvements
 2016-04-25 10:29:24 -07:00
Seth Alves
16bf59f8a6 fix a crash in RenderableModelEntityItem::getModel 2016-04-25 10:26:32 -07:00
James B. Pollack
8899ac71a1 move cellscience to production 2016-04-25 10:16:39 -07:00
Seth Alves
49566c8f26 fix memory leak in AssetMappingModel 2016-04-25 10:07:08 -07:00
Geenz
97931d96b8 Move sRGB calcs to ColorUtils 
And start consolidating any conversions with calls into ColorUtils.
 2016-04-25 12:59:16 -04:00
Stephen Birarda
f5fdc9e28f change link on Sandbox splash screen 2016-04-25 09:53:41 -07:00
samcake
dd189747f5 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-04-25 09:41:44 -07:00
Anthony J. Thibault
0c200e8c00 MyAvatar: coding convention fix for updateEyeContactTarget() 2016-04-25 09:27:43 -07:00
Thijs Wenker
1066efc737 - fix the settings window of Planky 
- set lifetime Planky blocks 60 minutes (per request of Ryan)
 2016-04-25 17:12:32 +02:00
Geenz
ed9c0dd74d Apply the correct sRGB conversions. 
sRGB does not use a gamma curve of 2.2 - instead it uses a piece-wise
gamma curve that 2.2 is approximate of.  This will cause very subtle
color differences between proper sRGB and "approximate" sRGB -
differences that are noticeable nonetheless.
 2016-04-25 02:35:26 -04:00
Anthony Thibault
0da3fb8eee Eye contact improvements 
* After eyes change targets there is now a minimum 1/3rd second delay before they will again.
* Changing gaze from eye to mouth is less likely then switching between eyes.
 2016-04-24 18:50:14 -07:00
Anthony Thibault
d8a32c8329 Avatar eye gaze fix for HMDs 
When no avatars are chosen for more detailed eye gaze tracking the eyes should look straight ahead.
Before this fix, if you were in room scale or not aligned with the camera sensor your gaze could drift to the left or to the right of your head's forward direction.
Now it should follow your head more closely.
 2016-04-24 17:59:51 -07:00
Brad Hefta-Gaub
88ab52d340 Merge pull request #7747 from hyperlogic/tony/avatar-look-at-fixes 
Fixes for avatar eye tracking.
 2016-04-23 17:04:15 -07:00
Brad Hefta-Gaub
8c7ef31636 Merge pull request #7746 from AndrewMeadows/supress-spurious-logs 
reduce warnings about truncated kinematic timesteps
 2016-04-23 09:34:45 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew 
support for larger than 35 minute clock skew
 2016-04-23 08:42:38 -07:00
Brad Hefta-Gaub
21b324e1f3 Merge pull request #7742 from birarda/new-default-av 
replace the default avatar with the being of light
 2016-04-23 08:42:00 -07:00
David Rowe
958c6f48c2 Maintain relative spacing among toolbars as the window is resized 2016-04-23 18:16:20 +12:00
David Rowe
3aec67bb36 Position default toolbar buttons bottom center of screen 
Expand edit toolbar horizontally.
 2016-04-23 16:05:34 +12:00
Anthony J. Thibault
c850880515 Head: compute _eyePosition properly. 2016-04-22 19:16:28 -07:00
samcake
f587398ca3 Adding support for plate carree 2016-04-22 18:00:22 -07:00
Andrew Meadows
d984ce4792 properly update _lastSimulated for kinematic objs 2016-04-22 17:19:00 -07:00