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

52173 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vladyslav Stelmakhovskyi
0a36ebc5a0 Remove non relevant changes 2017-03-06 22:11:46 +01:00
David Rowe
af4bdd5943 Port Developer > Audio > Buffers to tablet 2017-03-07 09:57:02 +13:00
Brad Hefta-Gaub
f27475613f Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-06 12:53:59 -08:00
Vladyslav Stelmakhovskyi
6d9e7de6dc Implemented AssetBrowser in Tablet view 2017-03-06 21:45:55 +01:00
samcake
21f36d7212 removing comments and restoring the correct behavior for Pal.js 2017-03-06 12:41:00 -08:00
Seth Alves
4886f1cbfc don't run stylus-on-overlay code unless the overlay is a web3d overlay 2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub
38668b6ce5 Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays 
don't automatically unhook overlays from hands unless they were grabbable overlays
 2017-03-06 12:32:18 -08:00
Thijs Wenker
6ded937b25 Merge pull request #9809 from Menithal/21201 
WL#21201 Snap-together Magnetic blocks
 2017-03-06 21:30:53 +01:00
David Rowe
09ecb12510 Merge branch 'tablet-ui-edit-js' into 21197 
# Conflicts:
#	interface/src/ui/overlays/Web3DOverlay.cpp
 2017-03-07 08:59:40 +13:00
Seth Alves
27066e89a6 Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02 remove debug print 2017-03-06 11:45:49 -08:00
Menithal
01ba44c572 Fixed print 2017-03-06 21:32:27 +02:00
ZappoMan
faba160331 more CR feedback 2017-03-06 11:10:04 -08:00
Seth Alves
08e2e421e4 Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js 2017-03-06 11:08:27 -08:00
Seth Alves
eb47db4441 Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-03-06 11:07:22 -08:00
Menithal
d50a0e33a9 CR. Run through Lint ECMAScript 5 standard 
Meaning all const are out, non-variable definitions are out, etc
 2017-03-06 21:07:16 +02:00
Seth Alves
4b02e550db Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 11:07:12 -08:00
Seth Alves
8a614bf0b3 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-03-06 11:07:05 -08:00
Andrew Meadows
6ea6477c73 Merge pull request #9683 from jherico/cache_flush 
Clear caches on domain switch
 2017-03-06 11:05:44 -08:00
howard-stearns
632cdc1b38 semicolons and whitespace per coding standard 2017-03-06 11:04:12 -08:00
ZappoMan
af97e9bdd9 CR feedback 2017-03-06 10:49:38 -08:00
Dante Ruiz
b6671d92c8 removed duplicated audio devices 2017-03-06 18:46:57 +00:00
Seth Alves
6ac576c9e6 Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays 2017-03-06 10:43:43 -08:00
Seth Alves
19a31d7630 don't automatically unhook overlays from hands unless they were grabbable overlays 2017-03-06 10:15:53 -08:00
Zach Fox
0000b8fb21 OMG I think it's actually fully working 2017-03-06 10:03:42 -08:00
Zach Fox
685bd95105 I think I'm done. Not straightforward! 2017-03-06 10:03:42 -08:00
Zach Fox
5418a7c230 Important addition before rebase 2017-03-06 10:03:42 -08:00
Zach Fox
5fa5e6e0a7 First pass at implementing Brad's simplification ideas 2017-03-06 10:03:42 -08:00
Zach Fox
fda87b3a53 Quick cleanup 2017-03-06 10:03:42 -08:00
Zach Fox
8bdbbd4b25 CR feedback 1 2017-03-06 10:03:41 -08:00
Zach Fox
718ecea404 Potential non-spammy solution using pseudo-state 2017-03-06 10:03:41 -08:00
Zach Fox
cfb8534d71 Comment 2017-03-06 10:03:41 -08:00
Zach Fox
9969d422d6 Cleanup 2017-03-06 10:03:41 -08:00
Zach Fox
4025601c2b Force send ID even when 'overBudget' 2017-03-06 10:03:41 -08:00
Zach Fox
81ce5cffcd Force-send ID packets when PAL is open 2017-03-06 10:03:41 -08:00
Zach Fox
b927472e4e Fixup after rebase 2017-03-06 10:03:41 -08:00
Zach Fox
c9c07c4269 Basically rebase and squash 2017-03-06 10:03:41 -08:00
Seth Alves
767d6e43fb Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:58:22 -08:00
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
Brad Hefta-Gaub
781e0be0e3 Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh 
preserve audio data during pal refresh
 2017-03-06 08:45:46 -08:00
Dante Ruiz
d5948079c7 Merge branch 'master' of github.com:highfidelity/hifi into menuFix 2017-03-06 16:29:37 +00:00
Dante Ruiz
ef881183c0 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-06 16:28:25 +00:00
Menithal
04d3bf0c38 Cleanup and safeguards 
- RegistrationPoint can no longer be set for magnetic blocks, will set it to
0.5 on snap.
- Simplified axis lock logic
 2017-03-06 10:55:47 +02:00
Philip Rosedale
b730342283 Merge pull request #9810 from kencooke/glm-simd-bugfix 
Fix unsafe SIMD optimizations
 2017-03-05 20:47:24 -08:00
ZappoMan
2a663cbcb1 cleanup 2017-03-05 19:28:15 -08:00
ZappoMan
87bcced409 cleanup use of triangleSet for picking 2017-03-05 19:23:55 -08:00
sam
cffd838d1d merging with master 2017-03-05 12:57:13 -08:00
ZappoMan
32add6635d checkpoint on reducing raypicking recalcs 2017-03-04 23:33:17 -08:00
Ken Cooke
818425707b update unit tests 2017-03-04 16:14:31 -08:00
Ken Cooke
a5571bd49d redo unsafe optimization 2017-03-04 16:02:39 -08:00