Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 07:49:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51884 commits 76 branches 59 tags 1.2 GiB
Commit graph

51884 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
b111bcb826 Merge pull request #9818 from ctrlaltdavid/21205 
Remove Developer > Network > Bandwith Details dialog
 2017-03-06 22:02:33 -08:00
Brad Hefta-Gaub
87934ee82d fix bugs in some meshes 2017-03-06 21:50:32 -08:00
Atlante45
ff9d6d657c Remove weighted offset, special case downward pressure 2017-03-06 19:41:08 -08:00
David Rowe
51739f2f99 Remove Developer > Network > Bandwith Details dialog 2017-03-07 15:02:26 +13:00
Brad Davis
f9dcfa54aa Add debug/release builds to oculus lib 2017-03-06 16:08:21 -08:00
Andrew Meadows
d749c0c8be use fabsf() rather than fabs() 2017-03-06 15:50:32 -08:00
Andrew Meadows
10b3e7fc67 sphere shapeType for models means 'sphere' 2017-03-06 15:14:51 -08:00
David Kelly
3d39aae35b minor tweak - just in case 2017-03-06 15:52:33 -07:00
David Kelly
f23f882595 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377 2017-03-06 15:26:21 -07:00
David Kelly
e14a1ad1af minor cleanup 2017-03-06 15:26:03 -07:00
David Kelly
db036d997c first pass 2017-03-06 15:18:35 -07:00
Dante Ruiz
fc65723d68 corrected removing duplicate devices 2017-03-06 22:14:20 +00:00
Zach Fox
5223f872c1 Merge pull request #9753 from zfox23/FB_3234_TakeTwo 
Optimize AvatarMixer with respect to Identity and Avatar Data
 2017-03-06 13:37:29 -08:00
Andrew Meadows
1b8f6b9835 Merge pull request #9784 from samcake/blue 
Fixing Emissive on overlay for models (opaque and transparent)
 2017-03-06 13:24:00 -08:00
Brad Hefta-Gaub
f27475613f Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet 2017-03-06 12:53:59 -08:00
samcake
21f36d7212 removing comments and restoring the correct behavior for Pal.js 2017-03-06 12:41:00 -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
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
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
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
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
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