Atlante45
|
96258a795a
|
Initial Steamworks integration
|
2016-06-14 16:29:50 -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 |
|
唐鳳
|
1ec145298f
|
Update BUILD_OSX.md
Qt5.6 removed QTWebKit which hifi depends on. Before we complete the migration listed in https://wiki.qt.io/Porting_from_QtWebKit_to_QtWebEngine the build instruction need to tap into qt55 in historical brew versions.
|
2016-06-12 21:07:49 +08:00 |
|
Seth Alves
|
924c949af5
|
permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things
|
2016-06-11 15:16:45 -07:00 |
|
Seth Alves
|
e79767a121
|
authed username wasn't being saved in permissions, so that interface would get briefly disconnected when their permissions changed.
|
2016-06-11 15:16:02 -07:00 |
|
David Rowe
|
58f89c88a2
|
Remember last directory used for Window.browse() and Window.save()
Use last directory if not specified in method call. Default to desktop.
|
2016-06-11 16:45:17 +12:00 |
|
Brad Hefta-Gaub
|
27c6df660c
|
Merge pull request #8009 from sethalves/permissions-grid
Permissions grid
|
2016-06-10 20:39:26 -07:00 |
|
Seth Alves
|
4c45d081cd
|
merge from upstream
|
2016-06-10 19:57:46 -07:00 |
|
SamGondelman
|
8a682450a9
|
still trying to fix cmake errors
|
2016-06-10 17:01:22 -07:00 |
|
Chris Collins
|
006eb8fe64
|
Merge pull request #8031 from birarda/api-recheck-on-fail
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
|
2016-06-10 15:26:42 -07:00 |
|
SamGondelman
|
7b21d71180
|
try to fix cmake error
|
2016-06-10 14:09:04 -07:00 |
|
SamGondelman
|
53435fc730
|
removed extra argument
|
2016-06-10 14:04:33 -07:00 |
|
SamGondelman
|
f32e29ac2d
|
small changes
|
2016-06-10 13:46:02 -07:00 |
|
SamGondelman
|
da98ee0916
|
reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition
|
2016-06-10 13:42:19 -07:00 |
|
Seth Alves
|
41c399897a
|
remove some debug prints
|
2016-06-10 12:08:13 -07:00 |
|
Seth Alves
|
4a49ade21b
|
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
|
2016-06-10 11:50:06 -07:00 |
|
Seth Alves
|
96bf66d14a
|
Merge branch 'master' of github.com:highfidelity/hifi into quiet-es-sim-spam
|
2016-06-10 11:49:45 -07:00 |
|