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

43587 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
bb53011840 Merge pull request #7884 from sethalves/update-model-meta 
when a ModelEntityItem moves, also update its meta-render-item
 2016-05-16 16:08:22 -07:00
David Rowe
1fc3d9229c Fix initial drive change and go-up not working properly on first screen 2016-05-17 10:51:42 +12:00
Brad Davis
0d6b0eef59 PR feedback 2016-05-16 15:27:14 -07:00
Stephen Birarda
eb8a764f42 update LICENSE to include "and other platform" 2016-05-16 14:45:04 -07:00
Seth Alves
d77b3bf59a fix some comments and debug pritns 2016-05-16 14:12:05 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
howard-stearns
3f17852244 Merge branch 'master' of https://github.com/highfidelity/hifi into improve-hand-controller-edit 2016-05-16 12:35:48 -07:00
howard-stearns
acb56d0603 Larger edit handles, and more tolerance in click (vs drag). 2016-05-16 12:35:05 -07:00
Seth Alves
a0c3224705 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-16 10:56:09 -07:00
Seth Alves
2a5efd3b82 Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
Zach Pomerantz
7d4276d15f Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor 2016-05-16 10:51:23 -07:00
Zach Pomerantz
61fbb7022c Mv entities script engine deleter to fn 2016-05-16 10:40:11 -07:00
Brad Hefta-Gaub
06d1bd5728 Merge pull request #7799 from birarda/remove-avatar-billboard 
remove the last of the avatar billboard code
 2016-05-16 10:23:42 -07:00
Brad Hefta-Gaub
166fbdece5 Merge pull request #7853 from zzmp/fix/shutdown 
Fix hang on exit from dying scripts
 2016-05-16 10:17:34 -07:00
Brad Hefta-Gaub
cf59fa8a46 Merge pull request #7885 from ctrlaltdavid/20918 
make users.js movable
 2016-05-16 10:16:32 -07:00
Brad Hefta-Gaub
b862f0b8f3 Merge pull request #7904 from jherico/fix_filters 
fix texture sampler calculation
 2016-05-16 10:16:16 -07:00
Seth Alves
880b52aad2 update attachedEntitiesManager to work better with avatarEntities 2016-05-16 09:52:48 -07:00
Seth Alves
3876a8037c Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-16 09:51:20 -07:00
Brad Davis
84f4945840 Fix sampler mode lookup 2016-05-15 13:05:50 -07:00
Brad Hefta-Gaub
1f800294c6 Merge pull request #7880 from jherico/gpu_smart_buffers 
Support partial CPU->GPU buffer transfers
 2016-05-14 17:44:26 -07:00
Brad Hefta-Gaub
1c20212c39 Merge pull request #7901 from jherico/fix_procedural 
Fix procedural rendering on primitives
 2016-05-14 17:31:08 -07:00
Atlante45
419ff3bbea Track request lifetime in lambda callbacks 2016-05-14 14:50:02 -07:00
Atlante45
0878d87ac7 remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
Atlante45
5acbed647c Remove glowLevel references in scripts 2016-05-14 14:49:31 -07:00
Atlante45
38f74c1843 Remove the last of the glow level 2016-05-14 14:49:31 -07:00
Brad Davis
1e136ed71f Fix procedural rendering on primitives 2016-05-14 10:59:59 -07:00
Brad Hefta-Gaub
87aa90de08 Merge pull request #7878 from howard-stearns/vive-buttons-out-of-pause 
More buttons to get out of away/pause.
 2016-05-14 09:12:16 -07:00
Brad Davis
e8bd97c761 Fix GPU buffer memory statistics 2016-05-14 08:28:51 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Brad Davis
eb84459f03 Support partial CPU->GPU buffer transfers 2016-05-14 08:28:50 -07:00
Brad Hefta-Gaub
a5f99ba370 Merge pull request #7899 from sethalves/dont-send-file-urls-to-avatar-mixer 
fix invisible default avatars
 2016-05-14 07:48:16 -07:00
David Rowe
14c733cd6e Make columns sortable 2016-05-14 17:19:18 +12:00
David Rowe
c21087ad87 Add icon to title 2016-05-14 13:04:18 +12:00
Brad Hefta-Gaub
e754b9e19c Merge pull request #7871 from samcake/hdr 
Defaulting the color formats used in the rendering pipeline to sRGB
 2016-05-13 17:35:48 -07:00
Zach Pomerantz
4e62d7ff61 Define ScriptEngines::isStopped inline 2016-05-13 17:28:21 -07:00
Brad Hefta-Gaub
b1d86c8881 Merge pull request #7898 from samcake/red 
Fix broken rendering for simple metallic material
 2016-05-13 17:22:36 -07:00
Brad Hefta-Gaub
0d5fdbdb6e Merge pull request #7879 from howard-stearns/fix-reticle-offset 
fix reticle position offset
 2016-05-13 17:17:23 -07:00
David Rowe
88130ee5c8 Merge branch 'master' into 20917 2016-05-14 12:13:39 +12:00
David Rowe
33e2cde266 Change default position to be bottom left of HMD recommended rectangle 2016-05-14 12:08:19 +12:00
Seth Alves
6277bf8603 if avatar is set to the default avatar file that came with the distribution, don't save that url to settings. never send a file url to the avatar-mixer. 2016-05-13 16:37:43 -07:00
samcake
96dffad0d3 Fixing the metallic simple material rendering black from obj 2016-05-13 16:35:15 -07:00
samcake
cdb9cb6519 Fixing the metallic simple material rendering black from obj 2016-05-13 16:33:14 -07:00
Zach Pomerantz
65e81077cb Merge branch 'master' of github.com:highfidelity/hifi into perf/idle-event 2016-05-13 16:24:42 -07:00
David Rowe
ccd821118e Merge branch 'master' into 20918 2016-05-14 11:21:04 +12:00
Zach Pomerantz
2140dc77b3 Rename wait and unload in best thread 2016-05-13 16:14:22 -07:00
Zach Pomerantz
36565598a7 Hide script stop behind accessor and fix friendship 2016-05-13 15:52:53 -07:00
Brad Hefta-Gaub
c443138dd2 Merge pull request #7869 from zzmp/fix/fbx-access 
Check vector access in fbx reader
 2016-05-13 15:29:24 -07:00
Zach Pomerantz
59e4b9c356 Merge branch 'master' of github.com:highfidelity/hifi into fix/shutdown 2016-05-13 15:28:12 -07:00
Brad Hefta-Gaub
987b3483a8 Merge pull request #7876 from sethalves/fix-grab-fixes 
fix grab-fixes
 2016-05-13 15:26:31 -07:00
Zach Pomerantz
13610b1220 Delete late-added script engines 2016-05-13 15:24:31 -07:00