Liv
|
e9fac38bbb
|
Add function hasValidScriptSuffix and check if script extensions are JavaScript or JSON files
|
2017-05-23 13:08:50 -07:00 |
|
Liv
|
1fa3e6bda2
|
Revert "Initial check that the script url has a supported extension, currently JS only"
This reverts commit d50bdd6aa9.
|
2017-05-22 17:47:16 -07:00 |
|
Liv
|
0e6f3e27d3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into check-extension-running-scripts
|
2017-05-22 17:41:28 -07:00 |
|
Liv
|
d50bdd6aa9
|
Initial check that the script url has a supported extension, currently JS only
|
2017-05-22 16:53:41 -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 |
|
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 |
|
Brad Davis
|
642ef7083b
|
Merge pull request #10518 from ctrlaltdavid/add-unpublished-scripts
Add unpublishedScripts content to the JS project
|
2017-05-22 12:26:52 -07:00 |
|
Andrew Meadows
|
a9665d1a25
|
Merge pull request #10519 from sethalves/locked-entities-are-static
treat locked like other properties that affect simulation
|
2017-05-22 10:43:52 -07:00 |
|
Brad Davis
|
afee753570
|
Prevent ping-ponging of texture quality when oversubscribed
|
2017-05-22 09:52:18 -07:00 |
|
Seth Alves
|
4142d8c686
|
actions shouldn't change locked entities
|
2017-05-21 11:05:18 -07:00 |
|
Seth Alves
|
e7231dd1f9
|
Merge branch 'master' of github.com:highfidelity/hifi into locked-entities-are-static
|
2017-05-21 11:05:03 -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 |
|
David Rowe
|
727ba1320a
|
Add unpublishedScripts content to the JS project
|
2017-05-21 11:15:51 +12:00 |
|
Brad Hefta-Gaub
|
c24561ec96
|
Merge pull request #10517 from sethalves/locked-entities-are-static
force locked entities to be static in bullet
|
2017-05-20 14:46:26 -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 |
|
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 |
|
Chris Collins
|
22aca527af
|
Merge pull request #10516 from zfox23/incrementAgentIdentitySequenceId
Increment _identitySequenceId before sending ID packet for agents
|
2017-05-19 17:04:37 -07:00 |
|
Zach Fox
|
487319f7ef
|
Increment _identitySequenceId before sending ID packet for agents
|
2017-05-19 16:53:25 -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
|
daff53aefb
|
Merge pull request #10505 from huffman/feat/tutorial-update-skybox
Update content set URL for RC40
|
2017-05-19 15:32:27 -07:00 |
|
Ryan Huffman
|
26247e8653
|
Add check for valid mutableData in assignMipData
|
2017-05-19 15:00:53 -07:00 |
|
Zach Fox
|
5e8f120138
|
Merge pull request #10510 from zfox23/snapshots_ImproveUploadRobustness
Ensure snapshots without story_ids get uploaded
|
2017-05-19 11:57:21 -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 |
|
Zach Fox
|
6765451cc8
|
Ensure snapshots without story_ids get uploaded
|
2017-05-19 10:36:31 -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 |
|
Chris Collins
|
76a025aade
|
Merge pull request #10507 from Atlante45/merge-back
Merge Stable back into master
|
2017-05-19 06:58:10 -07:00 |
|
Atlante45
|
ee9b98ffd7
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-05-18 17:11:45 -07:00 |
|
Ryan Huffman
|
eb9acad42e
|
Update content set URL for RC40
|
2017-05-18 16:36:01 -07:00 |
|
Zach Fox
|
48200fbd07
|
Merge pull request #10501 from zfox23/snapshots_disableWhileProcessing
Prevent another GIF from being captured while one is processing
|
2017-05-18 15:53:57 -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 |
|
Chris Collins
|
625bcdfd7e
|
Merge pull request #10498 from highfidelity/RC-39.3-HOTFIX
Build 39.3 Hotfix for T-Pose avatars
|
2017-05-18 14:57:57 -07:00 |
|
Zach Fox
|
8efac1e7f1
|
Prevent another GIF from being captured while one is processing
|
2017-05-18 14:30:08 -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 |
|
Clément Brisset
|
55b5f08714
|
Merge pull request #10465 from Atlante45/fix/domain-settings
Fix domain settings not getting cleared on re-assignment
|
2017-05-18 14:16:35 -07:00 |
|
Atlante45
|
9044cb40d5
|
Compress Default Skybox with BC7
|
2017-05-18 13:13:40 -07:00 |
|
Atlante45
|
a8b1a29a4a
|
Add support for BC7 compression
|
2017-05-18 13:11:41 -07:00 |
|
David Kelly
|
df5928c04a
|
remove clockSkew, reference new version for Avatar packets
|
2017-05-18 11:47:53 -07:00 |
|
David Kelly
|
1fcf3b3a5f
|
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 11:47:44 -07:00 |
|
Zach Fox
|
8213a1b280
|
First pass - checking performance
|
2017-05-18 11:47:27 -07:00 |
|
howard-stearns
|
7ec073dce4
|
Ensure avatar identity packet at mixer.
|
2017-05-18 11:47:07 -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 |
|
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 |
|
Chris Collins
|
9dcb3a3845
|
Merge pull request #10495 from highfidelity/RC-39.2-Hotfix
Build 39.1 Hotfix for 30 second wifi check causing an issue with Audio
|
2017-05-18 05:39:44 -07:00 |
|