Ryan Huffman
|
a654bfa692
|
Update server-console to watch interface via pid rather than marker
|
2017-06-07 15:33:02 -07:00 |
|
Chris Collins
|
6cc6cd3bf6
|
Merge pull request #10604 from highfidelity/RC-42
Beta Release 42 - Includes up to Developer Release 6626
|
2017-06-05 09:13:19 -07:00 |
|
Ryan Huffman
|
52c60b35df
|
Add startup_sent_to user activity event
|
2017-06-02 17:57:40 -07:00 |
|
Stephen Birarda
|
d89febac71
|
use a sleep instead of a yield waiting for close event
|
2017-06-02 13:22:02 -07:00 |
|
Stephen Birarda
|
e3d8229abe
|
rename ClosureEventSender to CloseEventSender
|
2017-06-02 13:21:55 -07:00 |
|
Stephen Birarda
|
ecc697dbe1
|
remove crash event definition for now
|
2017-06-02 13:21:45 -07:00 |
|
Stephen Birarda
|
40dfcb1e6e
|
send quit event during shutdown on thread, with timeout
|
2017-06-02 13:21:37 -07:00 |
|
Stephen Birarda
|
f5d732f332
|
initial version of the ClosureEventSender using std::thread
|
2017-06-02 13:21:28 -07:00 |
|
Zach Fox
|
4e929f6d92
|
Merge pull request #10581 from zfox23/snapshot_fixForUrlShare
Snapshots: Fix incorrect "for_url" share; ensure old snapshots don't get shared when they shouldn't
|
2017-06-01 11:51:14 -07:00 |
|
David Kelly
|
017955dca8
|
Merge pull request #10587 from davidkelly/dk/5028
Don't allow sorting on non-sortable columns in PAL
|
2017-06-01 10:49:11 -07:00 |
|
David Kelly
|
b6b2f92af2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028
|
2017-06-01 09:58:07 -07:00 |
|
Andrew Meadows
|
e27199601f
|
Merge pull request #10585 from samcake/orange
Fixing warnings
|
2017-06-01 09:33:16 -07:00 |
|
samcake
|
257813ec38
|
comment the code
|
2017-06-01 09:19:02 -07:00 |
|
David Kelly
|
f79c9ea021
|
we can sort on ignored
|
2017-06-01 07:29:31 -07:00 |
|
David Kelly
|
a17886aa58
|
do not allow sorting on non-sortable columns in PAL
|
2017-06-01 07:24:03 -07:00 |
|
Sam Cake
|
07eb1d89e1
|
fixing the warning on macosx about the non portable file name
|
2017-05-31 23:59:44 -07:00 |
|
Sam Cake
|
3c9b14ee94
|
Oene more fix
|
2017-05-31 23:26:20 -07:00 |
|
Sam Cake
|
03fdc1396c
|
Fixing the warnings
|
2017-05-31 23:20:10 -07:00 |
|
Sam Cake
|
0372deebff
|
Last warnings?
|
2017-05-31 22:09:30 -07:00 |
|
Sam Cake
|
d19956f93c
|
Fixing warnings
|
2017-05-31 22:02:47 -07:00 |
|
Zach Fox
|
53701371ab
|
Fix some bugs :(
|
2017-05-31 16:43:21 -07:00 |
|
David Kelly
|
c29091f0b1
|
Merge pull request #10582 from davidkelly/dk/4996
remove extra activity logger call
|
2017-05-31 15:18:17 -07:00 |
|
Zach Fox
|
70fdb4a168
|
Fix incorrectly sharing old snapshots
|
2017-05-31 14:47:07 -07:00 |
|
Zach Fox
|
fd92afff8c
|
Ensure old snaps don't accidentally get shared for_url
|
2017-05-31 14:47:07 -07:00 |
|
David Kelly
|
e1700915f7
|
remove extra activity logger call
|
2017-05-31 13:28:57 -07:00 |
|
Howard Stearns
|
b552566bf8
|
Merge pull request #10580 from manapa01/Default-Discoverability-Mode
Changed the DEFAULT_DISCOVERABILITY_MODE to Connections
|
2017-05-31 13:00:15 -07:00 |
|
Seth Alves
|
e80704f3c9
|
Merge pull request #10578 from thoys/fix/grabableDynamic
Edit.js: Fix hidden dynamic property while clone-able is active
|
2017-05-31 12:54:36 -07:00 |
|
Zach Fox
|
8d02a93727
|
Merge pull request #10576 from zfox23/snapshot_AddErrorImage
Add placeholder image when previous snapshot can't be loaded
|
2017-05-31 11:19:32 -07:00 |
|
Thijs Wenker
|
5c5aaf3254
|
Fix hidden dynamic property whenever the item is clone-able / DRYing propertyUpdates
|
2017-05-31 20:18:42 +02:00 |
|
Patrick Manalich
|
7b69a5dbd5
|
Changed the DEFAULT_DISCOVERABILITY_MODE to Connections
|
2017-05-31 10:46:04 -07:00 |
|
Zach Fox
|
0441d8c703
|
Add placeholder image when previous snapshot can't be loaded
|
2017-05-31 10:27:17 -07:00 |
|
Ryan Huffman
|
4a52f4090d
|
Merge pull request #10552 from huffman/fix/multiple-nic-lockup
Fix SendQueue not setting lastReceiverResponse when recv handshake ack
|
2017-05-30 13:05:01 -07:00 |
|
Chris Collins
|
5db0975554
|
Merge pull request #10556 from highfidelity/RC-41
Beta Release 41 - Includes up to Developer Release 6603
|
2017-05-30 12:52:30 -07:00 |
|
Stephen Birarda
|
9fa900bac8
|
Merge pull request #10568 from thoys/fix-doc-headers
Fix markdown headers
|
2017-05-30 12:29:27 -07:00 |
|
Thijs Wenker
|
68ad8fa981
|
visual headers
|
2017-05-30 21:12:51 +02:00 |
|
Stephen Birarda
|
60125eb1d7
|
Merge pull request #10567 from highfidelity/openssl-win-installer-update
OpenSSL installer update
|
2017-05-30 12:03:20 -07:00 |
|
Thijs Wenker
|
1ea3b2b7f4
|
let headers be headers
|
2017-05-30 21:01:42 +02:00 |
|
Thijs Wenker
|
1339516177
|
OpenSSL installer update
|
2017-05-30 20:56:45 +02:00 |
|
Stephen Birarda
|
41716ec56b
|
Merge pull request #10554 from seefo/master
Moved audio asset processing to a separate thread
|
2017-05-30 10:44:53 -07:00 |
|
Seth Alves
|
250e381ea7
|
Merge pull request #10563 from Atlante45/fix/reset-settings
Fix "retain avatar info"
|
2017-05-30 10:00:55 -07:00 |
|
Seth Alves
|
66415dadc6
|
Merge pull request #10496 from volansystech/Wl-21298
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.
|
2017-05-27 08:28:19 -07:00 |
|
Sam Gateau
|
bc44a03e13
|
Merge pull request #10537 from samcake/brown
Fix the flickering and other lighting issues related to zone entities (part 1)
|
2017-05-26 18:22:56 -07:00 |
|
samcake
|
882df7391b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-26 16:47:49 -07:00 |
|
Stephen Birarda
|
bf057219ac
|
fix reference to pending transfer count for progress/stats
|
2017-05-26 15:46:50 -07:00 |
|
Chris Collins
|
fd3b6cdf1a
|
Merge pull request #10564 from birarda/bug/content-loading-always
fix progress bar / stats reference to pending transfer count
|
2017-05-26 15:29:06 -07:00 |
|
Stephen Birarda
|
6c2758e4ea
|
fix reference to pending transfer count for progress/stats
|
2017-05-26 14:37:24 -07:00 |
|
Atlante45
|
ccc7cb638d
|
Fix "retain avatar info"
|
2017-05-26 14:18:29 -07:00 |
|
Stephen Birarda
|
0a7a42bdc3
|
fix force of BC3 instead of BC1a compression
|
2017-05-26 13:52:50 -07:00 |
|
Zach Fox
|
252298938b
|
Update conditional to handle 'other unowned' case
|
2017-05-26 13:25:36 -07:00 |
|
Zach Fox
|
21d396bbb5
|
Pull out ownership bidding changes
|
2017-05-26 13:25:25 -07:00 |
|