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

15311 commits

Author SHA1 Message Date
samcake
402809fe2f FIxing coding standards 2016-01-21 16:44:35 -08:00
samcake
9c344c6498 FIxing the bordering enble default value 2016-01-21 16:38:21 -08:00
samcake
2471a88e85 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-21 15:53:25 -08:00
samcake
16573357d8 FIxing the AO results at the border of the frame by guarding the fetch out of the frame 2016-01-21 15:50:38 -08:00
Leonardo Murillo
7e19110dd5 Merge pull request #6887 from birarda/migrate-ds-old-dev 
migrate domain-server config from single org name
 2016-01-21 16:24:02 -06:00
Stephen Birarda
aa2e55a5a0 handle weird nested path on windows 2016-01-21 14:03:45 -08:00
Stephen Birarda
cddb8cd3f0 migrate domain-server config from single org name 2016-01-21 13:57:24 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
4cfe3941f4 delete the lookup timeout timer once fired 2016-01-21 11:18:53 -08:00
Andrew Meadows
58a7528b68 Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js 
Access avatar parent information from js
 2016-01-21 09:19:40 -08:00
Seth Alves
311e0cee67 Merge pull request #6820 from AndrewMeadows/collision-mask 
use "collidesWith" instead of "collisionMask"
 2016-01-21 09:13:34 -08:00
samcake
8d1ab01018 exposing one more parameter 2016-01-20 18:32:44 -08:00
Brad Hefta-Gaub
7919d7bc17 Merge pull request #6866 from jherico/menufix 
Fixing overlay menu popup & some more QML cleanup
 2016-01-20 16:58:21 -08:00
samcake
4e5869b247 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 16:30:24 -08:00
samcake
0da4df93b8 Merge pull request #6860 from zzmp/refactor/cull-functor 
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
 2016-01-20 14:25:42 -08:00
Zach Pomerantz
0a34ee9138 Externalize list sizing for render::cullItems 2016-01-20 12:39:27 -08:00
samcake
07c630bcda And cleaning again hopping to have the pr build 2016-01-20 11:44:01 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
samcake
35ea04ae7c fixing the bug that kept AO when ao is off... 2016-01-20 11:13:50 -08:00
Andrew Meadows
19d24293e1 Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent 
don't persist entites with invalid parentIDs
 2016-01-20 10:38:26 -08:00
samcake
320c799379 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 10:14:02 -08:00
Stephen Birarda
e69424e155 add parentheses to old style signal 2016-01-20 09:27:47 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
Stephen Birarda
e3df02e589 fix parenting of single shot timer 2016-01-19 20:51:33 -08:00
Stephen Birarda
60bf617ea1 allow STUN to succeed started late or immediately 2016-01-19 20:41:39 -08:00
samcake
c5c51f2af2 Make sure the resolution level for ao is correct 2016-01-19 18:57:03 -08:00
samcake
dc40337dc1 Adjusting default settings 2016-01-19 18:02:47 -08:00
samcake
584d50b594 Experimenting with AO on the lightmaped surface 2016-01-19 17:56:07 -08:00
Stephen Birarda
e5d47f3379 fix for accidental filtering of stun packets 2016-01-19 17:26:41 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Seth Alves
28d673cb97 try again to make this thread safe 2016-01-19 16:00:02 -08:00
Seth Alves
0064ee6ab2 try again to make this thread safe 2016-01-19 15:55:56 -08:00
Seth Alves
edea0320e6 try again to make this thread safe 2016-01-19 15:44:22 -08:00
Seth Alves
a515d6debe call into correct thread to getJointNames on entity 2016-01-19 15:16:58 -08:00
Seth Alves
90847dc49c oops 2016-01-19 15:00:33 -08:00
Seth Alves
09dd3e2a56 merge from upstream, respond to code review 2016-01-19 14:38:22 -08:00
Stephen Birarda
74b2a44050 merge the master and user configs after a settings change 2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Seth Alves
f265656e74 expose getJointNames for entities to js 2016-01-19 12:55:17 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
a2bec2a5bf Merge pull request #6857 from ctrlaltdavid/20779 
Fix crash in Running Scripts when edit filter after highlighting script
 2016-01-19 11:40:47 -08:00
Stephen Birarda
858adf383e update comment for config migration 2016-01-19 11:38:31 -08:00
Stephen Birarda
483e0f419b use mkpath to create new data directory 2016-01-19 11:37:49 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
Stephen Birarda
74806d9d2b migrate old DS config file to new path 2016-01-19 11:28:29 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Ryan Huffman
de36f3eeb2 Update ServerPathUtils::getDataDirectory to use custom path lookup 2016-01-19 10:54:38 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes 
Various fixes
 2016-01-19 10:15:46 -08:00