Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
11302 commits 29 branches 0 tags 1.1 GiB
Commit graph

11302 commits

This branch
This branch
All branches
Author SHA1 Message Date
Grayson Stebbins
4d16547362 Note about shortcut for domain dialog 
(set your domain via Cmnd+D/Cntrl+D)
 2014-03-28 14:50:26 -07:00
Stephen Birarda
075ff22356 Merge pull request #2572 from ddobrev/19520 
Fixed a typo that resulted in a wrong padding of a widget
 2014-03-28 13:28:39 -07:00
Dimitar Dobrev
f9cee2ccfa Fixed a typo that resulted in a wrong padding of a widget. 2014-03-28 22:21:55 +02:00
Brad Hefta-Gaub
4acb146655 Merge pull request #2570 from birarda/shared-assignment-pointer 
use a QSharedPointer to allow for more elegant assignment cleanup
 2014-03-28 11:03:36 -07:00
Stephen Birarda
52bfae5b4d Merge pull request #2569 from ddobrev/19520 
Restored code that Git had somehow deleted
 2014-03-28 10:54:44 -07:00
Stephen Birarda
eb35b63651 use a shared pointer for more elegant cleanup at assignment conclusion 2014-03-28 10:48:44 -07:00
Dimitar Dobrev
9b43508098 Restored code that Git had somehow deleted. 2014-03-28 19:26:16 +02:00
Stephen Birarda
4bc6fd38cb Merge pull request #2529 from ddobrev/19520 
Improvements to chat
 2014-03-28 09:54:05 -07: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
4374e28e9c Changed the highlighting of own messages to occupy the whole row. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413 Changed the dock widget for the chat so that it replicates the agreed 
upon design.
 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
5073439007 Highlighted the user's own chat messages. 2014-03-28 18:36:53 +02:00
Dimitar Dobrev
d764ef79ed Gave more space to the user in sent messages so that resizing of the 
column for messages occurs for really long user names.
 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
Dimitar Dobrev
65f912249d Moved user names in the char 1 pixel to the bottom. 2014-03-28 18:36:52 +02:00
Stephen Birarda
3c8aa90ae0 Merge pull request #2559 from AndrewMeadows/avatar-interaction-2 
split lean input from lean perturbations
 2014-03-28 09:25:36 -07:00
Stephen Birarda
be5888e692 Merge pull request #2549 from AndrewMeadows/avatar-interaction 
name changes to get rid of "tweaked" angles in Head code
 2014-03-28 09:19:45 -07:00
Stephen Birarda
7b840f760c Merge pull request #2538 from AndrewMeadows/enforce-standard 
making some type casts abide by coding standard
 2014-03-28 09:19:16 -07:00
Stephen Birarda
5296843219 Merge pull request #2561 from ey6es/master 
Don't render display name for own avatar in first person mode, use a spherical model for the shadow volume to prevent growing and shrinking.
 2014-03-28 09:19:02 -07:00
Stephen Birarda
9651123fde Merge pull request #2565 from birarda/master 
revert hack to NodeList post dojo demo
 2014-03-28 08:47:10 -07:00
Stephen Birarda
1c47b8a3e1 Revert "hack the NodeList to take the socket on which pinged as active socket" 
This reverts commit 5c7ac6d3a1.
 2014-03-27 21:29:01 -07:00
Stephen Birarda
f8ee8044ca Merge pull request #2562 from birarda/dojo-network 
NodeList hack for hacker dojo network
 2014-03-27 17:42:22 -07:00
Stephen Birarda
5c7ac6d3a1 hack the NodeList to take the socket on which pinged as active socket 2014-03-27 17:41:55 -07:00
Andrzej Kapolka
361276d133 Use a spherical estimate of the shadowed region to avoid growing and shrinking 
it as we turn around.  Also, might as well render shadows for the billboards.
 2014-03-27 16:19:21 -07:00
Andrzej Kapolka
aee15e0496 Don't render display name/chat message for own avatar in first person mode. 2014-03-27 15:38:21 -07:00
Andrew Meadows
796d20168e splitting lean input from lean perturbations 2014-03-27 15:30:30 -07:00
Philip Rosedale
069008c03f Merge pull request #2557 from ZappoMan/bugfixes 
tweaks to _processLock to reduce time it's locked
 2014-03-27 15:09:48 -07:00
Philip Rosedale
a9d24451cf Merge pull request #2556 from ey6es/master 
Fix for shadows' showing up on the wrong side of objects.
 2014-03-27 15:08:45 -07:00
ZappoMan
c540427b9e tweaks to _processLock to reduce time it's locked 2014-03-27 15:03:46 -07: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
eab4b4bc5d Make sure we process the model root nodes in alphabetic order. 2014-03-27 14:47:46 -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
Andrzej Kapolka
ca4a4a692f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-27 13:58:19 -07:00
Stephen Birarda
0fc83d81fd Merge pull request #2555 from ZappoMan/backtotrylockanduuid 
added back use of nodeWithUUID() instead of sharedpointer
 2014-03-27 13:55:17 -07:00
Brad Hefta-Gaub
efcd07ffc4 Merge pull request #2550 from birarda/master 
fix for Agent interest list
 2014-03-27 13:51:04 -07:00
Andrzej Kapolka
563725e781 Use the "correct" shadow strategy: include only ambient term when in shadow. 2014-03-27 13:44:34 -07:00
ZappoMan
bda96ef935 added back use of nodeWithUUID() instead of sharedpointer 2014-03-27 13:35:22 -07:00
Andrzej Kapolka
7cc7230745 Adjust the shadow shader to prevent seeing shadows on the opposite sides of 
objects.  Closes #2544.
 2014-03-27 13:18:45 -07:00
Stephen Birarda
21eef6c15e make sure VoxelServer and ParticleServer are in Agent interest list 2014-03-27 13:10:03 -07:00
Andrew Meadows
a978f533e1 update a comment 2014-03-27 11:24:03 -07:00
AndrewMeadows
8661bdf788 Merge pull request #2548 from ey6es/master 
Couple of quick fixes: reset the skeleton joints when space is pressed a...
 2014-03-27 11:21:24 -07:00
Andrew Meadows
7949be0319 PitchTweak and friends become DeltaPitch 2014-03-27 11:14:26 -07:00
Andrzej Kapolka
ca9f0c01c1 Couple of quick fixes: reset the skeleton joints when space is pressed as a 
last resort to fix broken IK, don't render display names at the origin if
we don't have a skeleton model.
 2014-03-27 11:08:55 -07:00
Andrew Meadows
c354e980a8 getTweakedOrientation() to getFinalOrientation() 2014-03-27 11:03:42 -07:00
Andrew Meadows
c383b69b61 merge upstream/master into enforce-standard 
Conflicts:
	interface/src/avatar/Hand.cpp
 2014-03-27 10:53:54 -07:00
Andrew Meadows
b6f2150d2e HeadData::_yaw and friends change to _baseYaw 2014-03-27 10:37:07 -07:00
Stephen Birarda
9dd2573311 Merge pull request #2545 from ZappoMan/bugfixes 
Fixes Voxel Server "stop sending" issue
 2014-03-27 09:04:25 -07:00
ZappoMan
9fdfa4a7a8 switch to using SharedNodePointer instead of UUID in octree server send thread 2014-03-27 02:33:32 -07:00
ZappoMan
55b9dd1aee remove non-locking version of nodeWithUUID() 2014-03-27 02:32:19 -07:00