howard-stearns
|
890c97e7cb
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 12:24:27 -07:00 |
|
John Conklin II
|
1646f543cd
|
Merge pull request #13273 from danteruiz/fix-show-overlays-menu
fixing show overlays menu item on start up
|
2018-06-07 11:34:30 -07:00 |
|
John Conklin II
|
3b413d0f72
|
Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized
MS14615: Prevent memory overuse when minimized
|
2018-06-07 11:16:56 -07:00 |
|
David Back
|
ae5d056ca0
|
Merge pull request #13292 from dback2/fileChooser
File Dialog Fixes
|
2018-06-07 09:38:56 -07:00 |
|
Sam Gateau
|
146732a20f
|
Merge pull request #13317 from jherico/feature/mac_resources
Use binary resources on OSX
|
2018-06-07 09:38:00 -07:00 |
|
John Conklin II
|
2b6fdb6b69
|
Merge pull request #13217 from Atlante45/fix/ds-memory
Fix uploaded content archives taking too much memory
|
2018-06-07 09:37:41 -07:00 |
|
Zach Fox
|
7f04506020
|
Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged
Fix MS14925: Don't double-emit signal for display plugin change
|
2018-06-07 09:32:50 -07:00 |
|
howard-stearns
|
8185d1b5f5
|
cleanup and consistently don't getNextPage at beginning
|
2018-06-06 15:24:54 -07:00 |
|
Bradley Austin Davis
|
fa51c15849
|
Use binary resources on OSX
|
2018-06-06 15:10:52 -07:00 |
|
Zach Fox
|
6869718025
|
Fix MS14925: Don't double-call signal for display plugin change
|
2018-06-06 14:41:33 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Sam Gondelman
|
b4afabee68
|
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
|
2018-06-06 13:52:33 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
Seth Alves
|
6c8e514367
|
Merge pull request #13224 from danteruiz/fix-key-conflicts
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
|
2018-06-06 11:08:04 -07:00 |
|
MiladNazeri
|
082c1fce52
|
Merge pull request #13251 from ctrlaltdavid/21880
JSDoc updates
|
2018-06-05 19:04:54 -07:00 |
|
howard-stearns
|
335aeaeb38
|
purchases cleanup, wearables, and edition numbers when multiples seen.
|
2018-06-05 17:06:08 -07:00 |
|
howard-stearns
|
6aa551b35c
|
Don't getNextPage when at beginning (even if that is also the end).
|
2018-06-05 17:04:29 -07:00 |
|
howard-stearns
|
ce41b83bad
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 15:30:04 -07:00 |
|
howard-stearns
|
3d75a793cc
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 13:35:54 -07:00 |
|
Zach Fox
|
2932ce177d
|
Fix MS15500: Ensure Connection usernames show up in PAL
|
2018-06-05 10:57:25 -07:00 |
|
SamGondelman
|
968758a022
|
CR
|
2018-06-05 09:35:17 -07:00 |
|
Ken Cooke
|
aa19794a94
|
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete
fix copy delete cut paste commands and menus
|
2018-06-05 09:17:34 -07:00 |
|
Ken Cooke
|
83dda420ba
|
Merge pull request #13256 from danteruiz/remove-dead-code
remove dead code in Application::keyPressEvent
|
2018-06-05 09:16:28 -07:00 |
|
howard-stearns
|
f72f8c762b
|
goto client-side filtering (preliminary)
|
2018-06-04 16:52:20 -07:00 |
|
David Back
|
7b2a9770ba
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fileChooser
|
2018-06-04 16:00:13 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
David Back
|
6b7d9586d1
|
apply fixes to other file dialogs and fix tablet dialog buttons
|
2018-06-04 15:56:10 -07:00 |
|
howard-stearns
|
25ee948662
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 15:30:10 -07:00 |
|
Sam Gondelman
|
38e7b31c32
|
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity
Try reducing concurrent downloads
|
2018-06-04 14:48:46 -07:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
howard-stearns
|
5a1b56d573
|
checkpoint with goto feeds working (but without filtering)
|
2018-06-04 13:11:06 -07:00 |
|
howard-stearns
|
e40fc20cb6
|
fix some bugs that had been introduced by various out-of-team prs.
|
2018-06-04 13:00:08 -07:00 |
|
SamGondelman
|
bde3382657
|
merge with master
|
2018-06-04 12:55:17 -07:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
howard-stearns
|
24a67c6008
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 11:15:39 -07:00 |
|
David Back
|
074892591d
|
fix auto-selecting subdir and not showing Choose when no row selected
|
2018-06-04 11:13:03 -07:00 |
|
John Conklin II
|
08fcad1932
|
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
|
2018-06-04 11:06:00 -07:00 |
|
howard-stearns
|
bf7453482a
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 10:26:49 -07:00 |
|
Andrew Meadows
|
9ae19714b5
|
also update queryAACube for children of worn entities
|
2018-06-01 16:38:57 -07:00 |
|
Zach Fox
|
7f344c33a7
|
Docs update
|
2018-06-01 13:51:18 -07:00 |
|
Zach Fox
|
96858c9586
|
MS15529: Add secondary camera snapshot notification flag
|
2018-06-01 13:38:41 -07:00 |
|
howard-stearns
|
29b09d64e6
|
checkpoint with PAL working.
|
2018-06-01 13:33:45 -07:00 |
|
howard-stearns
|
84f5f0a653
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-01 09:58:08 -07:00 |
|
John Conklin II
|
194c33bf19
|
Merge pull request #13254 from danteruiz/add-back-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil
|
2018-06-01 09:31:13 -07:00 |
|
SamGondelman
|
86ee5c12d8
|
merge and update based on sam's changes
|
2018-05-31 17:53:36 -07:00 |
|
Sam Gateau
|
f372e25a9f
|
Merge pull request #13247 from NissimHadar/DailyTests
Daily tests
|
2018-05-31 14:50:32 -07:00 |
|
howard-stearns
|
e8e12eef8f
|
checkpoint
|
2018-05-31 14:42:52 -07:00 |
|
samcake
|
386c0f9ab2
|
Re review adjustments
|
2018-05-31 12:16:57 -07:00 |
|
Dante Ruiz
|
caa7f64865
|
fixing show overlays menu item
|
2018-05-31 10:58:04 -07:00 |
|
Zach Fox
|
259803f856
|
MS14615: Prevent memory overuse when minimized
|
2018-05-31 10:30:25 -07:00 |
|