Commit graph

65402 commits

Author SHA1 Message Date
Dante Ruiz
4b572eda6b changing Name 2018-03-01 11:05:40 -08:00
Dante Ruiz
8cae20f53d adding stereo checkbox to audio settings 2018-03-01 11:03:18 -08:00
samcake
a227cf1edb Fixing bad key/pipeline pair 2018-03-01 10:49:58 -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
samcake
5440f62860 fixing a bad key /pipeline pair 2018-03-01 10:46:47 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -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
samcake
9f9214e808 getting back the RC65 version for a few files 2018-03-01 09:33:48 -08:00
Andrew Meadows
27c6e7915e purge LaserPointers refs from scripts that don't use it 2018-03-01 08:43:30 -08:00
Andrew Meadows
b4f941af03 finish purge of RayPick from grab.js 2018-03-01 08:42:08 -08:00
Andrew Meadows
181944d5db fix bugs in controllerDispatcher.js 2018-03-01 08:41:13 -08:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
samcake
dc286544c5 Merging with nissim's pr 2018-02-28 17:54:54 -08:00
samcake
a7542d5b90 fixing the shadow 2018-02-28 17:46:22 -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
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03:00
Sam Gondelman
b90af9e3b5
Merge pull request #12523 from samcake/punk
Adding more detailed stats
2018-02-28 12:18:07 -08:00
NissimHadar
5d7e6651a7 Use correct pixel shader. 2018-02-28 11:05:02 -08:00
Cristian Luis Duarte
55d52f92df Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows) 2018-02-28 15:55:50 -03: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
NissimHadar
faad930e35 WIP. 2018-02-28 08:44:01 -08:00
NissimHadar
7ae37c21e0 Merge branch 'master' of github.com:highfidelity/hifi into fixDualQuats 2018-02-28 08:13:00 -08:00
NissimHadar
5764a21c4a WIP. 2018-02-28 08:12:48 -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
NissimHadar
7cae04883e WIP. 2018-02-27 17:19:02 -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
NissimHadar
f52f146db5 WIP. 2018-02-27 16:28:46 -08:00
Cristian Luis Duarte
428f4b7b9d Android - Make the virtual pad (joystick) position fixed. Change assets. 2018-02-27 21:24:21 -03: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
NissimHadar
00f3682bbe NOT WORKING YET. 2018-02-27 14:09:31 -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
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -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