Seth Alves
|
c8cdad5b4e
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-08 11:02:42 -07:00 |
|
Seth Alves
|
fd238f5438
|
working on fixing action/constraint export/import
|
2017-05-08 11:02:35 -07:00 |
|
Clément Brisset
|
8df8ed568f
|
Merge pull request #10342 from huffman/feat/tutorial-update
DNM Tutorial update
|
2017-05-08 10:54:19 -07:00 |
|
Chris Collins
|
4bfb23b5d2
|
Merge pull request #10388 from humbletim/21308
CR #21308 Fix Script.print
|
2017-05-08 10:46:49 -07:00 |
|
Chris Collins
|
1264c34f6c
|
Merge pull request #10349 from birarda/machine-guid-fingerprint
use MachineGuid for slightly safer windows machine fingerprint
|
2017-05-08 10:42:14 -07:00 |
|
Chris Collins
|
d88d52cd2e
|
Merge pull request #9735 from humbletim/21190-fix-unit-tests
CR 21190 unit_tests: add support for jasmine.done() and pending
|
2017-05-08 09:19:01 -07:00 |
|
Chris Collins
|
0351ac1575
|
Merge pull request #10401 from jherico/fix_benny_hill_animations
Fix sped up animations
|
2017-05-08 09:11:23 -07:00 |
|
Chris Collins
|
b4118e5619
|
Merge pull request #10394 from zzmp/fix/local-audio-prep
Guard against local audio crashes
|
2017-05-08 09:04:41 -07:00 |
|
Seth Alves
|
cfe118e2c6
|
start on code to remap constraint IDs during import
|
2017-05-07 19:42:24 -07:00 |
|
Seth Alves
|
7a1a9d6496
|
start on code to remap constraint IDs during import
|
2017-05-07 19:42:04 -07:00 |
|
Brad Davis
|
b63015eaea
|
Fix sped up animations
|
2017-05-06 14:34:28 -07:00 |
|
Seth Alves
|
5d539bcc17
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-06 07:49:02 -07:00 |
|
Seth Alves
|
9e0845f17e
|
Merge pull request #10387 from vladest/tablet-performance
Decrease CPU usage in tabletUI periodical updates
|
2017-05-06 07:07:29 -07:00 |
|
Vladyslav Stelmakhovskyi
|
b2be22f0e0
|
Maerge broke the logic. Fixed now
|
2017-05-06 10:28:57 +02:00 |
|
Clément Brisset
|
37f339858e
|
Merge pull request #10397 from huffman/feat/baked-tutorial
Update content set URL
|
2017-05-05 17:34:41 -07:00 |
|
Chris Collins
|
0a16831395
|
Merge pull request #10396 from Atlante45/master
Stable -> Master
|
2017-05-05 16:47:51 -07:00 |
|
Ryan Huffman
|
4895f51dc1
|
Update content set URL
|
2017-05-05 16:41:32 -07:00 |
|
Chris Collins
|
820ed5049b
|
Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
Fix -- dont send non-entity edits to entity-server
|
2017-05-05 16:37:27 -07:00 |
|
Atlante45
|
d4bd145786
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-05-05 16:36:21 -07:00 |
|
Zach Pomerantz
|
7db404eba0
|
recast avoid overwriting buffer logic
|
2017-05-05 18:16:48 -04:00 |
|
Zach Pomerantz
|
ed3fc004a6
|
avoid assignment-as-test
|
2017-05-05 18:15:56 -04:00 |
|
Seth Alves
|
b2ccc33a79
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-05 14:52:07 -07:00 |
|
Clément Brisset
|
479e810173
|
Merge pull request #10364 from huffman/fix/ktx-skybox-loading
Fix progressive loading of KTX skybox textures
|
2017-05-05 14:11:03 -07:00 |
|
Zach Pomerantz
|
48af83a960
|
guard against audio injector and local buffer datarace
|
2017-05-05 17:05:40 -04:00 |
|
Zach Fox
|
6b00688289
|
Merge pull request #10392 from zfox23/AvailabilityLanguageChanges
"Set Availability" UI changes
|
2017-05-05 14:03:39 -07:00 |
|
Zach Pomerantz
|
cdf6c332a6
|
prevent overflow of local injectors buffer
|
2017-05-05 16:29:52 -04:00 |
|
Zach Pomerantz
|
e882e7b648
|
rm extra lock in audio read
|
2017-05-05 15:37:01 -04:00 |
|
Zach Fox
|
a10606b994
|
OMG language changed again
|
2017-05-05 11:44:59 -07:00 |
|
Zach Fox
|
905f36976f
|
New language
|
2017-05-05 11:28:49 -07:00 |
|
Howard Stearns
|
f676c84477
|
Merge pull request #10393 from howard-stearns/announcement-card-tweak
Announcement Card visual tweaks.
|
2017-05-05 11:22:10 -07:00 |
|
howard-stearns
|
2ecc71a990
|
Annoncement Card visual tweeks.
|
2017-05-05 10:49:09 -07:00 |
|
Zach Fox
|
b41fb952ae
|
UI changes - Thanks Alan!
|
2017-05-05 10:29:46 -07:00 |
|
Chris Collins
|
fd836dcd68
|
Merge pull request #10366 from Atlante45/feat/normal-map-compression
Feat/normal map compression
|
2017-05-05 10:03:01 -07:00 |
|
Chris Collins
|
8d49540f3a
|
Merge pull request #10380 from vladest/rightclick-fix
Rightclick fix
|
2017-05-05 10:01:11 -07:00 |
|
Andrew Meadows
|
f809afae2f
|
Merge pull request #10363 from jherico/qmlspam
Removing logspam on toggling scripts window
|
2017-05-05 08:29:12 -07:00 |
|
humbletim
|
25807a5258
|
fix warning color
|
2017-05-05 09:48:24 -04:00 |
|
Vladyslav Stelmakhovskyi
|
e395a51c60
|
Merge with master
|
2017-05-05 07:05:16 +02:00 |
|
Seth Alves
|
7f4399b0a3
|
fix name in entity-edit-an-overlay warning
|
2017-05-04 19:16:15 -07:00 |
|
Seth Alves
|
9ee6badc86
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-04 19:06:13 -07:00 |
|
Seth Alves
|
92966377fb
|
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-04 19:05:57 -07:00 |
|
Seth Alves
|
900fae30fd
|
avoid calling editEntity on overlays
|
2017-05-04 19:05:52 -07:00 |
|
Seth Alves
|
a7c684e007
|
entity scripting call to get the nestable-type of an object, by id
|
2017-05-04 19:05:29 -07:00 |
|
Seth Alves
|
51cb579773
|
function to turn nestable-type into a string
|
2017-05-04 19:05:01 -07:00 |
|
Seth Alves
|
70efe4aa4f
|
avoid calling editEntity on overlays
|
2017-05-04 18:52:17 -07:00 |
|
Seth Alves
|
d25db099b9
|
be more effecient about ignoring edits to unknown entities
|
2017-05-04 18:49:46 -07:00 |
|
Seth Alves
|
0406cc41e0
|
if model-overlay has no name, use its url
|
2017-05-04 18:37:04 -07:00 |
|
Seth Alves
|
c04c0c5b13
|
if model-overlay has no name, use its url
|
2017-05-04 18:36:51 -07:00 |
|
Howard Stearns
|
d9540d7ece
|
Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3
Lots of Snapshot app improvements, Round Three
|
2017-05-04 17:05:37 -07:00 |
|
Seth Alves
|
960bab6e4e
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
|
2017-05-04 16:42:57 -07:00 |
|
humbletim
|
c17d1a6d88
|
manually promote glm values to double when stringifying (to prevent -Wdouble-promotion "error")
|
2017-05-04 19:21:32 -04:00 |
|