Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-11 23:56:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43567 commits 25 branches 0 tags 1.1 GiB
Commit graph

43567 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Zach Pomerantz
70d0ebb91c Consolidate stoppingAllScripts to ScriptEngines::_stopped 2016-05-13 15:24:15 -07:00
Seth Alves
5247ca5c22 Merge pull request #7896 from ZappoMan/possibleFixToFUESnafu 
move firstRun.set() to correct place
 2016-05-13 14:15:58 -07:00
Seth Alves
bfac7c6f68 Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 13:33:39 -07:00
Seth Alves
ceb6aa582f don't crash when a moving model entity is deleted 2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d don't crash when a moving model entity is deleted 2016-05-13 13:32:00 -07:00
Brad Hefta-Gaub
65aae42714 move firstRun.set() to correct place 2016-05-13 13:28:02 -07:00
Seth Alves
efe02c0fa1 make lock/unlock button easier to see 2016-05-13 10:57:41 -07:00
Seth Alves
0ab987faac Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 10:13:10 -07:00
Seth Alves
09317f46e5 Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into update-model-meta 2016-05-13 09:52:59 -07:00
Seth Alves
81af0d0a47 Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 09:41:56 -07:00
Seth Alves
574709824e oops 2016-05-13 09:41:19 -07:00
Seth Alves
36e5751638 Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 07:12:39 -07:00
Seth Alves
9bd4b4f8d8 Merge branch 'master' of github.com:highfidelity/hifi into fix-update-entity-operator 2016-05-13 07:12:11 -07:00
Seth Alves
dabecb7cc2 merge from other branch 2016-05-13 07:11:57 -07:00
Seth Alves
79141e3869 dry up some code 2016-05-13 07:06:25 -07:00
Seth Alves
eb19c5be13 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-13 07:04:58 -07:00
samcake
fa87c68ca7 INtroducing the TransformBuffer 2016-05-13 01:08:25 -07:00
David Rowe
3b34b908d7 Tweak level-up and home buttons 2016-05-13 17:39:15 +12:00
David Rowe
1928f51b3e Restore window position at script start 2016-05-13 13:56:31 +12:00
David Rowe
ec74cb4aec Maintain offset of bottom with nearest display edge if Interface resized 2016-05-13 13:22:03 +12:00