Andrew Meadows
|
f9db9e999e
|
Merge 'master' into 'workload'
|
2018-03-01 10:19:06 -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 |
|
Andrew Meadows
|
b3a37e4516
|
Merge pull request #12527 from samcake/workload
Adding debuggin tool for workload
|
2018-03-01 09:02:15 -08:00 |
|
samcake
|
94fa2ef6a0
|
Adding debug color of the region
|
2018-02-28 17:59:59 -08:00 |
|
samcake
|
b1b539e07a
|
Adding debug color of the region
|
2018-02-28 17:56:37 -08:00 |
|
samcake
|
d91fb543f3
|
Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api
|
2018-02-28 17:15:40 -08:00 |
|
Sam Gondelman
|
b90af9e3b5
|
Merge pull request #12523 from samcake/punk
Adding more detailed stats
|
2018-02-28 12:18:07 -08:00 |
|
samcake
|
9e5ed7b905
|
Add more timing stats in explanded mode
|
2018-02-28 10:48:35 -08:00 |
|
samcake
|
e6d5f90847
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-02-28 10:30:14 -08:00 |
|
Andrew Meadows
|
3ca21dda67
|
Merge hifi/master of into hifi/workload
|
2018-02-28 10:28:31 -08:00 |
|
samcake
|
31462a87c3
|
now identifying the issue with ResourceBUffer
|
2018-02-28 10:13:13 -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
|
66f1b7f1fc
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-02-28 09:25:24 -08:00 |
|
Sam Gateau
|
3d88eb5131
|
Merge pull request #12474 from AndrewMeadows/workload-005
workload: update space view and compute classification changes
|
2018-02-28 09:24:55 -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 |
|
samcake
|
3360c5a968
|
Debugging the ssbo bug
|
2018-02-27 18:46:12 -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 |
|
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 |
|
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 |
|
Zach Fox
|
9170244312
|
Make WindowScriptingInterface available to tablet
|
2018-02-27 09:36:02 -08:00 |
|
John Conklin II
|
abe7c29b5e
|
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly
Export boolean entity properties properly
|
2018-02-27 09:18:46 -08:00 |
|
samcake
|
e95b16c5f9
|
Merge branch 'workload' of https://github.com/samcake/hifi into workload
|
2018-02-27 09:12:13 -08:00 |
|
samcake
|
efba6bb524
|
Adding a counter for the other parts of the gameloop
|
2018-02-27 09:11:14 -08:00 |
|
Ken Cooke
|
cc7b9a254b
|
Optimized compute of distance attenuation
|
2018-02-27 09:02:03 -08:00 |
|
Ken Cooke
|
bb2f3cac2c
|
Use named constant for the onset of near-field corrections (1 meter)
|
2018-02-27 08:51:55 -08:00 |
|
Ryan Huffman
|
44f3b00a92
|
Merge pull request #12509 from huffman/feat/content-settings
Fix entity data not being stored when Id and DataVersion are null
|
2018-02-27 08:43:44 -08:00 |
|
howard-stearns
|
053640f216
|
a guess a linking bank
|
2018-02-27 08:36:45 -08:00 |
|
Ryan Huffman
|
88931d9c95
|
Fix entity data not being stored when Id and DataVersion are null
|
2018-02-27 08:33:20 -08:00 |
|
howard-stearns
|
ce0ae61947
|
Merge branch 'master' of https://github.com/highfidelity/hifi into wallet-help
|
2018-02-27 08:10:17 -08:00 |
|
John Conklin II
|
48f0cded05
|
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
Leopoly_Phase1_010 Graphics Scripting
|
2018-02-27 07:53:25 -08:00 |
|
John Conklin II
|
25144f0fec
|
Merge pull request #12456 from Atlante45/fix/min-spec-crash
Fix crash when passing --checkMinSpec flag
|
2018-02-26 17:35:46 -08:00 |
|
Clément Brisset
|
2a7a71db13
|
Merge pull request #12477 from Atlante45/new-master
Merge stable back into master
|
2018-02-26 17:18:24 -08:00 |
|