Brad Hefta-Gaub
|
861a48f6f9
|
Merge pull request #2911 from ey6es/master
Use local viewer model for specular.
|
2014-05-23 11:35:40 -07:00 |
|
Brad Hefta-Gaub
|
10b0471641
|
Merge pull request #2906 from Barnold1953/master
Write thread safety for Overlays QMaps
|
2014-05-23 11:34:02 -07:00 |
|
Brad Hefta-Gaub
|
fe79fa3de2
|
Merge pull request #2910 from wangyix/master
fix for skipped sequenceNumber bug in OctreeQueryNode
|
2014-05-23 11:30:50 -07:00 |
|
wangyix
|
fe5fabdd61
|
removed old code that was commented out
changed tabs to spaces
|
2014-05-23 11:17:59 -07:00 |
|
barnold1953
|
6817c9682e
|
Added a new lock specific to deleting, and improved safety
|
2014-05-23 11:17:55 -07:00 |
|
Andrzej Kapolka
|
bfd00f1b15
|
Use local viewer model for specular.
|
2014-05-23 10:57:14 -07:00 |
|
barnold1953
|
9553271fa1
|
Added some missing locks to make Overlays thread safe for reading as well.
|
2014-05-23 10:44:40 -07:00 |
|
wangyix
|
87d927d447
|
moved _sequenceNumber back to OctreeQueryNode
instead added incrementSequenceNumber() to OctreeQueryNode for
sendthread to use
|
2014-05-23 10:09:46 -07:00 |
|
wangyix
|
a6d0384c3b
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-23 10:08:46 -07:00 |
|
Philip Rosedale
|
22548b9956
|
Merge pull request #2909 from PhilipRosedale/master
add visual indicator of thrust direction
|
2014-05-23 09:58:55 -07:00 |
|
Philip Rosedale
|
6998dfae3c
|
add visual indicator of thrust direction
|
2014-05-23 09:57:47 -07:00 |
|
AndrewMeadows
|
3a638cc447
|
Merge pull request #2905 from ey6es/animenu
Added animation controls for start/stop frames, loop/hold flags, "start automatically," roles (with script commands to start/stop by role).
|
2014-05-23 09:52:54 -07:00 |
|
AndrewMeadows
|
18046c9e9a
|
Merge pull request #2907 from PhilipRosedale/master
Velocity damped hand positions
|
2014-05-23 09:50:39 -07:00 |
|
wangyix
|
645002493f
|
Merge remote-tracking branch 'upstream/master'
|
2014-05-23 09:48:05 -07:00 |
|
wangyix
|
2dd78b36db
|
moved _sequenceNumber to OctreeSendThread
|
2014-05-23 09:47:08 -07:00 |
|
Andrzej Kapolka
|
4d6e8a2c9e
|
Or rather, replaceMatchingPriorities.
|
2014-05-23 09:42:36 -07:00 |
|
Andrzej Kapolka
|
09ba25bde5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
|
2014-05-23 09:40:35 -07:00 |
|
Leonardo Murillo
|
c4e807d3d9
|
Merge pull request #2908 from murillodigital/master
Revert "Initialise lisencing manager after we have enabled Visage."
|
2014-05-23 09:44:23 -06:00 |
|
Leonardo Murillo
|
f7f4c48b9b
|
Revert "Initialise lisencing manager after we have enabled Visage."
This reverts commit 061f182fab.
|
2014-05-23 08:40:41 -06:00 |
|
Philip Rosedale
|
2681312b54
|
Velocity damped hand positions
|
2014-05-23 00:09:15 -07:00 |
|
barnold1953
|
e33cdedeef
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-05-22 17:56:01 -07:00 |
|
barnold1953
|
3a45104793
|
Made overlays thread safe for write operations, which solved a script
crash.
|
2014-05-22 17:55:25 -07:00 |
|
Andrzej Kapolka
|
945112da30
|
Merge pull request #2904 from birarda/credits
display user's credit balance in window title
|
2014-05-22 17:32:59 -07:00 |
|
Stephen Birarda
|
4f81bac742
|
add back a missing space in AccountManager
|
2014-05-22 17:16:42 -07:00 |
|
Stephen Birarda
|
6d500d64d1
|
fix floats that aren't actually floats
|
2014-05-22 17:12:22 -07:00 |
|
Andrzej Kapolka
|
a32dfdb7bb
|
We should let people "start" even if the animation is already playing (to
start again from the beginning). Fixed an issue with competing priorities.
|
2014-05-22 17:05:28 -07:00 |
|
Andrzej Kapolka
|
5b65406012
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
|
2014-05-22 16:42:09 -07:00 |
|
Andrzej Kapolka
|
2a50b5451f
|
Script commands to start/stop animations by role.
|
2014-05-22 16:41:51 -07:00 |
|
Andrzej Kapolka
|
8458477b9f
|
Fixed a compile warning, provide means to start/stop animations.
|
2014-05-22 16:15:34 -07:00 |
|
Stephen Birarda
|
4a8b390da0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into credits
|
2014-05-22 15:34:28 -07:00 |
|
Stephen Birarda
|
fc9d850c40
|
output when pay-for-assignments is on
|
2014-05-22 15:33:06 -07:00 |
|
Stephen Birarda
|
40c59a3589
|
fix rate of payment for assignments
|
2014-05-22 15:10:41 -07:00 |
|
Stephen Birarda
|
164d3c5fb3
|
make sure balance is cleared on logout and re-launch
|
2014-05-22 15:06:16 -07:00 |
|
Andrzej Kapolka
|
083543419d
|
More priority bits.
|
2014-05-22 15:00:36 -07:00 |
|
Stephen Birarda
|
79f09605d5
|
show credit balance in window title
|
2014-05-22 14:55:43 -07:00 |
|
Clément Brisset
|
5eeef647cf
|
Merge pull request #2903 from ZappoMan/deletemodel
also support deleting mouse selected model
|
2014-05-22 14:43:33 -07:00 |
|
Andrzej Kapolka
|
8717977437
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
|
2014-05-22 14:42:23 -07:00 |
|
Andrzej Kapolka
|
d4af39a9f5
|
Working on handling animation priorities to prevent Hydra move/restore from
interfering with scripted animations.
|
2014-05-22 14:41:46 -07:00 |
|
ZappoMan
|
519f5539d9
|
also support deleting mouse selected model
|
2014-05-22 14:37:34 -07:00 |
|
Leonardo Murillo
|
60dfa08b30
|
Merge pull request #2902 from birarda/master
change node auth URL to data.highfidelity.io
|
2014-05-22 15:30:44 -06:00 |
|
Brad Hefta-Gaub
|
5964cb9c96
|
Merge pull request #2901 from polac/19671_proposal
Initialise lisencing manager after we have enabled Visage.
|
2014-05-22 14:28:20 -07:00 |
|
Brad Hefta-Gaub
|
69873cd96e
|
Merge pull request #2899 from Barnold1953/master
Particle and script editor crash fixes.
|
2014-05-22 14:27:35 -07:00 |
|
Stephen Birarda
|
01e8d775f2
|
change node auth URL to data.highfidelity.io
|
2014-05-22 14:24:19 -07:00 |
|
barnold1953
|
a48c6b82e2
|
Fixed my mistake by unlocking the lock.
|
2014-05-22 14:17:26 -07:00 |
|
Brad Hefta-Gaub
|
497335cbc1
|
Merge pull request #2900 from ZappoMan/deletemodel
fix broken mouse edit
|
2014-05-22 13:01:27 -07:00 |
|
ZappoMan
|
b5056dcd3a
|
fix broken mouse edit
|
2014-05-22 13:01:02 -07:00 |
|
barnold1953
|
f069b70563
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-05-22 12:46:39 -07:00 |
|
barnold1953
|
5013c8c2fa
|
Fixed script editor crash when script calls Script.stop(). Also made the
processEraseMessage wait until it can lock to ensure particles are
deleted.
|
2014-05-22 12:45:36 -07:00 |
|
Clément Brisset
|
2c484794ad
|
Merge pull request #2898 from ZappoMan/deletemodel
added delete support to edit models
|
2014-05-22 12:45:21 -07:00 |
|
ZappoMan
|
66b9d582a8
|
fix broken mouse edit
|
2014-05-22 12:43:23 -07:00 |
|