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
Liv
d50bdd6aa9
Initial check that the script url has a supported extension, currently JS only
2017-05-22 16:53:41 -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
David Kelly
ae54f9c80a
Should fix crash in general setting dialog
2017-05-22 16:25:21 -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
samcake
e4f9f2935e
Solving the size evaluation for compressed format
2017-05-22 15:42:18 -07:00
Stephen Birarda
841f8cb86b
make sure AvatarData objects have the node session ID
2017-05-22 15:33:57 -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
Seth Alves
3825830fac
if something is locked but in motion, make it kinematic rather than static
2017-05-22 14:07:53 -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
samcake
f8c291ee78
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-22 10:56:00 -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
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
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
Sam Cake
321f74c305
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-20 18:12:58 -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
Seth Alves
a442181859
remove some redundancy
2017-05-20 08:51:44 -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
David Rowe
a279d581ae
Fix code order
2017-05-20 12:56:23 +12:00
samcake
c449229850
Cleaned up the counters for memory
2017-05-19 17:52:56 -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
Seth Alves
a45b5599c9
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 17:37:03 -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
Seth Alves
40c8261111
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
2017-05-19 17:14:58 -07:00
Seth Alves
5c94147f40
children collision hulls appear to be in the right place, now
2017-05-19 17:09:42 -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
Dante Ruiz
ffcc3c8df9
going back to old lost tracking method
2017-05-20 00:06:54 +01:00
