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
49707 commits 71 branches 56 tags 1.2 GiB
Commit graph

49707 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
f900629cdb Merge pull request #9390 from sethalves/load-models-in-keyhole 
fix physics not starting up when a model is close behind
 2017-01-16 18:06:23 -08:00
samcake
0b9b5d595c Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-16 17:48:16 -08:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -08:00
humbletim
827aa68d3f cleanup pass 2017-01-16 19:50:25 -05:00
Chris Collins
1df13d6a56 Merge pull request #9399 from howard-stearns/hand-controll-grab-update 
handControllerGrab update loop change
 2017-01-16 16:41:02 -08:00
humbletim
c9fd650e70 update to support click/far-click toggling and userData.disabled setting 2017-01-16 19:37:31 -05:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
Chris Collins
5f34ad3596 Merge pull request #9400 from AndrewMeadows/fix-cauterization-hack 
don't render non-skinned meshes on head when in first person
 2017-01-16 15:47:52 -08:00
Zach Fox
1e8effdcc4 Packet verison bump 2017-01-16 15:28:53 -08:00
Zach Fox
e72c25736e Cleanup 2017-01-16 15:21:18 -08:00
Andrew Meadows
fd28457807 fix cauterization hack 2017-01-16 15:13:28 -08:00
howard-stearns
0a3236dcc9 handControllerGrab update loop change 2017-01-16 14:54:32 -08:00
Zach Fox
e98a40c30e Does this work? 2017-01-16 14:43:30 -08:00
Zach Fox
3b56f46206 Style changes 2017-01-16 13:18:24 -08:00
Zach Fox
079e5c4296 Merge pull request #9397 from zfox23/FB-2814 
Fix FB-2814 "Users.requestUsernameFromID() doesn't work for yourself"
 2017-01-16 12:54:28 -08:00
howard-stearns
09a57efaf3 checkpoint 2017-01-16 12:47:26 -08:00
Zach Fox
e22c1ac30e Fix the bug 2017-01-16 11:48:51 -08:00
David Kelly
95aad3140d Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal 
Manage audio interval timer in PAL
 2017-01-16 11:29:05 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement 
handle OVR Platform entitlement checks
 2017-01-16 11:16:31 -08:00
Zach Fox
2f176f50fa Another checkpoint 2017-01-16 10:44:54 -08:00
Zach Fox
6e4a4da92a Checkpoint 2017-01-16 10:42:29 -08:00
Zach Fox
117e302b2a First pass 2017-01-16 10:39:11 -08:00
Zach Fox
d2c7342a62 Merge pull request #9352 from zfox23/PerAvatarVolume 
PAL: Per-Avatar Volume Slider; visual tweaks
 2017-01-16 10:34:31 -08:00
samcake
36ee7758cf Merge pull request #9394 from jherico/fbx_parse_fix 
Fix bug in FBX parse changes
 2017-01-16 10:27:52 -08:00
Brad Davis
67ce5040ec Fix bug in FBX parse changes 2017-01-16 10:09:47 -08:00
howard-stearns
831d01c23a Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter 2017-01-16 10:07:06 -08:00
Seth Alves
bd67715cd2 don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed 2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque 
Add opaques/skinned to forward rendering path
 2017-01-16 08:48:18 -08:00
Seth Alves
050a7e87d2 load entity models that don't yet need to be rendered but are close enough to keep physics from being enabled. 2017-01-15 17:04:51 -08:00
Brad Hefta-Gaub
98699885f4 Merge pull request #9385 from kencooke/audio-mixformat-invalid 
Fix audio failures
 2017-01-14 14:53:01 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL 
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
 2017-01-14 12:57:00 -07:00
Ken Cooke
42e13d1e97 Fix audio failures on systems that return incorrect/unsupported mixFormat 2017-01-14 10:26:13 -08:00
Zach Fox
a5343d9aa9 Final tweaks before PR! 2017-01-13 17:20:29 -08:00
howard-stearns
121d79ef36 getting there, but not yet complete 2017-01-13 16:59:51 -08:00
Zach Fox
a89868dcad Make sliders appear only when row is selected 2017-01-13 15:41:17 -08:00
Zach Fox
8343769352 NameCard improvements & user feedback 2017-01-13 15:25:07 -08:00
samcake
584feef56d Merge pull request #9371 from jherico/fbx_parse_optimizations 
Improve FBX parsing performance
 2017-01-13 13:44:54 -08:00
howard-stearns
f6446c6806 minimum entity edit filter 2017-01-13 13:18:24 -08:00
Zach Fox
a69a10b8e4 Cleanup after rebase 2017-01-13 13:15:01 -08:00
Zach Fox
a9226e303c Pull out visual changess & move them to other PR 2017-01-13 13:00:23 -08:00
Zach Fox
b0b6aeac6c Ken's feedback 2017-01-13 13:00:03 -08:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
8c3766dfe8 Fixme 2017-01-13 12:59:24 -08:00
Zach Fox
503468e49b Style changes 2017-01-13 12:59:23 -08:00
Zach Fox
dcff873cd4 Modify slider function 2017-01-13 12:57:35 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Zach Fox
71f0e02210 Merge pull request #9373 from zfox23/PAL_ScrollbarRefinement 
PAL: Scrollbar refinement & visual updates
 2017-01-12 20:41:18 -08:00
Brad Davis
29b160d685 Reduce temp qvariant creation and qvariant conversion 2017-01-12 16:17:03 -08:00