Commit graph

70578 commits

Author SHA1 Message Date
Brad Davis
a1a1a03bbc Fixing crash on exit, deferred debugging tool 2018-08-03 14:58:11 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Brad Davis
d6bcdcde3f Fix DISABLE_QML behavior 2018-08-03 14:58:11 -07:00
NissimHadar
5795e2492f Merge branch 'master' of https://github.com/highfidelity/hifi into exportToTestRail1 2018-08-03 14:51:23 -07:00
NissimHadar
9e8619f7be WIP - updating test results. 2018-08-03 14:50:20 -07:00
NissimHadar
37f761beeb Builds Python script that creates list of failure names 2018-08-03 14:21:10 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
2018-08-03 13:32:11 -07:00
NissimHadar
dfa461b4f6 Ready to update the run with the test results. 2018-08-03 12:57:54 -07:00
David Rowe
fdd6b7e07b Delete erroneous merge file 2018-08-04 07:29:57 +12:00
David Rowe
2270255d88 JSDoc review 2018-08-04 07:22:12 +12:00
amantley
76b182f03b added the hmd strafe to the rig code 2018-08-03 12:12:01 -07:00
Bradley Austin Davis
8e9c1e5c0a Fix out of date comment 2018-08-03 11:38:39 -07:00
NissimHadar
7ef3b27490 WIP - updating test results. 2018-08-03 11:12:18 -07:00
David Back
0565e0400c fix edit log spam with -1 hand 2018-08-03 11:08:56 -07:00
Olivier Prat
cb24046eea Reorder some functions 2018-08-03 18:51:31 +02:00
Sam Gateau
2013f1bd33
Merge pull request #13732 from AndrewMeadows/other-avatar-physics
reduce physics simulation cost of other-avatars
2018-08-03 09:33:59 -07:00
Sam Gateau
da252a70c1 Same as https://github.com/highfidelity/hifi/pull/13747 2018-08-03 09:22:29 -07:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
NissimHadar
2a6bc8bd3e WIP - add results to runs. 2018-08-02 20:10:25 -07:00
NissimHadar
66391c2d64 WIP - add results to runs. 2018-08-02 19:07:16 -07:00
NissimHadar
c8eca5e308 Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail1 2018-08-02 16:42:06 -07:00
NissimHadar
11b4beda5e Can create a test run. 2018-08-02 15:37:44 -07:00
David Rowe
32e3bb0e1d Merge branch 'master' into M08513-a
# Conflicts:
#	libraries/audio/src/SoundCache.h
2018-08-03 10:29:32 +12:00
amantley
096cb0db81 working on strafe left and right transitions 2018-08-02 13:32:06 -07:00
NissimHadar
8248691b7d Can create a test run. 2018-08-02 13:03:24 -07:00
SamGondelman
2f358f3380 fix shapes always drawing as transparents 2018-08-02 12:16:01 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
Zach Fox
41b804a5dd
Merge pull request #13738 from zfox23/MS17215_newEarlyFetchLogic
Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present
2018-08-02 09:39:37 -07:00
Olivier Prat
0c8d8e985f Merge branch 'master' of http://github.com/highfidelity/hifi into shadow 2018-08-02 17:14:31 +02:00
NissimHadar
a66bef1218 Merge branch 'exportToTestRail' of github.com:NissimHadar/hifi into exportToTestRail 2018-08-02 08:03:13 -07:00
NissimHadar
d56a8d9a66 Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail 2018-08-02 08:02:11 -07:00
amantley
6b2c67e5bd more doug support 2018-08-01 18:22:51 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
Enable physics after ES indicates all nearby entities received
2018-08-01 18:15:00 -07:00
Andrew Meadows
e336c9276d first set shape THEN use it 2018-08-01 17:39:57 -07:00
Simon Walton
6f1487bbf8 Don't explicitly use data method of shared node pointer 2018-08-01 17:11:26 -07:00
NissimHadar
69660cae81 Can populate Test Section combo. 2018-08-01 17:07:53 -07:00
Simon Walton
d7a49ee594
Merge pull request #13622 from SimonWalton-HiFi/ac-monitor-resources
Raise POSIX descriptor-limit in AC Monitor if necessary
2018-08-01 17:07:33 -07:00
David Back
c1e1be73a4 Merge branch 'cloneChildrenFix' of github.com:dback2/hifi into cloneChildrenFix 2018-08-01 16:02:40 -07:00
David Back
0b9e520b53 fix grab cloning parented entitiy 2018-08-01 16:00:25 -07:00
Zach Fox
67528cb646 Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present 2018-08-01 15:49:53 -07:00
NissimHadar
9957fc9474 Can create list of highest level sections. 2018-08-01 15:13:44 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00
Zach Fox
7905c91289
Merge pull request #13727 from zfox23/MS17168_filterWhenViewing
Fix MS17168: Filter My Purchases when clicking View link on Confirmation
2018-08-01 14:23:26 -07:00
NissimHadar
64f651a266 Merge branch 'master' of https://github.com/highfidelity/hifi into exportToTestRail 2018-08-01 13:49:20 -07:00
Clement
9c89aa9f90 Make sure the stack test interface gets cleaned up 2018-08-01 13:29:07 -07:00
John Conklin II
e321ee0cb6
Merge pull request #13721 from misslivirose/tutorial-rc-70
Update bubble context for RC 71
2018-08-01 13:14:24 -07:00
John Conklin II
f02e91806c
Merge pull request #13686 from huffman/fix/undo-create-entity
Fix added entities not being undoable in Create
2018-08-01 13:11:17 -07:00
John Conklin II
c444bb11ba
Merge pull request #13668 from ElderOrb/base_bluebuttons_on_uit
Avatarapp: base 'SquareLabel' on button from Uit
2018-08-01 13:10:33 -07:00
David Back
cdbf75666f new line 2018-08-01 12:46:49 -07:00