Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 19:14:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53604 commits 71 branches 56 tags 1.2 GiB
Commit graph

53604 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
da68c49dc1 more cleanup 2017-04-21 13:31:40 -07:00
ZappoMan
f07884602a more CR feedback 2017-04-21 13:13:29 -07:00
ZappoMan
088cdae320 CR feedback 2017-04-21 11:14:47 -07:00
ZappoMan
ff45ad53a3 some more CR cleanup 2017-04-21 10:40:41 -07:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
ZappoMan
fbc699d6b2 handle overflow case 2017-04-21 09:30:00 -07:00
ZappoMan
c03182546b some cleanup 2017-04-21 09:11:51 -07:00
ZappoMan
125b3d5f4e ignore old identity packets 2017-04-21 07:51:17 -07:00
ZappoMan
c197979354 add more logging 2017-04-20 18:36:00 -07:00
ZappoMan
7f1a87ac4f remove random http failure 2017-04-20 17:31:20 -07:00
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07:00
Zach Pomerantz
b77917b8d1 Merge pull request #10241 from zzmp/fix/display-fail 
Update Display menu on unsuccesful selection
 2017-04-20 12:04:51 -04:00
Zach Fox
50456f71ed Merge pull request #10142 from Triplelexx/21258 
21258 - Don't render (or heavily use GPU) when window in minimized
 2017-04-19 16:26:49 -07:00
Brad Hefta-Gaub
a555846d5d Merge pull request #10235 from volansystech/21206 
21206 Far grab improvement to draw held entity toward yourself
 2017-04-19 14:33:09 -07:00
Sam Gateau
788849e19a Merge pull request #10208 from jherico/gl41_variable 
Adding support for variable allocated textures to the GL 4.1 backend
 2017-04-19 11:42:23 -07:00
Brad Davis
472835d65c Port fix from master 2017-04-19 11:22:20 -07:00
Brad Davis
bccc06d2fe Fix resource texture memory usage tracking 2017-04-19 10:35:19 -07:00
Chris Collins
889b054085 Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations 
Fix Entities.setLocalJointTranslations
 2017-04-19 09:32:28 -07:00
druiz17
57f6529ce6 Merge pull request #10239 from druiz17/edit-model 
Fix issue of tablet proxy not choose the correct root
 2017-04-19 09:19:46 -07:00
volansystech
b194ddeb66 Resolve Comments of @sethalves 2017-04-19 16:39:23 +05:30
Sam Gateau
4df41ff7d3 Merge pull request #10206 from AndrewMeadows/avatar-renderer-001 
Cleanup dependencies in Avatar class in preparation for migration to new lib
 2017-04-18 16:45:51 -07:00
Zach Pomerantz
c7a7fa90ec update Display menu on unsuccesful selection 2017-04-18 18:47:57 -04:00
Brad Davis
2a2102c7fe Recompute memory pressure state after each promote / demote call 2017-04-18 15:12:34 -07:00
Dante Ruiz
ce8dba21a0 fix tablet proxy choosing wrong root 2017-04-18 22:49:43 +01:00
Howard Stearns
89fa6601b9 Merge pull request #10238 from howard-stearns/callback-on-profile-failure 
Be sure to callback even on profile failure.
 2017-04-18 13:40:03 -07:00
howard-stearns
3113dced7b Be sure to callback even on profile failure. 2017-04-18 12:06:44 -07:00
Andrew Meadows
da55c96c4c protect against crash on invalid scene on shutdown 2017-04-18 11:52:22 -07:00
Andrew Meadows
014d7b8d8d use viewFrustum position for laser pointer render filtering 2017-04-18 11:52:22 -07:00
Andrew Meadows
71c5644c23 more shared_ptr by const reference 2017-04-18 11:52:22 -07:00
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
Andrew Meadows
0cc6763617 fix build by including EntityItem.h 2017-04-18 11:52:22 -07:00
Andrew Meadows
e60a28620d cleanup FancyCamera implementation 2017-04-18 11:52:22 -07:00
Andrew Meadows
a3682a1a0e cleanup includes in Avatar.cpp and remove cruft 2017-04-18 11:52:21 -07:00
Andrew Meadows
5a458c9923 remove last qApp usage from Avatar class 2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c remove Camera argument from Avatar::render() 2017-04-18 11:52:21 -07:00
Andrew Meadows
fbacbd74f7 pass shared pointers by ref in Avatar::render() 2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a more interface-only spaghetti out of Avatar 2017-04-18 11:52:21 -07:00
Andrew Meadows
272cf07c31 removed cruft: unused Camera::toViewFrustum() 2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436 pull qApp spaghetti out of Avatar class 
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
 2017-04-18 11:52:21 -07:00
Zach Fox
7505b82189 Merge pull request #10046 from Triplelexx/21224 
21224 - Allow people to save avatar bookmarks
 2017-04-18 11:10:50 -07:00
Seth Alves
d84dd4ce67 Merge pull request #10234 from druiz17/webview-redesign 
tablet webview navigation bar redesigned
 2017-04-18 10:23:39 -07:00
Seth Alves
b2de5ebdaf Merge pull request #10136 from mittens/21217 
Added quadratic ease-in-and-out smoothing to remote avatars
 2017-04-18 10:05:48 -07:00
Brad Hefta-Gaub
8c1ca1dc33 Merge pull request #10236 from highfidelity/stable 
Stable back to master...
 2017-04-18 09:01:16 -07:00
Chris Collins
a8e43c99ca Merge pull request #10197 from highfidelity/RC-37 
Beta Release 37
 2017-04-18 07:58:04 -07:00
volansystech
e5c7587ad8 Improve far grabbing based on timescale. 2017-04-18 20:01:02 +05:30
Dante Ruiz
31b61c3225 removed white space 2017-04-18 00:24:34 +01:00
Dante Ruiz
e46d9da98f fixed merge conflict 2017-04-18 00:22:35 +01:00
Zach Fox
d1a11740f0 Whoops 2017-04-17 13:00:23 -07:00
volansystech
7e0efed062 Improve speed of grabbing. 2017-04-18 00:54:01 +05:30
Zach Fox
9c4e367245 Merge pull request #10213 from zfox23/fixGoToFocus 
FB 4156; Fix GoTo text field focus; other GoTo tweaks
 2017-04-17 12:13:41 -07:00