Craig Hansen-Sturm
1cdb01e072
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise
2014-09-05 18:31:02 -07:00
Craig Hansen-Sturm
68fa44f845
audio menu changes to support tone and noise generators
2014-09-05 18:30:39 -07:00
Andrzej Kapolka
c9d22ea07e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-09-05 18:04:15 -07:00
Andrew Meadows
bd8fc75305
fix bug: zero velocity when teleporting to new locations
2014-09-05 17:51:18 -07:00
Andrzej Kapolka
0b2d0a0b07
Fix for mouse events.
2014-09-05 17:30:19 -07:00
Andrew Meadows
1d7ac23aa1
removed signed/unsigned comparison
2014-09-05 17:10:13 -07:00
Andrzej Kapolka
c2cd23a54c
Mouse coordinate fix.
2014-09-05 17:07:37 -07:00
Andrew Meadows
5c75b53c0d
removed singed/unsigned comparisons
2014-09-05 17:06:42 -07:00
Andrzej Kapolka
5bdad18ade
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-09-05 16:45:15 -07:00
Andrzej Kapolka
7f6b3d3649
Dimension fixes for Retina displays.
2014-09-05 16:44:45 -07:00
Philip Rosedale
b311017c9a
Merge pull request #3361 from AndrewMeadows/inertia
...
expose the _measured_ MyAvatar.getVelocity() to JS
2014-09-05 15:34:34 -07:00
Andrzej Kapolka
37b4fe5166
Fix for deferred lighting/ambient occlusion when glow effect is disabled.
2014-09-05 14:16:12 -07:00
Andrew Meadows
9c2bfa35f7
restore position integration in Avatar::simulate()
2014-09-05 14:10:10 -07:00
Andrzej Kapolka
98c51f87d2
Make sure edit colors are either 100% opaque or 100% transparent.
2014-09-05 14:00:27 -07:00
Andrzej Kapolka
b278857091
Wireframe option, fix for shadow menu group.
2014-09-05 13:51:22 -07:00
Andrew Meadows
ff09a0d41b
merge upstream/master into andrew/inerita
2014-09-05 11:47:49 -07:00
Andrew Meadows
7be411b4ca
expose _measured_ MyAvatar velocity to JS
2014-09-05 11:44:13 -07:00
Brad Hefta-Gaub
9648c0d64e
Merge pull request #3343 from AndrewMeadows/ragdoll
...
Ragdoll Part 12: first pass avatar skeleton collides with voxels
2014-09-04 23:09:08 -07:00
Andrzej Kapolka
c340445f33
Hopefully, a fix for the Windows build; looks like "near" is a keyword.
2014-09-04 17:42:33 -07:00
Andrzej Kapolka
b275af48ed
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-04 17:26:34 -07:00
Andrzej Kapolka
137d3738fc
Fix for preview render.
2014-09-04 17:23:09 -07:00
Andrzej Kapolka
21f3f2b90e
Switch to deferred lighting for metavoxels.
2014-09-04 17:17:44 -07:00
Andrew Meadows
27621b316d
clarify how the size of the cube is computed
2014-09-04 15:41:24 -07:00
Andrew Meadows
faf31f268e
use QHash, not QVector, for Octree content query
2014-09-04 15:20:07 -07:00
Ryan Huffman
d54dc5f2aa
Merge branch 'master' of github.com:highfidelity/hifi into 19935
...
Conflicts:
interface/src/Menu.h
2014-09-04 12:05:17 -07:00
Clément Brisset
cc6d70c5ab
Merge pull request #3336 from huffman/19995
...
Code Review for Job #19995
2014-09-04 11:37:35 -07:00
Brad Hefta-Gaub
0d69122ec1
Merge pull request #3344 from huffman/19944
...
Code Review for Job #19944
2014-09-04 10:25:53 -07:00
Andrew Meadows
1e19566e93
fix for bad avatar bounding shape on resize
2014-09-04 09:53:07 -07:00
AndrewMeadows
8223481ecb
Merge pull request #3341 from huffman/19967
...
Code Review for Job #19967
2014-09-03 16:51:19 -07:00
Andrew Meadows
e120697a9b
merge upstream/master into andrew/ragdoll
2014-09-03 15:49:32 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Andrzej Kapolka
a02656070f
Added some comments.
2014-09-03 14:43:11 -07:00
Andrzej Kapolka
686ad4f0ec
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-03 14:43:01 -07:00
Andrew Meadows
4270c4d989
merge upstream/master into andrew/ragdoll
2014-09-03 14:42:17 -07:00
Andrzej Kapolka
0bd800faf2
Starting on materials attributes, fixed bug with Hermite deltas.
2014-09-03 14:09:04 -07:00
Andrew Meadows
2c1aa31d1e
give MyAvatar a VoxelShapeManager member
2014-09-03 13:19:41 -07:00
Andrew Meadows
83e04a0e8f
add VoxelShapeManager class
2014-09-03 13:19:14 -07:00
ZappoMan
25e8c7d3f1
useless semicolon removal
2014-09-03 12:22:02 -07:00
Ryan Huffman
d4ebe577df
Remove commented out icons
2014-09-03 08:28:25 -07:00
MarcelEdward
9662dced09
This patch updates the MyAvatar.cpp file.
...
It adds a check MyAvatar::goToLocationFromResponse to see if the user is online, if the teleport to the avatar is done and if not a message is shown which said that the user is not online
2014-09-03 16:59:00 +02:00
MarcelEdward
e62834c197
This patch updates Application::updateLocationInServer() in Application.cpp
...
The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds.
This function had an LastLocationObject in which only send in the location info to the data web in case the location changed.
Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.
2014-09-03 16:43:39 +02:00
ZappoMan
835071ab06
tweak rendering of model entities without valid models to be cubes
2014-09-02 19:21:15 -07:00
ZappoMan
a555eeda23
CR feedback and warning fixes
2014-09-02 18:43:16 -07:00
Andrzej Kapolka
33faffd9d4
Sphere tools for voxel editing.
2014-09-02 17:45:37 -07:00
Ryan Huffman
55acff02a1
Update RunningScripts height to take menu bar into account
2014-09-02 14:13:42 -07:00
Andrzej Kapolka
926f0d099c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-02 14:03:48 -07:00
Ryan Huffman
e6def6e35b
Fix spacing on RunningScripts
2014-09-02 14:01:24 -07:00
Andrzej Kapolka
34ba5cc31f
More shader fixes.
2014-09-02 13:54:47 -07:00
Ryan Huffman
67cefc8d54
Reduce height of RunningScripts so titlebar is inside main window
2014-09-02 13:12:52 -07:00
Ryan Huffman
a95b670716
Update RunningScripts style: font, spacing, title
2014-09-02 12:37:51 -07:00
