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

24526 commits

Author SHA1 Message Date
Olivier Prat
cda48cbf67 Three blurs working 2017-10-09 15:13:32 +02:00
Olivier Prat
0d3d309bce Quarter size debug rendering of bloom 2017-10-09 11:49:29 +02:00
Olivier Prat
50ab73009a Working threshold mask and debug on Bloom 2017-10-09 11:09:51 +02:00
Olivier Prat
98d39ff9e0 Merged with master 2017-10-09 09:37:18 +02:00
Olivier Prat
27a0fb62d3 Multiple gaussians as Unreal. First draft 2017-10-09 09:35:38 +02:00
Bradley Austin Davis
c92588685b Merge pull request #11533 from SamGondelman/modelMaster 
Fix model loading for real this time
 2017-10-08 10:23:13 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
Brad Hefta-Gaub
80f0bd3b79 Merge pull request #11494 from humbletim/add-console-output-basenames 
[experiment/feedback] Include script name with all JS/QML debug output
 2017-10-06 17:58:19 -07:00
Seth Alves
9064114ce5 fix mistaken logic-flip in recent PR 2017-10-06 11:03:48 -07:00
Seth Alves
195d96bd43 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 11:02:35 -07:00
Seth Alves
f4dedf05bb move variables into block that needs them 2017-10-06 11:02:26 -07:00
Ryan Huffman
9c06afc4c8 Merge pull request #11326 from cain-kilgore/21537 
WL 21537 - Improve log naming
 2017-10-06 08:51:42 -07:00
Seth Alves
8d00731620 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 07:20:34 -07:00
Chris Collins
c8301890e6 Merge pull request #11530 from kencooke/audio-mac-bugfix 
Fix microphone audio on the Mac
 2017-10-05 15:57:56 -07:00
SamGondelman
a6b7578c3c start fixing asynch issue, fixes model loading! 2017-10-05 12:30:00 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Cain Kilgore
b3c3b2d34f Switched Time & Session ID Over 2017-10-05 19:42:31 +01:00
Ken Cooke
8822b1bfa4 Minor cleanup 2017-10-05 09:49:38 -07:00
Ken Cooke
82d13090f9 Better comments 2017-10-05 09:28:30 -07:00
Ken Cooke
d8341a0929 Work around compiler optimization bug 2017-10-05 09:27:07 -07:00
Ryan Huffman
de2c1aabac Add removal of temporary files in FBXBaker 2017-10-05 09:08:42 -07:00
Ken Cooke
218de29356 disable compiler optimization as temporary fix 2017-10-05 07:39:21 -07:00
Sam Gateau
25dae2f24e Merge pull request #11499 from samcake/blue 
Moving Camera update and render frame to Game Loop (Main thread)
 2017-10-04 18:42:02 -07:00
Sam Gateau
02bcbe6d5f Merge pull request #11512 from AndrewMeadows/more-profile-details 
expose performance hot spot in stats details
 2017-10-04 18:34:19 -07:00
SamGondelman
3a6e84e681 trying to fix model issue 2017-10-04 17:26:12 -07:00
SamGondelman
215193ad90 try to improve performance 
(cherry picked from commit a5f5f9fc5d)
 2017-10-04 13:50:35 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
Seth Alves
75d2a2bd47 Merge pull request #11517 from SamGondelman/registration 
Fix entities with registration points rendering in the wrong place
 2017-10-03 16:09:27 -07:00
SamGondelman
fc6e5df2cb fix text/web registration point usage 2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e possibly fix registration offset issue 2017-10-03 14:44:11 -07:00
Seth Alves
6040c4a3e8 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 14:06:01 -07:00
Anthony Thibault
2dc080479c Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock 
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
 2017-10-03 13:31:01 -07:00
Seth Alves
05e173a1d0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-03 13:11:03 -07:00
SamGondelman
a6f2545511 fix local t pose 2017-10-03 12:51:37 -07:00
Andrew Meadows
46e809bbb2 use a better variable name 2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851 expose performance hot spot in stats details 2017-10-03 12:35:02 -07:00
Anthony J. Thibault
1389c2e31d Bug fix for deadlock in ModelEntityItem::setCompundShapeURL() 
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
 2017-10-03 12:15:23 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Howard Stearns
22f0ef33ed Merge pull request #11496 from howard-stearns/certificate-properties 
Certificate properties
 2017-10-03 10:06:48 -07:00
Seth Alves
41dfdf4d82 Merge pull request #11509 from druiz17/fix-hud-module 
Hud module. check if laser is pointing at UI element without moving the reticle first
 2017-10-03 09:44:45 -07:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
Sam Gateau
acb99592ee fixing th e bug on exit due to the debug anim draw of the avatars 2017-10-02 21:31:30 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
Seth Alves
e7fa8131ea make json importer understand AVATAR_SELF_ID 2017-10-02 16:44:03 -07:00
Howard Stearns
9b0ebf0e07 doh! string not boolean 2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e allow importing of avatar entities from json 2017-10-02 16:06:44 -07:00