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

39330 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Pomerantz
d21f9d555a Update NetworkMaterial maps when changing textures 2016-02-12 12:37:07 -08:00
Brad Davis
28f3e8ba9c Don't leave user data pointers around in objects after deletion 2016-02-12 12:07:23 -08:00
Anthony Thibault
7d400623be Merge pull request #7096 from howard-stearns/fix-lookAt 
Fix Quat.lookAt
 2016-02-12 12:01:19 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
samcake
c4faa091a1 Fixing initialization syntax 2016-02-12 11:31:21 -08:00
Andrew Meadows
1e29faf365 Merge pull request #7090 from ZappoMan/fixOctreeBag 
move back to unordered_set so that OctreeElementBag will handle uniqueness
 2016-02-12 11:22:46 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
samcake
ef92a52777 Merge pull request #7051 from zzmp/feat/graphics-dialog 
Move graphics settings to a new dialog
 2016-02-12 10:46:00 -08:00
Howard Stearns
80baa5ce18 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-lookAt 2016-02-12 10:39:31 -08:00
Howard Stearns
874f74de04 Fix Quat.lookAt 2016-02-12 10:38:50 -08:00
samcake
2d33bb83e1 Remove a dead comment 2016-02-12 10:30:44 -08:00
samcake
c248732bc7 Getting the array initialization right ? 2016-02-12 10:27:08 -08:00
samcake
40c283cba2 Fixing some warnings 2016-02-12 10:21:28 -08:00
samcake
40455af7fc LEss warning 2016-02-12 10:16:20 -08:00
samcake
5acfd5ff53 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 09:59:48 -08:00
samcake
171acb883f Fixing compilation issue on mac and linux 2016-02-12 09:59:33 -08:00
Andrew Meadows
31f9da2dcb Merge pull request #7094 from sethalves/fix-attachment-manager 
fix some things I broke yesterday
 2016-02-12 09:40:52 -08:00
Seth Alves
5659589ea1 Merge pull request #7088 from birarda/offline-domain 
fix STUN failover for offline machines
 2016-02-12 09:16:20 -08:00
Zach Pomerantz
d516e9da78 Only run AO in DEFAULT_RENDER_MODE 2016-02-12 09:01:54 -08:00
Seth Alves
94bc1764a8 fix auto-updating of adjustments to worn or equipped entities 2016-02-12 06:58:44 -08:00
Seth Alves
ca5525cc3f if an entity already was near-picked, don't do a distance-to-center check on it. 2016-02-12 06:58:14 -08:00
Brad Hefta-Gaub
477dfe1b10 use std::unordered_map<> instead of std::unordered_set<> 2016-02-11 20:42:42 -08:00
samcake
f12030c1a4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 18:41:02 -08:00
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