humbletim
|
d0e4c62978
|
fix merge conflict
|
2018-11-14 23:50:02 -05:00 |
|
humbletim
|
21030fbe5b
|
Merge remote-tracking branch 'upstream/master' into fb18302-deprecated-package-model
|
2018-11-14 23:40:04 -05:00 |
|
John Conklin II
|
ef3acae896
|
Merge pull request #14407 from jherico/fix/19876
Case 19876: Fix procedurals using the iGlobalTime input
|
2018-11-14 17:18:57 -08:00 |
|
Brad Davis
|
b7c567af08
|
Fix procedurals using the iGlobalTime input
|
2018-11-14 15:28:22 -08:00 |
|
David Back
|
76d2519205
|
Merge pull request #14400 from dback2/missingTypeFilters
Add PolyLine/PolyVox to entity list/properties types
|
2018-11-14 14:39:26 -08:00 |
|
John Conklin II
|
b08283d9e9
|
Merge pull request #14401 from sethalves/rc76-revert-pr-14238
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
|
2018-11-14 14:38:34 -08:00 |
|
Brad Hefta-Gaub
|
6ffee02b4f
|
Merge pull request #14337 from thoys/feat/create/forwardWindowShortcuts
[CreateApp] make shortcuts work from windows
|
2018-11-14 12:56:27 -08:00 |
|
Seth Alves
|
1593c1185a
|
revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it.
|
2018-11-14 12:29:09 -08:00 |
|
David Back
|
70493e3f29
|
add polyline/polyvox to entity list/properties types
|
2018-11-14 12:23:16 -08:00 |
|
John Conklin II
|
92a23ec0a9
|
Merge pull request #14294 from SimonWalton-HiFi/max-json-size
Allow for large Models.json file
|
2018-11-14 11:20:35 -08:00 |
|
Thijs Wenker
|
cd12dd8f6d
|
fix OSX shortcut inconsistencies
|
2018-11-14 19:28:57 +01:00 |
|
Simon Walton
|
452c212c4f
|
Add Paths entry parsing to json parser
|
2018-11-13 17:58:12 -08:00 |
|
Brad Hefta-Gaub
|
f1dd778310
|
Merge pull request #14389 from SimonWalton-HiFi/oven-resourcerequestobserver
Add newly-introduced dependency class to Oven
|
2018-11-13 17:35:29 -08:00 |
|
Simon Walton
|
82e21e89e4
|
Merge remote-tracking branch 'upstream/master' into max-json-size
|
2018-11-13 17:26:20 -08:00 |
|
Thijs Wenker
|
2c715bf592
|
make window shortcuts work on OSX
|
2018-11-14 01:05:39 +01:00 |
|
Thijs Wenker
|
0248323bee
|
fix test path
|
2018-11-14 01:05:38 +01:00 |
|
Thijs Wenker
|
cc207537a3
|
Fix for unintended snapshots while parenting/un-parenting
|
2018-11-14 01:05:38 +01:00 |
|
Thijs Wenker
|
afd69d04dd
|
Make ctrl+shift shortcuts work for create app
|
2018-11-14 01:05:37 +01:00 |
|
Thijs Wenker
|
e890228fc7
|
Make shortcuts work in edit windows
|
2018-11-14 01:05:36 +01:00 |
|
John Conklin II
|
d7dd593a97
|
Merge pull request #14369 from dback2/entityListColumns
Entity list - dynamic columns
|
2018-11-13 16:01:06 -08:00 |
|
John Conklin II
|
79e67ad45f
|
Merge pull request #14238 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
|
2018-11-13 15:07:21 -08:00 |
|
Sam Gondelman
|
13f650d514
|
Merge pull request #14093 from SamGondelman/police
Case 19409, Case 19468: Fading fixes and shader cleanup
|
2018-11-13 15:00:23 -08:00 |
|
Jeff Clinton
|
6c90d7ed11
|
Merge pull request #14343 from ElderOrb/FB19514
FB19514 - Interface crashes on attempt to apply new animation url via…
|
2018-11-13 14:59:50 -08:00 |
|
Simon Walton
|
167a8fdc04
|
Merge branch 'master' into max-json-size
|
2018-11-13 14:57:06 -08:00 |
|
Jamil Akram
|
d65a79e815
|
Merge pull request #14377 from huffman/feat/ui-updates
Update the styling for the Entity Properties window
|
2018-11-13 14:39:57 -08:00 |
|
Jeff Clinton
|
2afc8c505d
|
Merge pull request #14344 from ElderOrb/FB19348
FB19348 - Interface doesn't save changes to avatar animation text field
|
2018-11-13 14:29:25 -08:00 |
|
Jeff Clinton
|
18bf6bf975
|
Merge pull request #14143 from ElderOrb/FB18673
FB18673 - Last line of GOTO desktop notification text cropped off on …
|
2018-11-13 14:05:21 -08:00 |
|
Jamil Akram
|
822e4bfe48
|
Merge pull request #14386 from ctrlaltdavid/M19820
Fix entities not loading when Interface doesn't have focus
|
2018-11-13 13:45:42 -08:00 |
|
Ryan Huffman
|
aecbccc058
|
Remove dead code and cleanup JS styling for entity properties redesign
|
2018-11-13 13:45:27 -08:00 |
|
Ryan Huffman
|
8c9015b224
|
Remove redundant dimensions in default entity properties
|
2018-11-13 13:45:27 -08:00 |
|
Ryan Huffman
|
536ba645b1
|
Update the styling for the Entity Properties window
|
2018-11-13 13:45:27 -08:00 |
|
Simon Walton
|
a65466f154
|
Use traditional C strings rather than raw strings
|
2018-11-13 13:33:36 -08:00 |
|
Brad Hefta-Gaub
|
bb2239c0bd
|
Merge pull request #14359 from howard-stearns/no-url-logging
remove urls from logs in Interface
|
2018-11-13 13:19:30 -08:00 |
|
John Conklin II
|
7e7817212c
|
Merge pull request #14321 from jherico/fix/19256
Case 19256: Switch back to Qt for GL context creation by default
|
2018-11-13 13:14:22 -08:00 |
|
Brad Hefta-Gaub
|
4cab805392
|
Merge pull request #12718 from gcalero/tester_flag
Detect if Interface is running on an android testing device
|
2018-11-13 13:13:52 -08:00 |
|
Brad Davis
|
099ffa23ec
|
PR feedback
|
2018-11-13 12:19:20 -08:00 |
|
Brad Hefta-Gaub
|
07f94030ce
|
Merge pull request #14357 from ctrlaltdavid/M19761
Fix mini tablet JavaScript crash
|
2018-11-13 12:15:56 -08:00 |
|
Brad Hefta-Gaub
|
153b8920be
|
Merge pull request #14348 from sabrina-shanman/hfm_library
(case 19302) Create the HFM library and namespace
|
2018-11-13 12:03:53 -08:00 |
|
Brad Hefta-Gaub
|
6e2024350d
|
Merge pull request #14282 from gcalero/android_new_login
Change Android login flow (MS case 19470)
|
2018-11-13 12:02:10 -08:00 |
|
Brad Hefta-Gaub
|
b5e432bcb1
|
Merge pull request #14265 from amantley/needToSquat
Bug fix for Users unable to Squat
|
2018-11-13 12:01:06 -08:00 |
|
Brad Hefta-Gaub
|
41d8220cbd
|
Merge pull request #14362 from ctrlaltdavid/M19768
Add option to enable/disable the mini tablet
|
2018-11-13 11:59:24 -08:00 |
|
Brad Hefta-Gaub
|
47cd6b332c
|
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode
Bug fix for head trackers in desktop mode
|
2018-11-13 11:49:24 -08:00 |
|
David Back
|
0b0614c84a
|
CR fixes
|
2018-11-13 11:13:00 -08:00 |
|
Brad Hefta-Gaub
|
4bafcd2cfa
|
Merge pull request #14271 from SamGondelman/oculus
Case 19475: Fix various Oculus Store test failures
|
2018-11-13 11:06:39 -08:00 |
|
Howard Stearns
|
938b45d3da
|
more removal
|
2018-11-13 11:05:45 -08:00 |
|
Jeff Clinton
|
6bd08325ec
|
Merge pull request #14272 from FlameSoulis/fix/spacenavigator
Update Spacemouse plugin + Proposal to main build
|
2018-11-13 10:59:11 -08:00 |
|
Brad Hefta-Gaub
|
63e52ba8bd
|
Merge pull request #14284 from ctrlaltdavid/M19404
Fix interstitial page not displaying at Interface start-up
|
2018-11-13 10:38:38 -08:00 |
|
David Back
|
b5ec04a534
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns
|
2018-11-13 10:35:57 -08:00 |
|
Howard Stearns
|
ad7266062d
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-13 10:33:27 -08:00 |
|
David Back
|
047708bedb
|
Merge branch 'master' of github.com:dback2/hifi into entityListColumns
|
2018-11-13 10:24:02 -08:00 |
|