Andrzej Kapolka
f707719f4e
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
2014-04-09 15:34:29 -07:00
Andrzej Kapolka
55e0035fc8
More progress on Faceplus integration.
2014-04-09 11:14:47 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Brad Hefta-Gaub
8e097be28d
Merge pull request #2614 from Atlante45/undo_redo_system
...
Undo redo system
2014-04-08 08:30:29 -10:00
Atlante45
d213cd7840
More work on Undo/Redo
2014-04-07 17:10:15 -07:00
Andrzej Kapolka
1c822542c1
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 15:29:13 -07:00
Atlante45
a0e70d0d2a
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
2014-04-04 14:53:12 -07:00
Andrzej Kapolka
3a125db1f8
Increase the rate at which we increase detail and put a limit on the LOD
...
multiplier so that it never takes more than about five seconds to return to
default detail. Also, since there seems to be a weird issue where OS X
throttles the frame rate to 30 fps (independent of our own throttling), use
that as the lower adjustment range.
2014-04-04 14:31:30 -07:00
Andrzej Kapolka
a0c7e4d3cc
Working on model rendering modes.
2014-04-04 11:45:03 -07:00
Atlante45
d3ce2c7640
Added undo/redo support to the client
2014-04-03 16:51:08 -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
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
b65855a384
merge upstream/master into avatar-interaction
2014-04-01 12:53:47 -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
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
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
27f0214032
first pass audio VU scope
2014-03-28 23:09:51 -07:00
Dimitar Dobrev
9b43508098
Restored code that Git had somehow deleted.
2014-03-28 19:26:16 +02:00
Dimitar Dobrev
6fd1bf7edb
Simplified the new goToUser function.
2014-03-28 18:44:06 +02:00
Dimitar Dobrev
3907c563df
Put the chat window above the 3D view and animated its showing.
2014-03-28 18:36:53 +02:00
Dimitar Dobrev
a48ca65236
Enabled going to the clicked user in the chat.
2014-03-28 18:36:53 +02:00
Andrzej Kapolka
077df3906f
Make sure we reset our LOD adjustments before we switch back from throttling
...
the renderer.
2014-03-27 15:02:26 -07:00
Andrzej Kapolka
9078d9a0f2
Fix for avatar LOD's getting into a degenerate state. Don't persist the
...
avatar LOD, since we adjust it more rapidly.
2014-03-27 14:14:31 -07:00
Atlante45
11f40258b3
Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes
2014-03-27 10:12:34 -07:00
Andrzej Kapolka
26da3bcefd
Bump up the rate at which we increase detail.
2014-03-26 16:28:03 -07:00
Andrzej Kapolka
1cae0dc94c
Adjust avatar LOD faster. Closes #2496 .
2014-03-26 16:01:07 -07:00
Atlante45
718b8f7eb9
Changed back to upload either head or skeleton
2014-03-26 15:07:19 -07:00
AndrewMeadows
5551396a7b
Merge pull request #2480 from ZappoMan/scripting_improvements
...
Scripting improvements
2014-03-25 10:49:14 -07:00
ZappoMan
c34b64e296
add load script from URL support
2014-03-25 00:17:19 -07:00
Andrzej Kapolka
81ae18a3bf
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-24 17:25:34 -07:00
Andrzej Kapolka
47f0af818a
Adjust avatar LOD more aggressively: raise detail slowly when above our target
...
window, lower it in proportion to the ratio between desired and actual rates.
2014-03-24 16:45:44 -07:00
ZappoMan
778209ffe4
fix bug in Menu.removeMenu() for trees of menus
2014-03-24 16:28:07 -07:00
ZappoMan
938959a9f6
expose application settings to JS
2014-03-22 21:20:35 -07:00
ZappoMan
a56b7e341d
reorganize files in interface directory
2014-03-22 20:22:05 -07:00
Atlante45
e68500e11f
Made models line edit editable
2014-03-20 12:49:51 -07:00
Atlante45
c658b1dded
Modified menu upload categories
2014-03-20 12:45:19 -07:00
AndrewMeadows
144f86b540
Merge pull request #2370 from Atlante45/model_browsing
...
Model browsing
2014-03-20 11:15:35 -07:00
Atlante45
a80f81c246
typo
2014-03-18 17:48:17 -07:00
Atlante45
76c2a9fdad
Modified Browser to be able to dowload all the fst file when there are more than 1000
2014-03-18 17:36:05 -07:00
Ryan
07497ea4f7
removing fly to voxel option
2014-03-18 15:35:25 -07:00
