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

39307 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
b94c2c9b7f Introducing a cleaner filtering pipeline, normally it s good to go 2016-02-11 18:40:36 -08:00
Anthony J. Thibault
8bde897cee Application: removed unused myAvatar local variable. 2016-02-11 18:14:42 -08:00
Zach Pomerantz
232f06e175 Avoid unnecessary TaskConfig dtor 2016-02-11 17:29:18 -08:00
Anthony J. Thibault
111ed65bf8 Controller Pose values are relative to Avatar. 
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.

This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
 2016-02-11 17:18:01 -08:00
Ken Cooke
aef770fcba fix typo 2016-02-11 16:39:23 -08:00
Ken Cooke
a712222370 fix typos 2016-02-11 16:33:13 -08:00
Seth Alves
90d81bc17b Merge pull request #7091 from jherico/overlayCrash 
Prevent overlay cleanup from crashing the app
 2016-02-11 16:26:07 -08:00
Ken Cooke
8a49c4b833 use cpuid.h on both GCC and Xcode 2016-02-11 16:09:04 -08:00
James B. Pollack
2889bdd8b2 Merge pull request #7083 from ZappoMan/fixDoublePreload 
handle two corner cases where preload would get called twice
 2016-02-11 16:08:43 -08:00
Andrew Meadows
b6456889ef Merge pull request #7050 from Atlante45/fix/audio-stats 
Fix audio stats
 2016-02-11 15:56:45 -08:00
Stephen Birarda
27d338e81c make any asset path relative to assets dir 2016-02-11 15:49:13 -08:00
Stephen Birarda
8c2d69f865 use breaks in help messages for file paths 2016-02-11 15:45:35 -08:00
Stephen Birarda
8eaea8a7ff clarify asset-server migration message 2016-02-11 15:42:35 -08:00
Stephen Birarda
f117bd5867 fix check for string assets path 2016-02-11 15:38:50 -08:00
Stephen Birarda
7c0b3953e4 handle custom path in asset-server for assets 2016-02-11 15:34:43 -08:00
Stephen Birarda
f455e404e3 add an option for assets path 2016-02-11 15:19:57 -08:00
Brad Davis
e06bc26896 Prevent overlay cleanup from crashing the app 2016-02-11 15:17:58 -08:00
Stephen Birarda
0f4467c582 cleanup exit codes for queued DS exit 2016-02-11 15:17:34 -08:00
Ken Cooke
c4b09c3603 not supported by Clang 2016-02-11 15:15:50 -08:00
Stephen Birarda
aaf8e60de3 delay critical quit messages until just prior to quit 2016-02-11 15:11:21 -08:00
Seth Alves
89b85f3a78 Merge pull request #7087 from AndrewMeadows/crash-fix 
yet another attempt to avoid physics crashes
 2016-02-11 14:58:57 -08:00
Brad Hefta-Gaub
26ab1bdac4 move back to unordered_set so that OctreeElementBag will handle uniqueness 2016-02-11 14:50:18 -08:00
samcake
898cfbc043 cleaning a if into an assert 2016-02-11 14:41:37 -08:00
Stephen Birarda
a6ba8dd8e5 fix null STUN server socket check in LNL 2016-02-11 14:14:16 -08:00
Stephen Birarda
a089c43fdc don't send ice heartbeat with no ice-server socket 2016-02-11 14:07:05 -08:00
Andrew Meadows
2b91a31919 check for nullptr to avoid crashes 2016-02-11 13:53:01 -08:00
samcake
dedfee3acc Fixing a terrible bug! 2016-02-11 13:43:43 -08:00
Stephen Birarda
3dbb444a65 Merge pull request #7068 from huffman/server-console-icons 
Update server console tray icons to include status
 2016-02-11 13:28:47 -08:00
howard-stearns
7c4e31687c simpler/better/more reliable (peek) 2016-02-11 13:27:56 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
Brad Hefta-Gaub
894c75f8fc Merge pull request #7066 from zzmp/fix/circle3d-radii 
Add radius as property to circle3d
 2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub
d14b9ab9b6 Merge pull request #7065 from zzmp/fix/circle3d-click 
Fix circle3d FindRayIntersection
 2016-02-11 13:07:00 -08:00
howard-stearns
0d8404e7e8 interact more safely with mappings 2016-02-11 13:05:47 -08:00
Chris Collins
ca15638463 Merge pull request #7080 from ZappoMan/fixPersistMono 
add support for persisting the mono preview mode option
 2016-02-11 13:03:49 -08:00
Chris Collins
38ba852c2e Merge pull request #7075 from Atlante45/fix/add-to-scene 
Fix "Add to scene" option while dropping model
 2016-02-11 13:02:36 -08:00
Ken Cooke
27494e54c5 use the correct macro for detecting GCC 2016-02-11 12:58:23 -08:00
Ryan Huffman
6d55c5223c Fix osx stopping icon 2016-02-11 12:16:11 -08:00
howard-stearns
93d72833bf Merge branch 'master' of https://github.com/highfidelity/hifi into clear-away-on-buttons 2016-02-11 12:10:53 -08:00
Ryan Huffman
76c9e298f5 Update tray icon images 2016-02-11 11:54:29 -08:00
Ryan Huffman
c4c1fdc6db Fix server console not shutting down with new icons 2016-02-11 10:32:26 -08:00
Zach Pomerantz
d0f3ad75b8 Nest Persistent in Config to compile on nix 2016-02-11 10:27:32 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5 Merge pull request #7077 from sethalves/clean-up-grab-signaling 
Clean up grab signaling + various fixes
 2016-02-11 10:20:56 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
Stephen Birarda
62e842bf2b Merge pull request #7052 from huffman/bugsplat 
BugSplat integration
 2016-02-11 10:10:44 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
355b8ee40d THursday morning the frustum culling seems broken in one particular angle 2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2 Add persistent render engine configuration file 2016-02-11 10:00:44 -08:00
Zach Pomerantz
66e1d9668c Add ComboBox preference 2016-02-11 10:00:44 -08:00
Zach Pomerantz
5eeaa9a33e Move graphics settings to dedicated dialog 2016-02-11 10:00:44 -08:00