samcake
c256893575
some clean up:
2017-05-23 18:00:22 -07:00
samcake
769655b354
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-23 14:45:37 -07:00
Seth Alves
83b3896c88
Merge pull request #10524 from huffman/fix/scriptengine-thread-crash
...
Fix crash in entity ScriptEngine
2017-05-23 14:01:42 -07:00
samcake
e7b808cbc1
Merging with upstream
2017-05-23 12:12:31 -07:00
Clément Brisset
499897e271
Merge pull request #10533 from thoys/fix/attachment-scale
...
Attachment Scale fix (Breaks previous set attachment scales)
2017-05-23 10:59:54 -07:00
Clément Brisset
ed86ca3e55
Merge pull request #10522 from birarda/bug/version-number-jumps
...
remove version difference from update dialog
2017-05-23 10:28:50 -07:00
Anthony Thibault
a7b9fbb461
Merge pull request #10513 from hyperlogic/feature/faster-ik-iterations
...
IK tuning and bug fixes
2017-05-23 10:00:03 -07:00
Thijs Wenker
962d95ca46
add more precision to attachment scale in attachment dialog
2017-05-23 18:16:08 +02:00
Anthony J. Thibault
06c26f029a
Merge branch 'master' into feature/faster-ik-iterations
2017-05-23 09:10:17 -07:00
Thijs Wenker
712aff7ad6
base scale attachment on the natural dimensions
2017-05-23 17:53:08 +02:00
Chris Collins
207c13c3c3
Merge pull request #10528 from AndrewMeadows/payload-gets-weak-pointer
...
MeshPartPayload keeps weak pointer to Model
2017-05-22 21:54:40 -07:00
Chris Collins
978eb0dfa9
Merge pull request #10492 from ctrlaltdavid/21359
...
Fix eye behavior in recording playback
2017-05-22 21:53:13 -07:00
Chris Collins
b0efb6d956
Merge pull request #10525 from seefo/master
...
Added refreshing of Account Managers access token
2017-05-22 21:42:16 -07:00
Sam Gateau
e4a516dcbf
Merge pull request #10497 from AndrewMeadows/crashfix-null-rig
...
fix crash for Zone with 'compoundURL' property
2017-05-22 18:18:08 -07:00
Brad Hefta-Gaub
3aeb8ae5e1
Merge pull request #10526 from birarda/bug/entity-server-script-whitelist
...
make server entity scripts respect the script whitelist
2017-05-22 17:58:04 -07:00
Andrew Meadows
f7db877b7f
payload keeps weak pointer to Model
2017-05-22 17:29:15 -07:00
seefo
a638704a8c
Modified AccountManager code to better meet style guidelines
2017-05-22 17:01:37 -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
Stephen Birarda
cecbf43129
make server entity scripts respect script whitelist
2017-05-22 16:17:01 -07:00
Ryan Huffman
3c9205d0b2
Remove invalid comment and unnecessary check from ScriptEngine
...
This removes an invalid comment - waitTillDoneRunning is not only called
from the main thread - and remove a check to make sure thread() is not
null because it should no longer be deleted before ScriptEngine.
2017-05-22 15:46:43 -07:00
Ryan Huffman
09c98b3ac3
Fix ScriptEngine thread being deleted too early
...
The thread appeared to be deleted before waitTillDoneRunning was
finished. This is a speculative fix. This ensures that the QThread isn't
deleted until after the ScriptEngine is deleted.
2017-05-22 15:31:11 -07:00
David Rowe
b0962865b2
Code review
2017-05-23 09:57:53 +12:00
David Rowe
9cb990a3aa
Simplify head simulation methods
2017-05-23 09:53:42 +12: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
seefo
e77e900812
Added refreshing of Account Manager's access token
...
Changed indentention style to match guidelines
2017-05-22 14:46:44 -07:00
Stephen Birarda
3e09c911f5
remove number of versions behind from the update dialog
2017-05-22 14:19:36 -07:00
David Rowe
9f83ca518f
Merge branch 'master' into 21359
2017-05-23 09:18:10 +12: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
David Rowe
a279d581ae
Fix code order
2017-05-20 12:56:23 +12:00
Sam Gateau
589bcc19ce
Refining the shader for key and testing removing completely the code dealing with Zone lighting in the ENtityTreeREnderer
2017-05-19 17:50:19 -07:00
David Rowe
768415695d
Tidying
2017-05-20 12:43:47 +12:00
David Rowe
eef707e4e9
Simplify code
2017-05-20 12:42:40 +12:00
David Rowe
d9baa337d8
Fix call order
2017-05-20 12:41:50 +12: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
David Rowe
597312ff45
Reinstate missing guards
2017-05-20 12:08:01 +12: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
Andrew Meadows
f80e7a3743
less obfuscation
2017-05-19 15:58:54 -07:00
