Commit graph

53315 commits

Author SHA1 Message Date
David Rowe
d60d4d0755 Auto-play recording at start-up 2017-04-09 15:52:56 +12:00
David Rowe
adabcab888 Add invisible entity to persist playback of recording 2017-04-08 16:24:58 +12:00
David Rowe
d1e49cd926 Add and stub out stop, autoplay, and persistence to AC script 2017-04-08 14:57:37 +12:00
David Rowe
ef4f3368f9 Play recording just made from original start position and orientation 2017-04-08 11:06:34 +12:00
David Rowe
ebe3561582 Merge branch 'master' into 21249 2017-04-08 10:46:16 +12:00
Howard Stearns
57d8ec883e Merge pull request #10163 from davidkelly/dk/3938
updated availability combo dialog
2017-04-07 13:57:17 -07:00
Seth Alves
03065ee6c8 Merge pull request #9938 from kunalgosar/jsRenderBug
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
David Kelly
870e003311 Scattered X glyphs around the letterbox and combo dialogs 2017-04-07 11:12:54 -07:00
David Kelly
ee9bc0bfa4 updated availability combo dialog 2017-04-07 10:25:37 -07:00
Andrew Meadows
b9c7d6351f Merge pull request #10135 from samcake/ambient
Rename render::PendingChanges to render::Transaction
2017-04-07 09:54:10 -07:00
Brad Davis
91f8bf45b8 Merge pull request #10159 from highfidelity/revert-10158-revert-10157-brown
Fixing the rendering bug triggered with Nvidia driver 381.65
2017-04-07 09:53:41 -07:00
David Kelly
12b5b91754 Merge pull request #10161 from howard-stearns/fix-pal-connections-help
fix pal connections-tab help trigger
2017-04-07 09:34:11 -07:00
Howard Stearns
468cc7f19b Merge pull request #10150 from davidkelly/dk/3930
friends checkbox speedup
2017-04-07 09:27:39 -07:00
David Kelly
d363bde0d4 Merge pull request #10155 from howard-stearns/make-connection-message-not-logged-in
make connection messaging when not logged in
2017-04-07 09:12:24 -07:00
Howard Stearns
03013ecb3a fix pal connections-tab help trigger 2017-04-07 07:30:36 -07:00
Howard Stearns
5d341778c5 fix notification word wrapping 2017-04-07 07:08:19 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
700c319953 Merge pull request #10158 from highfidelity/revert-10157-brown
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
2017-04-07 02:03:51 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
samcake
ac9b181786 Merge pull request #10157 from samcake/brown 2017-04-07 02:01:05 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
David Rowe
1ef5f048a3 Inform user if recording failed to start 2017-04-07 18:53:20 +12:00
David Rowe
ce898ae42a Play recording 2017-04-07 18:38:55 +12:00
David Rowe
75d970f5d5 Remove unresponsive players from list 2017-04-07 17:30:03 +12:00
David Rowe
81d8d238de Refactor log and error messages 2017-04-07 17:13:23 +12:00
David Rowe
5e55233934 Assignment client player script receives "play" command from recorder 2017-04-07 17:04:24 +12:00
David Rowe
506a414762 Lint fix 2017-04-07 14:06:16 +12:00
David Rowe
858e9650a3 Encapsulate recording methods in Recorder object 2017-04-07 14:03:08 +12:00
samcake
aae7349c40 trying to understand the bug with nvidia new driver 2017-04-06 18:31:03 -07:00
howard-stearns
b089fd03b8 make connection messaging when not logged in 2017-04-06 16:48:11 -07:00
samcake
0254c3372f Merge pull request #10143 from jherico/ktx_crash
Don't crash if KTX file is invalid
2017-04-06 16:28:19 -07:00
David Kelly
d64a803451 no need to set checked 2017-04-06 16:08:48 -07:00
David Rowe
68901c8af5 Merge branch 'master' into 21249 2017-04-07 11:04:43 +12:00
David Rowe
49907970fb Fix countdown showing if restart with dialog open and recording enabled 2017-04-07 11:01:11 +12:00
Chris Collins
4e9e3cccea Merge pull request #10116 from birarda/bug/rel-ext-textures
fix relative/absolute path handling for external FBX textures
2017-04-06 15:58:02 -07:00
Seth Alves
ec2ebc00c0 Merge pull request #10145 from hyperlogic/feature/openvr-1.0.6
OpenVR: upgrade to version 1.0.6, for better generic tracker support
2017-04-06 15:53:49 -07:00
David Rowe
f164fe7532 Improve error handling 2017-04-07 10:46:40 +12:00
David Kelly
a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column
fix sorting by pal connections-tab friends column
2017-04-06 15:43:21 -07:00
David Rowe
0400e5a1f2 Report error status in setMapping() callback 2017-04-07 10:31:52 +12:00
Seth Alves
b1a015affd Merge pull request #10117 from huffman/fix/unlock-propagation
Fix entity "unlock" edits not being propagated to clients
2017-04-06 15:28:05 -07:00
Howard Stearns
67f2cc3567 Merge pull request #10148 from davidkelly/dk/3936
pal selection changes
2017-04-06 14:58:46 -07:00
Clément Brisset
da27cd1c8b Merge pull request #10149 from mittens/patch-1
Link to coding standards.
2017-04-06 14:46:45 -07:00
howard-stearns
9577102c22 fix sorting by pal connections-tab friends column 2017-04-06 14:45:08 -07:00
David Kelly
331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936 2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes
Master qml bugfixes
2017-04-06 14:22:06 -07:00
David Kelly
726395ac3e friends checkbox speedup 2017-04-06 14:07:07 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935
Now you can forget connections
2017-04-06 14:05:25 -07:00
Chris Collins
494c8d868e Merge pull request #10126 from samcake/brown
Fixing the rendering of Image3D overlay when drawn in the scene
2017-04-06 13:40:09 -07:00
Anthony J. Thibault
4e49774d0e Moved device class check into handleTrackedObject 2017-04-06 13:20:00 -07:00