Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 22:55:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
42780 commits 71 branches 56 tags 1.2 GiB
Commit graph

42780 commits

Author SHA1 Message Date
Zach Pomerantz
63b0c0a9ad Reset pipeline after rendering text3d 2016-04-26 13:23:16 -07:00
Brad Hefta-Gaub
28b5ef63b8 Merge pull request 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 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 from thoys/planky-settings-fix 
Fix for Planky Settings window
 2016-04-26 09:51:21 -07:00
Brad Hefta-Gaub
c6be616401 Merge pull request from sethalves/fix-crash-in-model-loading 
fix a crash in RenderableModelEntityItem::getModel
 2016-04-25 23:50:04 -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 from sethalves/add-missing-delete 
fix memory leak in AssetMappingModel
 2016-04-25 12:56:26 -07:00
Ryan Huffman
84ed57cf0f Merge pull request from birarda/hello-worlds-link 
change docs link on Sandbox splash screen
 2016-04-25 11:30:26 -07:00
Anthony Thibault
6dfd174285 Merge pull request 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 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
Seth Alves
49566c8f26 fix memory leak in AssetMappingModel 2016-04-25 10:07:08 -07:00
Stephen Birarda
f5fdc9e28f change link on Sandbox splash screen 2016-04-25 09:53:41 -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
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 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 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 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 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
Andrew Meadows
d984ce4792 properly update _lastSimulated for kinematic objs 2016-04-22 17:19:00 -07:00
Brad Hefta-Gaub
f1f9c6740d Merge pull request from jherico/mac_texture_fix 
Fixing texture storage allocation on OSX/GL 4.1
 2016-04-22 17:07:12 -07:00
Bradley Austin Davis
d87c92baee Fixing memory detection on OSX 2016-04-22 16:30:36 -07:00
Bradley Austin Davis
472d3dc45f Still working on mac breakage 2016-04-22 16:25:23 -07:00
Bradley Austin Davis
407e0c0dd7 Fixing texture storage allocation on OSX/GL 4.1 2016-04-22 15:48:18 -07:00
Chris Collins
9bd9de5710 Merge pull request from samcake/red 
Stereo drawcall amplification
 2016-04-22 15:46:18 -07:00
Stephen Birarda
09a068e472 add back the avatar animation file new path 2016-04-22 13:53:39 -07:00
Stephen Birarda
132d9c3486 replace the default avatar with the being of light 2016-04-22 13:48:30 -07:00
Brad Hefta-Gaub
f4e4f217e8 Merge pull request from ctrlaltdavid/20872 
Further restyling of edit.js
 2016-04-22 13:46:26 -07:00
Brad Hefta-Gaub
79a1e6264e Merge pull request from hyperlogic/tony/default-anims-are-local 
Avatar animations are now stored locally
 2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c962cfbda3 Merge pull request from zzmp/guard/obj-access 
Guard OBJ at operators
 2016-04-22 13:43:59 -07:00
Brad Hefta-Gaub
410bf3c95a Merge pull request from AndrewMeadows/faster-kinematics 
faster hifi kinematic motion calculations take-4
 2016-04-22 13:41:02 -07:00
Brad Hefta-Gaub
c410242fb2 Merge pull request from jherico/texture_derez 
Reducing GPU texture memory footprint
 2016-04-22 13:20:54 -07:00
Andrew Meadows
34d622e498 add warning about truncated kinematic timestep 2016-04-22 13:10:23 -07:00
Brad Hefta-Gaub
de17834dd1 Merge pull request from ctrlaltdavid/20887 
Don't display "Reveal Scripts Folder" control in HMD mode
 2016-04-22 13:04:07 -07:00
Brad Hefta-Gaub
f0659a985c Merge pull request from Atlante45/fix/pmtu-disc-fail 
Fix for path MTU discovery fail
 2016-04-22 12:24:44 -07:00
Seth Alves
e827a99222 Merge pull request from Atlante45/fix/settings-crash 
Fix crash on exit in Settings
 2016-04-22 11:46:30 -07:00
Seth Alves
4561962db1 Merge pull request from huffman/fix/asset-request-crash 
Fix AssetClient not properly cleaning up canceled requests
 2016-04-22 11:45:26 -07:00
Zach Pomerantz
498d8b8a63 Merge pull request from birarda/cmake-defs 
add definitions from cmake for each release type
 2016-04-22 10:10:48 -07:00
Zach Pomerantz
f9125d1175 Merge pull request from birarda/udt-fixes 
move debug for resource retry to when retry occurs
 2016-04-22 10:10:22 -07:00
Ryan Huffman
3b5b6a2609 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/asset-request-crash 2016-04-22 10:02:21 -07:00
Ryan Huffman
1416e397e4 Merge branch 'playEntityCollisionSound-crash' of github.com:sethalves/hifi into fix/asset-request-crash 2016-04-22 10:02:00 -07:00
Andrew Meadows
2bd83764e7 remove some debug cruft 2016-04-22 09:38:43 -07:00
Andrew Meadows
872622c6f7 fix acceleration of for server-side kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
14abb15216 set kinematic accel before stepping 2016-04-22 09:38:43 -07:00
Andrew Meadows
8efb07cfd8 correctg measured acceleration for kinematics 2016-04-22 09:38:43 -07:00