stojce
c9605be193
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-09 21:57:56 +02:00
stojce
7b26317eaf
Merge branch 'master' of https://github.com/worklist/hifi into 19548
2014-04-09 18:55:17 +02:00
stojce
ce85e67a42
Modify icons in Interface "mirror"
2014-04-09 18:54:59 +02:00
stojce
cc2f03fb49
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-09 08:19:41 +02:00
Brad Hefta-Gaub
dc89026215
Merge pull request #2607 from thoys/hifi-win-default-device-fix
...
windows default device fix
2014-04-08 15:30:02 -10:00
Andrzej Kapolka
597d750af9
Better radius.
2014-04-08 15:25:10 -07:00
Andrzej Kapolka
083e9076a9
Missed a spot.
2014-04-08 15:17:05 -07:00
Andrzej Kapolka
faf8c35358
Head height's kind of screwy; let's use the eye position.
2014-04-08 15:01:56 -07:00
Andrzej Kapolka
add7bb26ed
Use the head height to determine the pushback amount.
2014-04-08 14:55:46 -07:00
Andrzej Kapolka
5776514e6a
Working on pushing the mirror camera back to prevent intersecting the near
...
clip plane. Closes #2617 .
2014-04-08 14:48:01 -07:00
Thijs Wenker
6754a6ca69
Fixed some style
2014-04-08 23:45:27 +02: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
Brad Hefta-Gaub
c865df8b82
Merge pull request #2613 from Atlante45/more_upload_work
...
More upload work
2014-04-08 08:16:07 -10:00
Andrzej Kapolka
ccd7106527
Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows
...
build.
2014-04-08 10:54:41 -07:00
Atlante45
eaca699a6d
Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work
2014-04-08 10:35:23 -07:00
Andrzej Kapolka
d4706bba8a
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-08 10:21:13 -07:00
Atlante45
174f37f531
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub
2988239aed
Merge pull request #2615 from ey6es/master
...
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
2014-04-08 07:20:00 -10:00
Andrzej Kapolka
5a61009099
Add metavoxel bandwidth to details.
2014-04-08 10:19:39 -07:00
Andrzej Kapolka
a157c67901
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-08 09:56:07 -07:00
Brad Hefta-Gaub
aad3085e08
Merge pull request #2611 from AndrewMeadows/avatar-speed
...
fix for sometimes slow avatar
2014-04-08 06:54:21 -10:00
Andrzej Kapolka
fa05a48270
Provide a means of supplying the joint mappings in the FST file so that agent
...
scripts can address joints by name. Closes #2526 .
2014-04-07 17:55:36 -07:00
Atlante45
d213cd7840
More work on Undo/Redo
2014-04-07 17:10:15 -07:00
Atlante45
d7b3c8b8fa
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
2014-04-07 17:02:00 -07:00
Andrew Meadows
bf0eb69e2c
fix for sometimes slow avatar
2014-04-07 16:28:55 -07:00
Andrzej Kapolka
15e9d45dc3
Switched from storing Euler angles to using quaternions along with a
...
quaternion editor. Also, use a default step of 0.01 for floats/doubles.
2014-04-07 15:41:42 -07:00
Andrzej Kapolka
0011276b0b
Added back the download stats, which got lost in a merge.
2014-04-07 14:19:17 -07:00
Atlante45
b21fe02fa2
Put ModelUploder on a different thread, not to block the rendering of the main window
2014-04-07 13:46:38 -07:00
Andrew Meadows
84d7e39d72
merge upstream/master into avatar-interaction
2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f
Add Collision metatype to JS script system
2014-04-07 10:03:10 -07:00
Thijs Wenker
e9922b6db9
windows default device fix:
...
- fixed tabs>spaces
- doesn't require atlbase anymore, so works on visual studio express
2014-04-07 18:50:13 +02:00
Thijs Wenker
4335ba7b5a
windows default device fix
2014-04-07 17:01:24 +02:00
stojce
dd5a198740
Models browser fixes
2014-04-06 16:13:15 +02:00
stojce
ba5a092ad7
Frameless dialog position/size fixes
...
Fixed frameless dialog size and position on main window resize and move
2014-04-06 15:30:30 +02:00
stojce
b45f61ec54
Merge branch 'master' of https://github.com/worklist/hifi into 19508
2014-04-05 16:29:57 +02:00
Andrzej Kapolka
404b804b2f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 16:41:43 -07:00
Andrzej Kapolka
2d535f3b86
Removed debugging code.
2014-04-04 16:36:58 -07:00
Andrzej Kapolka
d2b0cc43dd
Extent tweaks.
2014-04-04 16:32:14 -07:00
Andrzej Kapolka
72d09a5cbe
Merge pull request #2605 from AndrewMeadows/say-no-to-warnings
...
removing a warning about hidden virtual override
2014-04-04 16:00:57 -07:00
Andrzej Kapolka
1c822542c1
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 15:29:13 -07:00
Andrzej Kapolka
10288bce35
Merge pull request #2604 from AndrewMeadows/oculus-with-thrust
...
fix #2567 thrust + oculus doesn't change body rotation
2014-04-04 15:19:44 -07:00
Andrzej Kapolka
1f3a5d09d9
Merge pull request #2593 from Atlante45/display_models_metadata
...
Display models metadata
2014-04-04 15:18:18 -07:00
Andrew Meadows
403ad5e984
removing a warning about hidden virtual override
2014-04-04 15:18:12 -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
Andrew Meadows
01c42c741c
fix #2567 thrust + oculus doesn't change body rot
2014-04-04 14:46:54 -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
a2b94aa433
Working on render modes.
2014-04-04 14:22:01 -07:00
Andrzej Kapolka
550a8fdb99
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-04 13:00:51 -07:00
stojce
8dc6ca75a4
Merge branch 'master' of https://github.com/worklist/hifi into 19508
...
Conflicts:
interface/interface_en.ts
interface/resources/resources.qrc
interface/src/Menu.cpp
2014-04-04 21:16:29 +02:00
Andrzej Kapolka
a0c7e4d3cc
Working on model rendering modes.
2014-04-04 11:45:03 -07:00
