Brad Hefta-Gaub
|
99a0804429
|
Merge pull request #8086 from imgntn/activeElement
Fix some edit.js errors and log messages
|
2016-06-16 18:25:20 -07:00 |
|
Brad Hefta-Gaub
|
7d0cd38c8e
|
Merge pull request #8075 from ctrlaltdavid/20970
fix reporting of JSON export failure
|
2016-06-16 18:24:48 -07:00 |
|
Brad Hefta-Gaub
|
fd163ecc20
|
Merge pull request #8089 from ctrlaltdavid/20973
make audio device selection available without advanced menus enabled
|
2016-06-16 18:24:36 -07:00 |
|
David Rowe
|
77976281ab
|
Make audio device selection available without advanced menus enabled
|
2016-06-17 09:58:44 +12:00 |
|
Brad Hefta-Gaub
|
d7cd82a24e
|
Merge pull request #8085 from ZappoMan/fixShaders
fix v1 procedural shaders
|
2016-06-16 13:06:15 -07:00 |
|
James B. Pollack
|
96d6cb12ac
|
supress some messages and errors
|
2016-06-16 12:27:03 -07:00 |
|
Brad Hefta-Gaub
|
5dae20975a
|
fix v1 procedural shaders
|
2016-06-16 09:18:44 -07:00 |
|
David Rowe
|
775656eb1d
|
Delete comment
|
2016-06-16 08:48:30 +12:00 |
|
Clément Brisset
|
6ed972257f
|
Merge pull request #8077 from birarda/api-recheck-on-fail
clear domain connection refusals on hard reset only
|
2016-06-15 10:24:39 -07:00 |
|
Stephen Birarda
|
59912012c6
|
clear domain connection refusals on hard reset, not soft
|
2016-06-15 09:48:53 -07:00 |
|
David Rowe
|
657f8fdad5
|
Fix reporting of JSON export failure
|
2016-06-15 14:12:49 +12:00 |
|
Bradley Austin Davis
|
3525498550
|
Merge branch 'rc12-merge'
|
2016-06-14 17:44:24 -07:00 |
|
Bradley Austin Davis
|
21adf4fe68
|
Merge branch 'master' into rc12-merge
|
2016-06-14 17:42:22 -07:00 |
|
Bradley Austin Davis
|
d778ec96d7
|
Revert "fix shapes to property polymorph and persist"
This reverts commit 3bee4b1f9f.
|
2016-06-14 17:42:13 -07:00 |
|
Bradley Austin Davis
|
747b33f756
|
Revert "additional revert related change"
This reverts commit 8586e91a3b.
|
2016-06-14 17:42:01 -07:00 |
|
Bradley Austin Davis
|
f6994f2783
|
Revert "Revert "refresh API info during re-connect - case 570""
This reverts commit 1624146fc2.
|
2016-06-14 17:41:53 -07:00 |
|
Chris Collins
|
55330f2205
|
Merge pull request #8057 from jherico/settings
Fixing issues with unclosed groups in settings persistence
|
2016-06-14 14:34:14 -07:00 |
|
Chris Collins
|
0236af8bcd
|
Merge pull request #8067 from birarda/api-recheck-on-fail
only signal once on a protocol mismatch with DS
|
2016-06-14 12:53:21 -07:00 |
|
Bradley Austin Davis
|
b1c472e82b
|
Fixing settings, even in release builds
|
2016-06-14 12:16:40 -07:00 |
|
Brad Hefta-Gaub
|
c614b10694
|
Merge pull request #8063 from SamGondelman/viveGripFix
Reset Vive grip buttons to 0 if not pressed
|
2016-06-14 11:47:49 -07:00 |
|
Brad Hefta-Gaub
|
1c391e626f
|
Merge pull request #8054 from ctrlaltdavid/20957
fix model export continued
|
2016-06-14 10:57:25 -07:00 |
|
Brad Hefta-Gaub
|
b1de94f39d
|
Merge pull request #8061 from imgntn/entityaddtypeserrors
More verbose messaging about incorrect case in entity types
|
2016-06-14 10:56:58 -07:00 |
|
Stephen Birarda
|
2163f9b5f3
|
signal once for domain protocol mismatch, case 918
|
2016-06-14 10:43:45 -07:00 |
|
Bradley Austin Davis
|
d52a1fe6f9
|
Fix persistence for global scope settings handles, clean up invalid variants in settings
|
2016-06-14 09:49:38 -07:00 |
|
Bradley Austin Davis
|
34c8d257d2
|
Fixing issues with unclosed groups in settings persistence
|
2016-06-14 09:49:38 -07:00 |
|
Brad Davis
|
196ab401e5
|
Merge pull request #8046 from SamGondelman/proceduralRaymarch
Exposed orientation and eye position to procedural entity shaders
|
2016-06-14 09:48:07 -07:00 |
|
Brad Hefta-Gaub
|
19352a12ea
|
Merge pull request #8056 from imgntn/editbugztab
Fix tabbing behavior in edit.js
|
2016-06-14 09:14:10 -07:00 |
|
Brad Hefta-Gaub
|
7da29daf9d
|
Merge pull request #8036 from ctrlaltdavid/20955
Fix image2d overlay color property
|
2016-06-13 19:21:59 -07:00 |
|
SamGondelman
|
df9fd6c7fc
|
reset vive grip buttons to 0 if not pressed
|
2016-06-13 18:35:39 -07:00 |
|
James B. Pollack
|
1306417c8e
|
more verbose messaging about incorrect entity types
|
2016-06-13 17:48:58 -07:00 |
|
Andrew Meadows
|
1a37653364
|
Merge pull request #8039 from sethalves/quiet-es-sim-spam
fix problem related to server-side extrapolation of children of avatars
|
2016-06-13 15:37:33 -07:00 |
|
Seth Alves
|
f8f62a4ff1
|
remove unused function
|
2016-06-13 15:10:52 -07:00 |
|
Seth Alves
|
eba518cb65
|
try to make code that converts bullet-calculated values to parent-frame values more effecient
|
2016-06-13 14:26:41 -07:00 |
|
Seth Alves
|
998a5594c0
|
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
|
2016-06-13 13:41:32 -07:00 |
|
Chris Collins
|
b14f9cd312
|
Merge pull request #8041 from sethalves/fix-avatar-entity-locking
Fix avatar entity locking
|
2016-06-13 13:10:32 -07:00 |
|
James B. Pollack
|
188590a891
|
cleanup
|
2016-06-13 13:08:22 -07:00 |
|
James B. Pollack
|
567118f4a9
|
cleanup
|
2016-06-13 13:08:12 -07:00 |
|
James B. Pollack
|
342fc07d29
|
select active element in edit.js after change
|
2016-06-13 13:06:56 -07:00 |
|
David Rowe
|
5553c9f87f
|
Code review
|
2016-06-14 07:46:41 +12:00 |
|
Seth Alves
|
52245f25f2
|
rework code that transforms global _server* values into parent-frame values
|
2016-06-13 11:48:45 -07:00 |
|
Seth Alves
|
99bfc76dd3
|
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
|
2016-06-13 11:14:26 -07:00 |
|
Seth Alves
|
fbd765ab41
|
Merge branch 'quiet-es-sim-spam' of github.com:sethalves/hifi into quiet-es-sim-spam
|
2016-06-13 11:14:17 -07:00 |
|
Brad Hefta-Gaub
|
fc1a154a6a
|
Merge pull request #8053 from audreyt/patch-1
Update BUILD_OSX.md
|
2016-06-13 07:47:30 -07:00 |
|
David Rowe
|
098432152d
|
Merge branch 'master' into 20957
|
2016-06-13 16:16:12 +12:00 |
|
David Rowe
|
f7578f084f
|
Fix buttons on warning message box when can't export a file
|
2016-06-13 15:21:59 +12:00 |
|
David Rowe
|
546699da03
|
When choosing a directory default selection to default directory
|
2016-06-13 15:06:10 +12:00 |
|
David Rowe
|
d74f1c8b5d
|
Fix default directory for Settings directory preference fields
|
2016-06-13 14:51:14 +12:00 |
|
Brad Hefta-Gaub
|
92909af52c
|
Merge pull request #8044 from ctrlaltdavid/20957
fix model export
|
2016-06-12 19:43:51 -07:00 |
|
Brad Hefta-Gaub
|
da28b0f3e7
|
Merge pull request #8048 from ctrlaltdavid/20961
fix import of invalid JSON file failing silently
|
2016-06-12 19:42:53 -07:00 |
|
Brad Hefta-Gaub
|
a9729830b0
|
Merge pull request #8052 from sethalves/fix-permissions-grid-1
fix some permissions-grid bugs
|
2016-06-12 17:20:50 -07:00 |
|