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

44607 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
61193ebd6d Merge pull request #8156 from howard-stearns/use-normal-script-update-frequency-for-handControllerPointer 
use normal script update frequency for handControllerPointer
 2016-06-30 10:59:56 -07:00
SamGondelman
be102ba926 remove unused variable 2016-06-30 10:05:57 -07:00
David Rowe
759b3065fc Distinguish between file name and directory as prompt in file chooser 2016-06-30 20:48:19 +12:00
James B. Pollack
4b4e38a57c end of day 2016-06-29 18:28:39 -07:00
SamGondelman
40d584021a replace old code completely, removed unnecessary blit 2016-06-29 18:09:46 -07:00
Anthony J. Thibault
6072487c9c Equip-points attachments work 
Also made handControllerGrab.js eslint clean.
 2016-06-29 17:28:53 -07:00
Zach Pomerantz
925aea162a Merge pull request #8161 from zzmp/fix/8160-hotfix 
fix domain-server issues with metadata hours, hotfixed in stable
 2016-06-29 16:31:03 -07:00
Zach Pomerantz
e91e891676 Merge branch 'stable' of github.com:highfidelity/hifi into fix/8160-hotfix 2016-06-29 16:23:54 -07:00
Stephen Birarda
a3189345d6 Merge pull request #8160 from zzmp/fix/metadata-mac 
fix metadata hours parsing on mac
 2016-06-29 16:18:38 -07:00
SamGondelman
335ed667bb dk2 snapshot takes picture of HMD window 2016-06-29 16:05:17 -07:00
James B. Pollack
fd062d09dc initial notes and research 2016-06-29 15:59:51 -07:00
Anthony J. Thibault
43d4dba4c0 iterate over hotspots not entities. 
This makes it possible to render multiple hotspots per entity.
Also, it will use the same logic to decide how to deal with overlapping entity
equip hotspots.
 2016-06-29 13:53:07 -07:00
Anthony J. Thibault
1b98c73473 WIP, equip-points work but they don't use the proper attach point. 2016-06-29 13:53:06 -07:00
Anthony J. Thibault
b042210637 Addition of equipHotspots 2016-06-29 13:53:06 -07:00
Stephen Birarda
1b87e902de fix initialization of DEFAULT_HOURS in DomainMetadata 2016-06-29 13:23:52 -07:00
Zach Pomerantz
80fceccb7e simplify hours parsing in domain metadata 2016-06-29 12:43:39 -07:00
James B. Pollack
6d3129899b remove prints, fix typo, formatting 2016-06-29 11:47:41 -07:00
James B. Pollack
0e3b54c130 remove logging 2016-06-29 11:07:48 -07:00
James B. Pollack
fcb6e7869d logging 2016-06-29 10:54:24 -07:00
Brad Davis
5a9be817df PR comments 2016-06-29 10:28:55 -07:00
James B. Pollack
1b61a240c1 Merge remote-tracking branch 'upstream/master' into somebow 2016-06-29 10:17:47 -07:00
samcake
f3c5324e5c Merge pull request #7937 from jherico/gpu_breakup3 
Adding GL 4.5 backend and tests
 2016-06-29 10:13:46 -07:00
Howard Stearns
b649b30777 Reduce margin. 2016-06-29 08:20:47 -07:00
Brad Davis
f93a91a97f Abandon seperate vertex formats for now 2016-06-28 19:18:16 -07:00
Brad Davis
542601fd9d Fix invalid GL 4.5 calls 2016-06-28 18:56:25 -07:00
Brad Davis
ab7fed1af8 Switch back to disable GL 4.5 by default, add support for logging when enabled 2016-06-28 18:56:25 -07:00
Brad Davis
a41de3a60d Making GL 4.5 enabled by default, adding logging 2016-06-28 18:55:26 -07:00
Brad Davis
8b56444dde Fix crash in GL45 buffer re-allocation 2016-06-28 18:55:25 -07:00
Brad Davis
b16812aa4d Adding GL 4.5 backend 2016-06-28 18:55:24 -07:00
Brad Davis
21d2c977a3 Remove roll from cursor in HMD 2016-06-28 18:30:07 -07:00
Brad Davis
962f9d5f22 Don't update the shown state of the tool window when it's already invisible 2016-06-28 18:10:06 -07:00
Howard Stearns
58e2300943 Merge branch 'master' of https://github.com/highfidelity/hifi into limit-hand-controller-actions-to-recommended-area 2016-06-28 18:01:46 -07:00
Howard Stearns
b551bc3c1a Use the whole area, less a margin. 2016-06-28 18:01:09 -07:00
Howard Stearns
d650c50a5b Use normal Script.update (60hz) instead of a timer (@20hz). 2016-06-28 17:44:30 -07:00
Brad Hefta-Gaub
ec0ca1d173 Merge pull request #8146 from huffman/fix/launch-version 
Add version to launch user activity
 2016-06-28 17:13:10 -07:00
Andrew Meadows
74781c0786 boxify static meshes with too many vertices 2016-06-28 16:36:10 -07:00
Andrew Meadows
e538625fe0 fix warning about convex hull vertex count cap 2016-06-28 16:35:32 -07:00
Brad Davis
34faf45a5d Merge pull request #8154 from jherico/stable-merge 
Stable merge back to master
 2016-06-28 16:22:10 -07:00
Brad Davis
b45ed7f959 Merge remote-tracking branch 'upstream/stable' into stable-merge 2016-06-28 15:09:00 -07:00
Brad Davis
f0d04dcfe0 Merge pull request #8153 from jherico/RC-14-merge 
RC-14 merge back to master
 2016-06-28 14:50:14 -07:00
Brad Davis
18017f7024 Merge remote-tracking branch 'upstream/RC-14' into RC-14-merge 2016-06-28 14:48:05 -07:00
Brad Hefta-Gaub
9e8829aa81 Merge pull request #8148 from zzmp/fix/metadata-hours-migration 
Beta Release 14.1 - fix metadata hours migrations for new users/version bumps
 2016-06-28 13:55:51 -07:00
howard-stearns
5051f2f326 Merge branch 'master' of https://github.com/highfidelity/hifi into update-invisible-reticle-only-when-triggered 2016-06-28 13:33:50 -07:00
Howard Stearns
da61100b6d Merge pull request #8150 from highfidelity/vive-ui 
merge vive-ui to master
 2016-06-28 13:31:55 -07:00
howard-stearns
c492d125e0 limit hand controller actions to recommended area 2016-06-28 13:19:03 -07:00
Anthony Thibault
abf643579a Merge pull request #8144 from howard-stearns/fix-crashing-hmd-menu-modals 
fix crash when hmd context menu triggers a modal
 2016-06-28 13:14:23 -07:00
Zach Pomerantz
c406538301 properly parse domain metadata hours 2016-06-28 12:40:25 -07:00
Zach Pomerantz
56038a97a6 add domain settings getter for descriptors, validates nested vals 2016-06-28 12:39:00 -07:00
Zach Pomerantz
c62967a57b add secs per hour 2016-06-28 12:38:00 -07:00
howard-stearns
799686f29d Only update the (invisible) cursor position from hand controllers when the 
trigger is partially squeezed.
 2016-06-28 11:36:08 -07:00