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
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
Andrzej Kapolka
a0c7e4d3cc
Working on model rendering modes.
2014-04-04 11:45:03 -07:00
Andrzej Kapolka
38022d2440
Fix for voxelizing models.
2014-04-04 00:33:33 -07:00
Andrzej Kapolka
1bf19111dc
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-03 23:57:30 -07:00
Andrzej Kapolka
dfaa98cc34
Blend when setting.
2014-04-03 23:51:49 -07:00
Andrzej Kapolka
d706e23012
Basic voxelization.
2014-04-03 23:47:31 -07:00
Atlante45
ba4ccc22ef
Changed FstReader name to ModelUploader
2014-04-03 16:19:33 -07:00
AndrewMeadows
4a98f9f159
Merge pull request #2485 from kordero/19498
...
Code Review for Job #19498
2014-04-03 12:58:47 -07:00
Lucas Crisman
793179dc72
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-04-03 16:24:32 -03:00
Andrzej Kapolka
061d7719d4
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-04-03 11:55:50 -07:00
Andrzej Kapolka
22710af111
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/interface_en.ts
2014-04-03 11:37:27 -07:00
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
Andrzej Kapolka
407a6ecc70
More work on voxelizing.
2014-04-03 11:26:54 -07:00
Atlante45
df718c430a
Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata
2014-04-03 11:20:24 -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
Andrzej Kapolka
4375fe85f1
Working on voxelizing spanners using a set of six rendered images.
2014-04-02 18:56:18 -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
Atlante45
c2f0545d96
Setup for actual metadata
2014-04-02 17:12:11 -07:00
Atlante45
cf20c448a3
Few tweaks before PR
2014-04-02 16:46:03 -07:00
Andrew Meadows
933cade6b0
Re-add fullUpdate hint to Model::simulate()
2014-04-02 16:34:33 -07:00
Atlante45
52df77b4b5
Final work on models metadata support
2014-04-02 16:25:35 -07:00
Lucas Crisman
76921d9b52
Merge branch 'master' of git://github.com/worklist/hifi into 19498
2014-04-02 17:18:27 -03: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
Lucas Crisman
1a468ab8ca
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-04-02 01:26:25 -03: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
