Seth Alves
|
507dfa5ec3
|
more code review response
|
2018-03-02 11:35:34 -08:00 |
|
Seth Alves
|
bdd926f89e
|
cleanups
|
2018-03-02 10:38:35 -08:00 |
|
Seth Alves
|
45157a16f2
|
merge from upstream
|
2018-03-02 09:57:27 -08:00 |
|
Seth Alves
|
82bfd25d8b
|
fix placename in title-bar, fix domain-spawning-point
|
2018-03-02 09:54:54 -08:00 |
|
Sam Gateau
|
88ecfe7895
|
Merge pull request #12464 from jherico/android_dev
Android Master
|
2018-03-01 17:22:34 -08:00 |
|
Brad Hefta-Gaub
|
d24cea2f07
|
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers
if a node can't change locks, don't allow it to create an already-locked entity
|
2018-03-01 14:56:29 -08:00 |
|
Brad Hefta-Gaub
|
2bc37d37bd
|
Merge pull request #12512 from birarda/update-brace-expansion-for-cve
update fs-extra for dependency update of brace-expansion
|
2018-03-01 14:53:02 -08:00 |
|
Seth Alves
|
9ee65ab474
|
don't use clipboard when loading serverless domains
|
2018-03-01 13:31:43 -08:00 |
|
Seth Alves
|
b18993e09f
|
put serverless domain into history if going to a different serverless domain
|
2018-03-01 12:19:42 -08:00 |
|
Seth Alves
|
2d374583b4
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-01 11:07:50 -08:00 |
|
Seth Alves
|
33065fb51c
|
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
|
2018-03-01 11:07:37 -08:00 |
|
Anthony Thibault
|
d888e7fd95
|
Merge pull request #12528 from hyperlogic/bug-fix/fix-anim-tests
Animation Unit Tests build and pass
|
2018-03-01 10:48:15 -08:00 |
|
John Conklin II
|
1e1836c009
|
Merge pull request #12502 from elisa-lj11/2dimages-update
Image entity has correct orientation and is collisionless
|
2018-03-01 09:57:08 -08:00 |
|
Anthony J. Thibault
|
cb1d453f10
|
Removed RigTests
|
2018-02-28 17:15:24 -08:00 |
|
Anthony J. Thibault
|
470aa53454
|
AnimTest now passes
|
2018-02-28 17:12:57 -08:00 |
|
Anthony J. Thibault
|
95dfee25b9
|
Relaxed tolerance on AnimIK test so it can pass...
|
2018-02-28 16:43:49 -08:00 |
|
Anthony J. Thibault
|
f291ddae97
|
Animation unit tests now compile.
not all of them pass tho...
|
2018-02-28 15:55:08 -08:00 |
|
Sam Gondelman
|
b90af9e3b5
|
Merge pull request #12523 from samcake/punk
Adding more detailed stats
|
2018-02-28 12:18:07 -08:00 |
|
Seth Alves
|
3e114f2b55
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-28 11:17:08 -08:00 |
|
samcake
|
9e5ed7b905
|
Add more timing stats in explanded mode
|
2018-02-28 10:48:35 -08:00 |
|
Elisa Lupin-Jimenez
|
061a189e9f
|
Merge pull request #12520 from elisa-lj11/selection_tool_log_spam
Fixed log spam undefined error
|
2018-02-28 09:37:17 -08:00 |
|
samcake
|
9580258589
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-02-28 09:00:55 -08:00 |
|
Ken Cooke
|
328b5a1e8b
|
Merge pull request #12479 from kencooke/audio-nearfield-hrtf
Near-field HRTF
|
2018-02-28 07:44:24 -08:00 |
|
Ken Cooke
|
bc7b983f48
|
Fast approximation of the azimuth parallax correction
|
2018-02-28 04:44:20 -08:00 |
|
Seth Alves
|
31115b3cb6
|
make sure rezzer doesn't ignore adjustment
|
2018-02-27 20:14:00 -08:00 |
|
Seth Alves
|
9d131a6547
|
if a node can't change locks, don't allow them to create an already-locked entity
|
2018-02-27 19:53:54 -08:00 |
|
samcake
|
a2e9e8295d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-02-27 17:47:22 -08:00 |
|
Thijs Wenker
|
6bf1c9878f
|
Merge pull request #12473 from misslivirose/fix-log-spam
Logspam fix for editing in HMD mode
|
2018-02-28 01:59:25 +01:00 |
|
Elisa Lupin-Jimenez
|
b8fd640ddf
|
fixed log spam undefined error
|
2018-02-27 16:44:45 -08:00 |
|
Elisa Lupin-Jimenez
|
17ddf21028
|
fixed line length
|
2018-02-27 15:05:51 -08:00 |
|
samcake
|
e290f2fc3c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-02-27 14:54:11 -08:00 |
|
Seth Alves
|
a44ddbbc26
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-27 14:09:05 -08:00 |
|
Brad Davis
|
136ced98c3
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-27 13:44:00 -08:00 |
|
John Conklin II
|
b4000c04bc
|
Merge pull request #12432 from highfidelity/feat/content-settings
Add content archives to domain server web interface
|
2018-02-27 13:30:53 -08:00 |
|
Howard Stearns
|
1fb0f898b4
|
Merge pull request #12505 from howard-stearns/wallet-help
new wallet help
|
2018-02-27 13:18:36 -08:00 |
|
Howard Stearns
|
0e4f3460b3
|
Merge pull request #12497 from howard-stearns/end-seeding
End seeding
|
2018-02-27 13:18:13 -08:00 |
|
Sam Gondelman
|
354fae5063
|
Merge pull request #12513 from SamGondelman/revertShadows
Revert can cast shadow work
|
2018-02-27 13:13:09 -08:00 |
|
Ken Cooke
|
41ccf6afd8
|
Compensate the near-field azimuth correction for the parallax baked into the HRTF dataset
|
2018-02-27 12:49:32 -08:00 |
|
howard-stearns
|
e21d9f7950
|
Merge branch 'wallet-help' of github.com:howard-stearns/hifi into wallet-help
|
2018-02-27 12:05:00 -08:00 |
|
howard-stearns
|
30896c264b
|
reduced text
|
2018-02-27 12:04:41 -08:00 |
|
howard-stearns
|
53b976b400
|
fix typo in bank href
|
2018-02-27 11:46:06 -08:00 |
|
Zach Fox
|
1119998c7a
|
Fix semicolon
|
2018-02-27 11:45:59 -08:00 |
|
SamGondelman
|
0fca56eef0
|
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
|
2018-02-27 11:33:05 -08:00 |
|
howard-stearns
|
1f2d270419
|
Merge branch 'master' of github.com:highfidelity/hifi into wallet-help
|
2018-02-27 11:20:56 -08:00 |
|
samcake
|
816c5ab59d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-02-27 11:18:43 -08:00 |
|
Stephen Birarda
|
4f99569046
|
bump fs-extra to 1.0.0 so brace-expansion is bumped to 1.1.11
|
2018-02-27 10:20:53 -08:00 |
|
Ryan Huffman
|
a6a38d8b3d
|
Merge pull request #12511 from birarda/feat/content-settings
merge master into feat/content-settings
|
2018-02-27 10:03:28 -08:00 |
|
Stephen Birarda
|
9cc348ef27
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
|
2018-02-27 09:59:37 -08:00 |
|
Seth Alves
|
9a25128b44
|
remove some leftover code
|
2018-02-27 09:39:15 -08:00 |
|
Zach Fox
|
9170244312
|
Make WindowScriptingInterface available to tablet
|
2018-02-27 09:36:02 -08:00 |
|