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 |
|
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 |
|
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 |
|
ZappoMan
|
b9e73a6ef7
|
added delete support to edit models
|
2014-05-22 12:23:01 -07:00 |
|
Clément Brisset
|
e381f6d046
|
Merge pull request #2897 from AndrewMeadows/thermonuclear
Fix for bad bounding shape for multi-root models.
|
2014-05-22 12:14:42 -07:00 |
|
Andrew Meadows
|
b0c3655076
|
Fix for bad bounding shape for multi-root models.
|
2014-05-22 11:40:36 -07:00 |
|
Brad Hefta-Gaub
|
f0143f0c9f
|
Merge pull request #2896 from Atlante45/log_cleaning
Clean up log
|
2014-05-22 11:26:23 -07:00 |
|
Atlante45
|
ea1359c10f
|
Clean up log
|
2014-05-22 11:11:22 -07:00 |
|
Philip Rosedale
|
3aa999bfc3
|
Merge pull request #2895 from PhilipRosedale/master
Fly and move/turn using one controller and grab button
|
2014-05-22 10:33:34 -07:00 |
|
barnold1953
|
4036f929c9
|
Stopped access violation when erasing particles.
|
2014-05-22 10:31:30 -07:00 |
|
Philip Rosedale
|
5c564cb2cb
|
Added FWD button as grab controller (so PrioVR will work)
|
2014-05-22 09:55:08 -07:00 |
|
Philip Rosedale
|
f0a1d2a172
|
Move with grab button
|
2014-05-22 07:24:30 -07:00 |
|
AndrewMeadows
|
21b89b9940
|
Merge pull request #2894 from Barnold1953/master
Oculus camera mode and mirror view fixes
|
2014-05-21 17:58:38 -07:00 |
|
barnold1953
|
dad2788b8c
|
Moved 'I am looking at' ball to be immediately above name text, and reduced opacity
|
2014-05-21 17:45:17 -07:00 |
|
barnold1953
|
5b366fe714
|
Merge branch 'master' of https://github.com/highfidelity/hifi
Conflicts:
interface/src/Application.cpp
|
2014-05-21 16:01:28 -07:00 |
|
barnold1953
|
97c0a2fc98
|
Made mirror view remain constant no matter what the avatar scale is set to.
|
2014-05-21 15:32:23 -07:00 |
|
Brad Hefta-Gaub
|
0758611243
|
Merge pull request #2893 from ZappoMan/master
fix crash in model server when you attempt to create an unreasonably small model
|
2014-05-21 15:22:20 -07:00 |
|
Brad Hefta-Gaub
|
5e31489fd6
|
Merge pull request #2892 from ey6es/animenu
Allow setting masked joints for each animation. Fixed a couple compile warnings.
|
2014-05-21 15:14:37 -07:00 |
|
ZappoMan
|
f876a72b37
|
fix crash in model server when you attempt to create an unreasonably small model
|
2014-05-21 15:12:36 -07:00 |
|
Andrzej Kapolka
|
906e082215
|
If there are no animation frames in the model, treat its default position as
a single frame.
|
2014-05-21 13:56:20 -07:00 |
|
Andrzej Kapolka
|
8bb4ca19cd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
|
2014-05-21 12:48:20 -07:00 |
|
barnold1953
|
21f03a4fb5
|
Made oculus camera modes only active when AllowOculusCameraModeChange is checked.
|
2014-05-21 12:43:44 -07:00 |
|
Philip Rosedale
|
79ff87f7c5
|
Merge pull request #2891 from birarda/credits
initial pass at crediting ACs for work done
|
2014-05-21 12:09:48 -07:00 |
|
Stephen Birarda
|
e3ac7c5eec
|
rename assignment payment method for clarity
|
2014-05-21 12:07:23 -07:00 |
|
Andrzej Kapolka
|
709a9d75f6
|
Provide an option for the masked joints in the scriptable method, fix a couple
of annoying warnings.
|
2014-05-21 12:03:47 -07:00 |
|
Andrzej Kapolka
|
d4468364f9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
|
2014-05-21 11:58:46 -07:00 |
|
Andrzej Kapolka
|
0e15c82e49
|
Allow setting masked joints for each animation.
|
2014-05-21 11:58:20 -07:00 |
|
Philip Rosedale
|
67206af840
|
Merge pull request #2887 from ey6es/animenu
First pass at configurable animations for own avatar.
|
2014-05-21 11:39:16 -07:00 |
|
barnold1953
|
b5ad295756
|
Fixed improper coding style in previous pull request
|
2014-05-21 11:24:39 -07:00 |
|
barnold1953
|
3bc8e0f726
|
Made third person work with oculus
|
2014-05-21 11:21:12 -07:00 |
|
Stephen Birarda
|
98d1146e90
|
rename the pay for assignments option
|
2014-05-21 11:04:00 -07:00 |
|
Andrzej Kapolka
|
20a931178d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
|
2014-05-21 11:03:55 -07:00 |
|
Brad Hefta-Gaub
|
a88de84b1e
|
Merge pull request #2875 from binaryking/19666
Code Review for Job #19666
|
2014-05-21 11:02:29 -07:00 |
|
Andrzej Kapolka
|
6797d1ad81
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animenu
|
2014-05-21 11:02:05 -07:00 |
|
Stephen Birarda
|
b7727f0b16
|
require a flag to enable payment to assigned nodes
|
2014-05-21 11:02:02 -07:00 |
|