Seth Alves
3903a51062
fix a couple of crash-on-exits
2016-10-25 13:58:48 -07:00
Brad Hefta-Gaub
da0d1f1f13
Merge pull request #8896 from ZappoMan/i5SandboxHeartbeat
...
actually make the RunningMarker run on a different thread
2016-10-25 08:47:06 -07:00
Brad Hefta-Gaub
4cb693315f
CR feedback
2016-10-25 08:31:23 -07:00
Chris Collins
9846614468
Merge pull request #8879 from AndrewMeadows/show-physics-stats
...
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
Brad Hefta-Gaub
ae6022c498
actually make the RunningMarker run on a different thread
2016-10-24 18:55:25 -07:00
Andrew Meadows
e44672180a
add Bullet profile info to PerformanceTimer stats
2016-10-21 13:22:22 -07:00
Seth Alves
8ac799ddaf
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-1
2016-10-20 10:02:58 -07:00
Chris Collins
98e7d6d0eb
Merge pull request #8843 from sethalves/fix-audio-mixer-data-race-0
...
Fix some audio mixer data races
2016-10-20 10:01:26 -07:00
Brad Hefta-Gaub
9008de72e0
Merge pull request #8864 from hyperlogic/feature/grab-sphere-adjustments
...
Adjustment to position and visibility of grab sphere.
2016-10-19 21:51:02 -07:00
Anthony J. Thibault
bcd31e3d99
Adjust size and offset of grab balls to better align with hand controllers.
...
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
2016-10-19 15:59:26 -07:00
Seth Alves
2e73330e8e
quiet warnings in Linux build
2016-10-18 17:47:47 -07:00
Seth Alves
a801f27c7c
Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1
2016-10-18 17:34:22 -07:00
Seth Alves
72998b190c
Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-mixer-data-race-0
2016-10-18 17:33:57 -07:00
Seth Alves
af5be8d1d9
reduce data-races in logging
2016-10-18 15:59:00 -07:00
Atlante45
f143e9bf3f
Register SequenceNumber and time_point
2016-10-18 15:54:25 -07:00
Seth Alves
0c6dedff45
avoid various data-races related to stats collection and delivery
2016-10-18 13:05:53 -07:00
Brad Hefta-Gaub
d5c87a0db6
CR feedback
2016-10-17 12:02:23 -07:00
Brad Hefta-Gaub
d46170bec0
auto shutdown of sandbox when interface quits
2016-10-17 07:55:24 -07:00
Ryan Huffman
e24a01d1fe
Add path parameter to goToSandbox
2016-10-07 10:30:18 -07:00
Seth Alves
7b5106afd8
Merge branch 'possible-fix-for-domain-server-crash' of github.com:sethalves/hifi into ac-client
2016-10-05 19:36:59 -07:00
Clément Brisset
476ccadb38
Merge pull request #8732 from huffman/feat/category-in-logs
...
Add category to log lines
2016-10-05 13:29:41 -07:00
Clément Brisset
d18394f249
Merge pull request #8596 from huffman/feat/my-avatar-self-id
...
Add ability to parent overlays to MyAvatar for use across servers
2016-10-05 12:03:01 -07:00
Ryan Huffman
2bb2aca2be
Remove commented line in LogHandler
2016-10-04 16:54:37 -07:00
Ryan Huffman
a52e2d8bc5
Add category to log lines
2016-10-04 16:49:24 -07:00
Seth Alves
7261fcae4a
possible fix for domain-server crash-on-exit
2016-10-04 14:35:23 -07:00
Ryan Huffman
0b2def6013
Fix style error
2016-10-03 15:23:39 -07:00
Ryan Huffman
e213a47814
Fix incorrect return values in getProcessorInfo
2016-10-03 15:19:03 -07:00
Ryan Huffman
dafb5c5bab
Add processor information to launch user activity event
2016-10-03 15:11:56 -07:00
Zach Pomerantz
a9318d052b
Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config
2016-09-23 13:11:52 -07:00
Brad Davis
2a058fa419
Add file logging to perf tool
2016-09-23 12:04:59 -07:00
Brad Davis
f33d3a3b36
Migrate logging functionality to shared library
2016-09-23 12:04:58 -07:00
Zach Pomerantz
e2ff738fc3
strip unused audio settings
...
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
2016-09-21 17:35:27 -07:00
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
Ryan Huffman
5e8c8f84b5
Handle edge cases of AVATAR_SELF_ID being used with entities
2016-09-13 16:34:05 -07:00
Ryan Huffman
23450e929b
Add special avatar id for attaching overlays
2016-09-13 16:33:58 -07:00
David Rowe
fe8b3b4d0d
Merge branch 'master' into 21040
2016-09-13 09:12:47 +12:00
Brad Davis
ecfe56085d
GLM update and GLI integration
2016-09-09 10:18:15 -07:00
David Rowe
38c2efa22f
Implement Entities.findInFrustum() method
2016-09-09 18:57:48 +12:00
Brad Hefta-Gaub
3d54600843
Merge pull request #8513 from Atlante45/feat/network-port
...
Add settings to change local port
2016-09-08 18:10:32 -07:00
Atlante45
006780fe8e
Indentation
2016-09-08 14:29:43 -07:00
SamGondelman
b048637c26
fix signal issue and qabstract::socket issue
2016-09-06 17:36:52 -07:00
Atlante45
fcf44911a3
Fix Windows warning
2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57
Add settings to change local port
2016-09-06 10:18:42 -07:00
Stephen Birarda
85ba0f36cf
fix controllers/shared compile for android interface port
2016-08-31 16:34:31 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
Andrew Meadows
af1be8ccd4
remove whitespace
2016-08-24 22:25:45 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Anthony J. Thibault
7b248b440a
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-17 13:55:12 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
