Brad Davis
bbefafcb07
Break up preferences dialogs
2016-01-23 23:11:41 -08:00
Brad Hefta-Gaub
e3f861b20a
Merge pull request #6918 from jherico/running-scripts-filter
...
Several Small QML fixes
2016-01-23 22:36:36 -08:00
Brad Hefta-Gaub
7258bd9e3f
Merge pull request #6915 from samcake/hdr
...
Fixing the Anitialising breaking the transparent rendering
2016-01-23 22:30:04 -08:00
Brad Davis
a843331626
Still trying to kill OSX warning
2016-01-23 22:07:00 -08:00
Brad Davis
208d7c3cfc
Killing the old preferences dialog
2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0
Button prefs and conditionally enabled prefs
2016-01-22 19:06:30 -08:00
samcake
483d20d7a3
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-22 18:31:30 -08:00
samcake
9f87089c05
Fixing the Anitialising breaking the transparent rendering
2016-01-22 18:25:26 -08:00
Brad Davis
858bbbf987
Adding OffscreenUI API for QInputDialog functionality
2016-01-22 17:31:03 -08:00
Brad Davis
27fdb523cb
Add directory & avatar browsing preferences
2016-01-22 17:30:10 -08:00
Brad Davis
c7186590ea
Support for directory browsing
2016-01-22 17:30:09 -08:00
Brad Davis
2026821d9e
Moving preferences to dependency mananger
2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506
First pass on preferences dialog
...
Conflicts:
tests/ui/qmlscratch.pro
2016-01-22 17:30:07 -08:00
Brad Hefta-Gaub
0c64d45c18
Merge pull request #6909 from hyperlogic/tony/fly
...
MyAvatar: fly animation
2016-01-22 17:04:53 -08:00
samcake
338342cdec
Merge pull request #6859 from zzmp/flag/shadows
...
Add shadows behind a render-menu flag
2016-01-22 16:28:17 -08:00
Brad Hefta-Gaub
74c37104f6
Merge pull request #6905 from jherico/focus_fix
...
Fix initial keyboard focus problems
2016-01-22 15:19:57 -08:00
Andrew Meadows
86162094c1
Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation
...
MyAvatar: Recenter when the head turns away from the hips
2016-01-22 14:07:40 -08:00
Andrew Meadows
200676ac68
Merge pull request #6896 from AndrewMeadows/another-crash-fix
...
fix crash when deleting entities quickly
2016-01-22 14:04:46 -08:00
Anthony J. Thibault
7af20e90c8
Hooked up fly animation to json and Rig
2016-01-22 13:47:09 -08:00
Brad Davis
89b8eb2efa
Fix initial keyboard focus problems
2016-01-22 13:41:06 -08:00
Anthony J. Thibault
8bfa80d5fc
Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation
2016-01-22 13:37:43 -08:00
Brad Hefta-Gaub
9ec2cf1ab9
Merge pull request #6902 from sethalves/no-nan
...
check values in location updates for NaN before using them
2016-01-22 13:34:15 -08:00
Anthony J. Thibault
61b760038a
Address feedback from code review
2016-01-22 11:54:28 -08:00
Seth Alves
2633cb1f27
rename NaN functions for vec3 and quat
2016-01-22 11:54:24 -08:00
samcake
f98f8d5bbb
Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"
2016-01-22 11:51:02 -08:00
Seth Alves
7a3401a8d7
Merge pull request #6867 from AndrewMeadows/collision-group-prep
...
cleanup in preparation for smarter collision grouping
2016-01-22 11:45:42 -08:00
Seth Alves
673182c091
formatting
2016-01-22 11:22:02 -08:00
Seth Alves
a9cf836cb0
added isVec3NaN and isQuatNaN functions
2016-01-22 11:13:55 -08:00
Seth Alves
6294939095
missed one
2016-01-22 10:37:11 -08:00
Seth Alves
6b15beb88a
use isNaN rather than a self-comparison
2016-01-22 10:36:21 -08:00
Zach Pomerantz
b62fc50557
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:32:54 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Zach Pomerantz
dee8e0ba9d
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:03:06 -08:00
samcake
24d1f113f8
Fixing the warning maybe
2016-01-22 09:44:32 -08:00
Seth Alves
451464cb47
check values in location updates for NaN before using them
2016-01-22 09:41:46 -08:00
samcake
6d89f6d7b0
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-01-22 09:30:31 -08:00
samcake
6bcd7f10ad
Try the constant gaussian values which are more stable on mac...
2016-01-21 23:54:51 -08:00
Brad Hefta-Gaub
58b7708315
Merge pull request #6899 from birarda/fix-go-home
...
repairs to index path behaviour
2016-01-21 21:29:24 -08:00
Brad Hefta-Gaub
b41301d226
Merge pull request #6879 from sethalves/fix-aa-cube-bug
...
fix query-cube vs lod bug
2016-01-21 21:02:42 -08:00
samcake
b7f14789af
Refining the ao effect on the blur side
2016-01-21 19:02:32 -08:00
samcake
7df3e9f306
Merge pull request #6876 from ericrius1/droplets
...
Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque
2016-01-21 18:32:43 -08:00
Stephen Birarda
40f2afb284
Merge pull request #6898 from Atlante45/fix/ds-shutdown-debug
...
Postpone logging of the shutdown reason
2016-01-21 18:31:19 -08:00
Stephen Birarda
9061e33a1f
send path query once connected to domain
2016-01-21 18:24:17 -08:00
Stephen Birarda
fac30bb0ae
use the index path as default with network address
2016-01-21 18:24:16 -08:00
Brad Hefta-Gaub
e1c369dc10
Merge pull request #6766 from samcake/hdr
...
Ambient Occlusion
2016-01-21 18:10:52 -08:00
Brad Hefta-Gaub
7bfe2730e8
Merge pull request #6849 from jherico/atmosphere
...
Remove old atmosphere rendering
2016-01-21 17:58:59 -08:00
Atlante45
6fd5176474
Pospone logging of the shutdown reason
...
This makes it more obvious to the log reader why the DS went
down.
2016-01-21 17:54:10 -08:00
samcake
b5aa5fcb46
more clean up
2016-01-21 17:36:53 -08:00
Anthony J. Thibault
ca8a832818
CharacterController: added hard limit to follow displacement
...
To prevent tunneling when the rigid body cannot reach it's target due to being blocked by a wall or some other obstacle.
Also, added unit tests for physics/BulletUtil rotateVector and clampLength functions.
2016-01-21 17:27:45 -08:00
Brad Hefta-Gaub
094e41c993
Merge pull request #6888 from Atlante45/fix/wifi-ping-spikes
...
Fix wifi ping spikes
2016-01-21 17:07:38 -08:00
