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
Brad Hefta-Gaub
881383a5f2
Merge pull request #2609 from AndrewMeadows/avatar-interaction
...
More details in JS collision events
2014-04-08 06:52:04 -10:00
Brad Hefta-Gaub
247d8bc540
Merge pull request #2571 from birarda/ds-web
...
put servers alphabetically first in node list
2014-04-08 06:32:59 -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
46f0e78039
Erased deprecated code
2014-04-07 17:28:03 -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
Atlante45
3be2319081
Removed all the temporaryDir junk
2014-04-07 16:18:23 -07:00
Andrzej Kapolka
2a58a863fd
Fix for rotation placement.
2014-04-07 15:48:34 -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
Andrew Meadows
79670563d4
AvatarData stores its sessionID
2014-04-07 14:42:49 -07:00
Atlante45
56b0583600
Fix for editVoxels/inspect conflict
2014-04-07 14:42:35 -07:00
Atlante45
262c6d3206
Fixed double JSON callback when http error occurs
2014-04-07 14:35:13 -07:00
Andrzej Kapolka
0011276b0b
Added back the download stats, which got lost in a merge.
2014-04-07 14:19:17 -07:00
Andrew Meadows
23c6873d99
Add Uuid object to ScriptEngine
2014-04-07 14:12:29 -07:00
Atlante45
e85703d25b
Added feedback and a better success check
2014-04-07 13:48:28 -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
Atlante45
cec99caa47
Added upload progress tracking to AccountManager via JSON
2014-04-07 13:45:30 -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
Stephen Birarda
5adcf68752
sort nodes on DS page by their uptime
2014-04-07 09:08:51 -07:00
Stephen Birarda
97a919a0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into ds-web
2014-04-07 08:45:51 -07:00
Thijs Wenker
4335ba7b5a
windows default device fix
2014-04-07 17:01:24 +02:00
ZappoMan
dfd6411a4f
add hooks for local audio echo, first cut at diffusion
2014-04-06 10:11:11 -07: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
ZappoMan
d198b04daf
lots of knobs and dials
2014-04-04 17:29:50 -07:00
ZappoMan
593fc6c963
lots of knobs and dials
2014-04-04 17:29:39 -07: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
468a4b79fd
Merge pull request #2603 from ey6es/master
...
Increase the rate at which we increase detail and put a limit on the LOD
2014-04-04 14:41:17 -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
ZappoMan
c35d6bdb0c
add reflection stats to stats display, add pre-delay, add toggle for separate ears, add surface randomness
2014-04-04 11:25:43 -07:00
Andrew Meadows
5e2b8bb2c3
connect SIGNAL to SIGNAL to avoid forwarding slot
2014-04-04 10:43:06 -07:00
