samcake
|
450786404c
|
Adding more detailed classes and introducing an upfront setupVIew job
|
2018-03-05 18:04:25 -08:00 |
|
NissimHadar
|
84815fadae
|
Use JPG->PNG trick to keep file sizes down.
|
2018-03-05 17:45:51 -08:00 |
|
John Conklin II
|
acf1f48d9e
|
Merge pull request #12550 from thoys/fix/grabbableCheckbox
FIX: make the grabbable checkbox function again when dynamic disabled
|
2018-03-05 14:55:38 -08:00 |
|
John Conklin II
|
16bb992d8d
|
Merge pull request #12557 from druiz17/correctly-use-defaults-values
correctly use default values and don't delete userData in entitiesProperties.js
|
2018-03-05 13:15:23 -08:00 |
|
Cristian Luis Duarte
|
0bb56d837d
|
Android - Use a different variable to save the reported dpi by qt in TouchscreenVirtualPadDevice
|
2018-03-05 18:08:06 -03:00 |
|
John Conklin II
|
7bc3848c36
|
Merge pull request #12533 from druiz17/stereo-checkbox
Adding Stereo checkbox in Audio settings
|
2018-03-05 12:45:01 -08:00 |
|
Cristian Luis Duarte
|
c091bc0bb3
|
Fix warnings regarding float to double conversion
|
2018-03-05 17:08:38 -03:00 |
|
Seth Alves
|
7d6927a00d
|
Merge pull request #12555 from druiz17/fix-controllerDispacther-error
fix controllerDispatcher error in logs
|
2018-03-05 12:08:35 -08:00 |
|
Thijs Wenker
|
d7725f1d73
|
make the grabbable checkbox again, respect default true setting
|
2018-03-05 20:54:08 +01:00 |
|
Brad Davis
|
8bfc610cfb
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-03-05 11:48:58 -08:00 |
|
NissimHadar
|
1eb0dde3d2
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-05 11:36:39 -08:00 |
|
Dante Ruiz
|
1997cd27bd
|
correctly use default values
|
2018-03-05 11:26:37 -08:00 |
|
samcake
|
0ab5fc178f
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-05 11:12:27 -08:00 |
|
Sam Gateau
|
0381e0e03e
|
Merge pull request #12556 from samcake/master-workload
Master workload merge
|
2018-03-05 11:12:24 -08:00 |
|
samcake
|
7d32efb5e6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-05 11:03:11 -08:00 |
|
Dante Ruiz
|
654770af51
|
fix controller dispatacher error
|
2018-03-05 09:39:26 -08:00 |
|
John Conklin II
|
8cb7e0584f
|
Merge pull request #12547 from Atlante45/fix/session-uuid-lock
Protect session UUID from concurrent read/writes
|
2018-03-05 08:24:22 -08:00 |
|
John Conklin II
|
3f751bb5ca
|
Merge pull request #12546 from druiz17/fix-hyperlink
Fix hyperlink when far/near grabbing enitities
|
2018-03-05 08:23:51 -08:00 |
|
NissimHadar
|
5a79f272f3
|
Allow multiple evaluations.
|
2018-03-04 20:56:57 -08:00 |
|
NissimHadar
|
913ad569c0
|
Added completion message.
|
2018-03-04 17:36:20 -08:00 |
|
vladest
|
43e7f282ec
|
cleanup
|
2018-03-04 20:44:46 +01:00 |
|
vladest
|
c2c7962f66
|
return styling. set implicit sizes
|
2018-03-04 19:49:47 +01:00 |
|
vladest
|
9f151566bf
|
temporarily remove styling
|
2018-03-04 18:46:27 +01:00 |
|
vladest
|
1d43ca48bd
|
remove wrap
|
2018-03-04 17:59:56 +01:00 |
|
vladest
|
12a70d57c2
|
Set Y pos for indicator explicetly
|
2018-03-04 17:24:52 +01:00 |
|
NissimHadar
|
b32ad2f69c
|
createTests fixed.
|
2018-03-03 18:22:51 -08:00 |
|
NissimHadar
|
0a2610a9e0
|
Evaluation seems to work.
|
2018-03-03 09:58:30 -08:00 |
|
samcake
|
660c4c30e9
|
Representing the view spheres
|
2018-03-02 18:22:51 -08:00 |
|
NissimHadar
|
361b5331ba
|
File sizes are wrong, and so is format.
|
2018-03-02 18:09:32 -08:00 |
|
samcake
|
7179a31d17
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
|
2018-03-02 17:51:19 -08:00 |
|
Sam Gateau
|
bc44b142d6
|
Merge pull request #12549 from samcake/master-workload
Master workload merge
|
2018-03-02 17:50:53 -08:00 |
|
samcake
|
cc392944b5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
|
2018-03-02 17:49:10 -08:00 |
|
Atlante45
|
85b4c3b422
|
Protect session UUID from concurrent read/writes
|
2018-03-02 17:34:18 -08:00 |
|
NissimHadar
|
96c7cc8197
|
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
|
2018-03-02 16:49:30 -08:00 |
|
NissimHadar
|
4b836a2ca9
|
Stores downloaded images in correct folder and with correct filenames.
|
2018-03-02 16:49:09 -08:00 |
|
Sam Gateau
|
8856d4af4f
|
Merge pull request #12530 from samcake/punk
Fixing the graphics bugs introduced since last recent dual quaternion change
|
2018-03-02 16:12:23 -08:00 |
|
NissimHadar
|
8536b44c61
|
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
|
2018-03-02 16:09:06 -08:00 |
|
NissimHadar
|
d29adcd000
|
Can download multiple images from GitHub.
|
2018-03-02 16:08:14 -08:00 |
|
John Conklin II
|
ed07b3c28b
|
Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick
Purge RayPick and LaserPointers from default scripts
|
2018-03-02 14:59:32 -08:00 |
|
Dante Ruiz
|
d12a4f0c18
|
little change
|
2018-03-02 14:30:02 -08:00 |
|
Dante Ruiz
|
5dc336bfae
|
remove dead code and eslint files
|
2018-03-02 14:23:35 -08:00 |
|
John Conklin II
|
8f403ebc23
|
Merge pull request #12543 from zfox23/improveFontLoading
Improve font loading via QRC instead of file path
|
2018-03-02 14:22:17 -08:00 |
|
samcake
|
fc8f1c1e65
|
Resolving conflicts
|
2018-03-02 14:20:33 -08:00 |
|
Dante Ruiz
|
05fb3cfd9a
|
fixing hyper link for entities
|
2018-03-02 14:03:24 -08:00 |
|
Brad Hefta-Gaub
|
762e36ef19
|
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii
fix ASCII art for packet headers in NLPacket
|
2018-03-02 13:49:27 -08:00 |
|
Cristian Luis Duarte
|
76e4a5bef2
|
Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1().
|
2018-03-02 18:46:14 -03:00 |
|
John Conklin II
|
7ebe3df2b1
|
Merge pull request #12537 from zfox23/fixJsRequest
Fix undefined request from JS
|
2018-03-02 13:39:27 -08:00 |
|
John Conklin II
|
ff94587518
|
Merge pull request #12544 from jherico/fix_android
Disable virtual trackpad rendering on non-Android builds
|
2018-03-02 13:37:08 -08:00 |
|
Brad Hefta-Gaub
|
746f43c0fc
|
Merge pull request #12538 from huffman/fix/gzipped-json-export
Fix Edit -> Export Entities exporting gzipped json
|
2018-03-02 13:34:23 -08:00 |
|
Gabriel Calero
|
01699e26a5
|
Fix QML debug info: print last QML loaded file instead of Desktop.qml
|
2018-03-02 18:04:36 -03:00 |
|