samcake
|
653abf0ee3
|
brining the new counters to 4.1
|
2017-05-22 17:34:06 -07:00 |
|
samcake
|
e0487f7e04
|
Solving the size evaluation for compressed format
|
2017-05-22 16:51:54 -07:00 |
|
Brad Davis
|
3995f539cf
|
Merge pull request #10500 from Atlante45/feat/bc7
Add BC7 compression support
|
2017-05-22 16:47:27 -07:00 |
|
samcake
|
e4f9f2935e
|
Solving the size evaluation for compressed format
|
2017-05-22 15:42:18 -07:00 |
|
Brad Davis
|
a5112ce52a
|
Merge pull request #10520 from jherico/texture_ping_pong
Prevent ping-ponging of texture quality when oversubscribed
|
2017-05-22 14:52:52 -07:00 |
|
anshuman64
|
bfb44693a3
|
Merge pull request #10482 from ctrlaltdavid/21361
Fix AC playback script not logging
|
2017-05-22 12:58:20 -07:00 |
|
samcake
|
f8c291ee78
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-22 10:56:00 -07:00 |
|
Brad Davis
|
afee753570
|
Prevent ping-ponging of texture quality when oversubscribed
|
2017-05-22 09:52:18 -07:00 |
|
Sam Cake
|
1f090d8148
|
Debugging the size problem and fixing the compression size evaluation
|
2017-05-22 01:00:34 -07:00 |
|
Seth Alves
|
4142d8c686
|
actions shouldn't change locked entities
|
2017-05-21 11:05:18 -07:00 |
|
Seth Alves
|
381de7a1e2
|
tabs
|
2017-05-21 08:42:53 -07:00 |
|
Seth Alves
|
c68efc2ed0
|
treat locked like other properties that affect simulation
|
2017-05-21 08:29:35 -07:00 |
|
Sam Cake
|
321f74c305
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-20 18:12:58 -07:00 |
|
Seth Alves
|
2512b39848
|
don't dirty motion-type if lock value isn't actually changing
|
2017-05-20 14:14:33 -07:00 |
|
Seth Alves
|
8f38ea8c6a
|
force locked entities to be static in bullet
|
2017-05-20 11:54:42 -07:00 |
|
samcake
|
56e9b1bb37
|
Adding the populated counter
|
2017-05-19 18:46:19 -07:00 |
|
samcake
|
c5b5aa93b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-19 18:13:42 -07:00 |
|
samcake
|
c449229850
|
Cleaned up the counters for memory
|
2017-05-19 17:52:56 -07:00 |
|
Clément Brisset
|
6e89f7d2f9
|
Merge pull request #10512 from Atlante45/fix/running-marker
Fix "Reset Settings" window poping up every time
|
2017-05-19 17:36:00 -07:00 |
|
Clément Brisset
|
fa3ef25f3e
|
Merge pull request #10481 from marko8904/new_landing_in_welcome
changing the location in welcome to which a user is sent on the first run
|
2017-05-19 16:45:14 -07:00 |
|
Ryan Huffman
|
26247e8653
|
Add check for valid mutableData in assignMipData
|
2017-05-19 15:00:53 -07:00 |
|
Ryan Huffman
|
64bf5784e6
|
Fix FileStorage to not close files after they are opened
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
|
2017-05-19 11:16:20 -07:00 |
|
Ryan Huffman
|
c36b85bb05
|
Add notes to KtxStorage::maybeOpenFile
|
2017-05-19 11:11:00 -07:00 |
|
Atlante45
|
c2e2682eff
|
Fix "Reset Settings" window poping up every time
|
2017-05-19 10:50:23 -07:00 |
|
Marko Kudjerski
|
986d63cdbb
|
making sure that the first time landing in *welcome domain is updated for dev builds too
|
2017-05-19 10:17:02 -07:00 |
|
Marko Kudjerski
|
303bb05b3d
|
changing the location in welcome to which a user is sent on the first run
|
2017-05-19 10:17:02 -07:00 |
|
Ryan Huffman
|
72af4219b8
|
Merge pull request #10499 from huffman/fix/ktx-progressive-image-size
Fix ktx image size in progrssively loaded cubemaps
|
2017-05-18 15:26:52 -07:00 |
|
Zach Pomerantz
|
c5a0a1af2f
|
Merge pull request #10429 from zzmp/audio/close-device
Close audio device when switching outputs
|
2017-05-18 17:18:53 -04:00 |
|
Atlante45
|
a8b1a29a4a
|
Add support for BC7 compression
|
2017-05-18 13:11:41 -07:00 |
|
samcake
|
9c154122d3
|
Introdicing the format factor and merging with master becasue of protocol change...
|
2017-05-18 13:08:13 -07:00 |
|
samcake
|
396924b4a5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 13:06:05 -07:00 |
|
Ryan Huffman
|
6d2d838510
|
Fix ktx image size in progrssively loaded cubemaps
The size being written was the full image size (size of all faces), when
it should have been the face size.
|
2017-05-18 11:46:14 -07:00 |
|
David Kelly
|
c2b140cc03
|
Merge pull request #10489 from davidkelly/dk/sequenceNumberForAvatarIdentity
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 10:09:42 -07:00 |
|
samcake
|
2c6e10fbe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 09:21:02 -07:00 |
|
Brad Hefta-Gaub
|
fbc32e5ba1
|
Merge pull request #10485 from samcake/orange
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
|
2017-05-18 08:47:58 -07:00 |
|
Brad Hefta-Gaub
|
014fd710de
|
Merge pull request #10490 from Atlante45/feat/settings-map
Enable Map/List storage in the settings
|
2017-05-17 21:24:04 -07:00 |
|
Seth Alves
|
b05cb4af3b
|
fix nan
|
2017-05-17 20:51:34 -07:00 |
|
Zach Pomerantz
|
e8ab780899
|
include details in critical variantMap parsing error
|
2017-05-17 21:32:13 -04:00 |
|
samcake
|
80b6fd65ae
|
Cleaning up counters and naming schemes...
|
2017-05-17 18:31:28 -07:00 |
|
Howard Stearns
|
95111d24b2
|
Merge branch 'master' into dk/sequenceNumberForAvatarIdentity
|
2017-05-17 17:09:47 -07:00 |
|
Brad Hefta-Gaub
|
c07eb3e45e
|
Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff
Flex and weight IK tuning parameters
|
2017-05-17 16:48:50 -07:00 |
|
Brad Hefta-Gaub
|
93f3b2df45
|
Merge pull request #10491 from birarda/bug/bearer-timeout
disable the bearer poll timeout
|
2017-05-17 16:24:17 -07:00 |
|
Anthony J. Thibault
|
0018224fef
|
moar warning fixes
|
2017-05-17 16:23:39 -07:00 |
|
Andrew Meadows
|
09433a93ba
|
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
More correct avatar mass
|
2017-05-17 16:22:06 -07:00 |
|
Brad Hefta-Gaub
|
0d3f7058ec
|
Merge pull request #10483 from AndrewMeadows/cap-velocities
cap scripted linear and angular velocity inputs
|
2017-05-17 16:15:42 -07:00 |
|
Stephen Birarda
|
2ac5fbf91d
|
set wireless scan interval to -1
|
2017-05-17 15:33:52 -07:00 |
|
Anthony J. Thibault
|
78dd30f656
|
macosx warning fix
|
2017-05-17 15:22:39 -07:00 |
|
Zach Fox
|
c5a5cad76d
|
Merge pull request #10487 from zfox23/removeExtraneousSendIdentity
Remove extraneous calls to sendIdentityPacket()
|
2017-05-17 15:20:09 -07:00 |
|
David Kelly
|
057718bde3
|
remove clockSkew, reference new version for Avatar packets
|
2017-05-17 15:14:56 -07:00 |
|
David Kelly
|
689a0b5bad
|
Switch from timestamp to sequence id for avatar identity
|
2017-05-17 14:22:36 -07:00 |
|