Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 17:32:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11318 commits 75 branches 59 tags 1.2 GiB
Commit graph

11318 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
89cb1ad527 Merge pull request #2580 from birarda/master 
add a missing line for symmetric socket activation
 2014-03-31 16:12:41 -07:00
Stephen Birarda
9e58fc3e47 Merge pull request #2579 from brotchie/master 
Hitting enter no longer shows chat window when chat is disabled
 2014-03-31 16:12:20 -07:00
Stephen Birarda
135d97d0a7 add a pretty important missing line for symmetric socket activation 2014-03-31 15:59:54 -07:00
Stephen Birarda
5061d2781c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-31 15:58:56 -07:00
James Brotchie
da116608a0 Hitting enter no longer shows chat window when chat is disabled. 
When chat is disabled (QXMPP library not available or XMPP disconnected)
hitting enter would show the chat window, even when the Tools -> Chat
menu item is grayed out!
 2014-04-01 07:38:22 +10:00
Stephen Birarda
d737638d8f Merge pull request #2576 from brotchie/patch-1 
Update BUILD.md
 2014-03-31 09:40:27 -07:00
Philip Rosedale
d4b3113692 Merge pull request #2575 from brotchie/master 
Remember most recently opened script location.
 2014-03-31 07:21:19 -07:00
Philip Rosedale
356df8ab31 Merge pull request #2566 from birarda/master 
add a symmetric ping type to handle open servers with clients on symmetric nats
 2014-03-31 07:20:13 -07:00
James Brotchie
59bc0ffb9d Update BUILD.md 
Not sure about anybody else but I needed glm 0.9.5.2 the compile without errors. 0.9.5.0 (as suggested in the current BUILD.md) failed because the precision template parameter was undefined.
 2014-03-31 23:33:17 +10:00
James Brotchie
6880160bc0 Remember most recently opened script location. 
Previously when running a script from a file you were always taken back
to your desktop directory. Now you will be taken to the location of your
most recently opened script.
 2014-03-31 22:08:38 +10:00
Philip Rosedale
91ecbe9086 Merge pull request #2568 from birarda/hydra-move 
repairs to hydraMove script to apply thrust from headOrientation
 2014-03-28 22:57:16 -07:00
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
61711c7aaa Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-28 13:30:06 -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
0c28907609 fix the hydraMove script to pull you based on head orientation, not body 2014-03-28 10:08:00 -07: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
8b1b2d8d99 send a symmetric ping packet if appropriate when pinging nodes 2014-03-28 09:11:20 -07:00
Stephen Birarda
f80b415497 handle activation and setting of symmetric socket 2014-03-28 09:07:30 -07:00
Stephen Birarda
18a293c020 add a symmetric socket to the Node class 2014-03-28 08:58:49 -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