Andrzej Kapolka
df4fd9df5f
Remove translations for now, but use correct translation keys for the only
...
translations we had (days/weeks/etc.)
2014-04-03 11:30:06 -07:00
Stephen Birarda
cc199364e2
Merge pull request #2596 from ddobrev/master
...
Informed users who want to chat they have to log in first
2014-04-03 10:27:37 -07:00
Dimitar Dobrev
716858e6f6
Informed users who want to chat they have to log in first.
2014-04-03 20:09:54 +03:00
Andrew Meadows
7a602aedd1
Fix crash: don't simulate until geometry exists
2014-04-03 09:06:49 -07:00
Atlante45
4a1687c023
Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba
Manual merge
2014-04-02 18:07:55 -07:00
Andrew Meadows
db40a955c9
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:50:08 -07:00
Andrew Meadows
aad945c180
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:45:01 -07:00
Andrew Meadows
715f2c53d5
merge upstream/master into avatar-interaction
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:28:22 -07:00
Andrew Meadows
933cade6b0
Re-add fullUpdate hint to Model::simulate()
2014-04-02 16:34:33 -07:00
Andrew Meadows
97ba5250a5
Only simulate() Avatar Models when necessary
...
Also: rebuild collision shapes when Model scale changes
2014-04-02 12:01:18 -07:00
Atlante45
b73598ae8a
Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata
2014-04-02 11:40:41 -07:00
Atlante45
e60e1929f3
Review comments
2014-04-02 11:36:52 -07:00
Philip Rosedale
ca863e77f4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/interface_en.ts
2014-04-01 21:14:51 -07:00
Philip Rosedale
389091ace6
Merge pull request #2587 from matsukaze/nocrAudioFixes
...
Audio fixes for win OS.
2014-04-01 21:03:26 -07:00
matsukaze
d28d686ceb
Fix for missing voxel system on domain change. Fix for assertion failure thrown by Qt on exit.
2014-04-02 17:45:22 -07:00
matsukaze
f305b81655
Merge upstream master into audio fixes.
2014-04-02 17:34:41 -07:00
matsukaze
7542917922
Fix tab with space.
2014-04-02 14:22:17 -07:00
matsukaze
94a23b7ffc
Fix brace location and replace tab with space.
2014-04-02 14:15:20 -07:00
matsukaze
952ca928f1
More audio fixes. Fix audio buffer size on Win.
2014-04-02 12:28:22 -07:00
Philip Rosedale
e53bfe4ea1
Merge pull request #2585 from ey6es/master
...
Align forearms with wrists again, fix for annoying intermittent seg fault on Linux exit.
2014-04-01 20:59:51 -07:00
Andrew Meadows
515593e41c
modify avatar thrust during collisions
2014-04-01 17:25:26 -07:00
Philip Rosedale
0b792985d3
Tweaks to VU meter, tone injector, and fix to noise gate
2014-04-01 16:43:18 -07:00
Andrzej Kapolka
865ca7de20
Align forearms with wrists. Closes #2577 .
2014-04-01 16:01:29 -07:00
matsukaze
c3934d9e86
Fix heap corruption.
2014-04-01 15:49:08 -07:00
Philip Rosedale
36c41a1fd3
test other way of doing loudness
2014-04-01 15:35:46 -07:00
Andrew Meadows
b65855a384
merge upstream/master into avatar-interaction
2014-04-01 12:53:47 -07:00
Andrew Meadows
59bba99c6f
Resolve body-body collisions with other avatars
2014-04-01 12:48:17 -07:00
Atlante45
f87c82450a
Modified dialog default size
2014-04-01 12:20:08 -07:00
Atlante45
bdd5c291b0
Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata
2014-04-01 12:03:45 -07:00
Atlante45
03958f2fa0
work on metadata in the model browser + real time updates
2014-04-01 12:02:47 -07:00
Andrew Meadows
3d43956c11
bounding shape relative to model's root Joint
2014-04-01 11:39:40 -07:00
Andrew Meadows
9f9127b716
draw head bounding shape first
2014-04-01 11:39:24 -07:00
Andrzej Kapolka
fb37ef5bca
Fix for annoying intermittent seg fault on Linux exit. Closes #2542 .
2014-04-01 11:25:39 -07:00
Andrzej Kapolka
afb5711879
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-01 10:40:38 -07:00
Andrew Meadows
03d04e194d
Init bounding Extents for more correct shapes
2014-04-01 10:39:58 -07:00
AndrewMeadows
f12da05722
Merge pull request #2581 from Atlante45/more_upload_fixes
...
More upload fixes
2014-04-01 09:51:25 -07:00
AndrewMeadows
ff211dbc2b
Merge pull request #2573 from PhilipRosedale/master
...
Audio VU level meter to replace scope
2014-04-01 09:41:39 -07:00
Andrew Meadows
1bbdc9d78b
Adding bounding capsule shape for Model
...
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
2014-04-01 09:25:25 -07:00
Philip Rosedale
7d12fcee9d
220Hz tone injection option for easier audio quality checks
2014-03-31 21:55:29 -07:00
James Brotchie
19b8f101d8
Improved hifi:// style URL scheme handling.
...
First steps towards implementing #1463 .
- Moved url parsing code from Application::event to
Menu::goTo(QString).
- Handle destination component of URL as either a @username,
#place, or x-xx,y-yy,z-zz style coordinate.
- Added support for entering hifi:// style URL into @ invoked
goto menu option.
2014-04-01 11:31:43 +10:00
Philip Rosedale
81d1eb7ed2
removed unused procedural movement code
2014-03-31 18:24:58 -07:00
Andrzej Kapolka
929f08dec2
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-03-31 18:22:43 -07:00
Andrzej Kapolka
005ae79928
Various fixes and what-not, got the basic spanner clipping working.
2014-03-31 18:21:28 -07:00
Atlante45
77f5a50738
Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes
2014-03-31 17:19:45 -07:00
James Brotchie
da116608a0
Hitting enter no longer shows chat window when chat is disabled.
...
When chat is disabled (QXMPP library not available or XMPP disconnected)
hitting enter would show the chat window, even when the Tools -> Chat
menu item is grayed out!
2014-04-01 07:38:22 +10:00
Philip Rosedale
3babb5e0bf
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-31 07:25:46 -07:00
James Brotchie
6880160bc0
Remember most recently opened script location.
...
Previously when running a script from a file you were always taken back
to your desktop directory. Now you will be taken to the location of your
most recently opened script.
2014-03-31 22:08:38 +10:00
Philip Rosedale
27f0214032
first pass audio VU scope
2014-03-28 23:09:51 -07:00
Philip Rosedale
78ee8706d6
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-28 16:48:15 -07:00
