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
22277 commits 29 branches 0 tags 1.1 GiB
Commit graph

22277 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
bd3d7124e2 cleanups 2015-02-20 13:31:58 -08:00
Seth Alves
56d237ae8b cleanups 2015-02-20 13:28:24 -08:00
Seth Alves
feb0e7ac31 AssignmentClientMonitor doesn't keep a list of its children. Instead it knows about active children due to their entries in the NodeList. Every few seconds, if 2 or more children are idle, the Monitor will ask one to exit 2015-02-20 13:26:59 -08:00
Andrew Meadows
94b3c4a3a8 simpler less draconian workaround 2015-02-20 11:57:37 -08:00
David Rowe
3a95614ca4 Update Faceshift readme.txt with Windows instructions 2015-02-20 11:29:51 -08:00
Brad Hefta-Gaub
5d6d9bb1d4 Merge pull request #4320 from huffman/fix-camera-move-on-mirror 
Fix entity camera tool from taking over in mirror mode
 2015-02-20 10:40:03 -08:00
Brad Hefta-Gaub
32bbc8d551 Merge pull request #4317 from birarda/master 
dynamically grab animation URL as model URL from model
 2015-02-20 10:39:30 -08:00
Ryan Huffman
c665a3873d Fix entity camera tool from taking over in mirror mode 2015-02-20 10:11:55 -08:00
Ryan Huffman
5c3cae471b Fix avatar billboards all rendering as the same billboard 2015-02-20 09:48:04 -08:00
Andrew Meadows
c3dbae1bd3 remove warning about signed-unsigned comparison 2015-02-20 09:00:28 -08:00
Andrew Meadows
aa667464c0 merge upstream/master into andrew/thermonuclear 2015-02-20 08:26:51 -08:00
Andrew Meadows
599ef68df8 fix for scratchy audio on windows 2015-02-20 08:26:11 -08:00
Philip Rosedale
66d1eeb327 Add textured models as balls 2015-02-19 21:11:51 -08:00
Seth Alves
fd357c915c Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare 2015-02-19 17:49:48 -08:00
Seth Alves
4b3183d820 AssignmentClients accept an id on the command-line. 
AssignmentClientMonitor now has a NodeList.  It stores its local port
in shared memory, like the DomainServer does.  As it spawns children,
it addes Nodes to the NodeList for each one.  The children send status
updates to the Monitor.  The Monitor will notice if there are no
spares and fork another child.
 2015-02-19 17:44:06 -08:00
Stephen Birarda
51156995b2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-19 15:40:11 -08:00
Ryan Huffman
4dfe725721 Update preferences dialog to use layouts throughout 2015-02-19 14:02:15 -08:00
Stephen Birarda
51ad631c54 dynamically grab animation URL as model URL from model 2015-02-19 13:14:46 -08:00
Philip Rosedale
f3b37bba54 Merge branch 'master' of https://github.com/worklist/hifi 2015-02-19 12:04:43 -08:00
Ryan Huffman
4a8e3193a9 Add more comments to UIUtil::scaleWidgetFontSizes 2015-02-19 12:01:27 -08:00
Grayson Stebbins
fd3bbb6553 Merge pull request #4316 from nbq/removeat 
Fix TP text in welcome page
 2015-02-19 11:58:22 -08:00
Jason Hawks
d0b47a66ab removed at symbol and added enter for teleport box 2015-02-19 14:49:00 -05:00
Jason Hawks
e66e098cd2 Merge branch 'master' of github.com:nbq/hifi 2015-02-19 14:38:50 -05:00
Clément Brisset
d2ed782626 Merge pull request #4308 from Triplelexx/20315 
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
 2015-02-19 10:27:27 -08:00
Andrew Meadows
21405135f9 Merge pull request #4310 from talentraspel/20323 
CR for Job #20323 - BUG: another crash on exit in interface
 2015-02-19 09:52:23 -08:00
Clément Brisset
ac3b172dee Merge pull request #4312 from ctrlaltdavid/update-svg-url 
Update SVG URL to Amazon S3
 2015-02-19 04:36:16 -08:00
Andrew Meadows
e207dad009 Merge pull request #4314 from AndrewMeadows/inertia 
fix EntityServer crash for zero view aspectRatio
 2015-02-18 18:09:05 -08:00
Ryan Huffman
a8999964f6 Cleanup dpi scaling comments 2015-02-18 16:21:51 -08:00
Stephen Birarda
24468a7936 Merge pull request #4315 from birarda/master 
use http link for gverb in case no git available
 2015-02-18 16:18:04 -08:00
Ryan Huffman
4751974c45 Revert "Add scaling for high-dpi Windows/Linux displays" 
This reverts commit 2828b65bea.
 2015-02-18 16:16:50 -08:00
Ryan Huffman
03eb1a984f Revert "Fix dpi scaling in getViewportDimensions" 
This reverts commit 9b719273ab.
 2015-02-18 16:15:53 -08:00
Stephen Birarda
5a3ef34d1e use http link for gverb in case no git available 2015-02-18 16:14:51 -08:00
Andrew Meadows
cf9d92abc0 fix EntityServer crash for zero view aspectRatio 2015-02-18 15:48:12 -08:00
Philip Rosedale
f6f54809d0 Merge pull request #4291 from Atlante45/reverb_smoothing 
Reverb smoothing
 2015-02-18 15:34:14 -08:00
Ryan Huffman
22d46e3e6b Update runningscripts script font to match parent 2015-02-18 15:33:24 -08:00
Ryan Huffman
9b719273ab Fix dpi scaling in getViewportDimensions 2015-02-18 15:30:39 -08:00
Ryan Huffman
2828b65bea Add scaling for high-dpi Windows/Linux displays 2015-02-18 15:09:41 -08:00
David Rowe
24d03deb21 Fix typo 2015-02-18 15:02:44 -08:00
Ryan Huffman
51f5719e0f Update font sizes in running scripts window 2015-02-18 14:59:52 -08:00
Ryan Huffman
b2e1d8a38c Remove font scaling based on system DPI 2015-02-18 14:37:56 -08:00
Ryan Huffman
7dab39a2f1 Add qDebug message to scaleWidgetFontSizes 2015-02-18 14:16:33 -08:00
Ryan Huffman
ff1fb07b2d Add high-dpi support to scaleWidgetFontSizes 2015-02-18 14:04:02 -08:00
Ryan Huffman
4a383ff177 Update font sizes in running scripts panel 2015-02-18 13:56:41 -08:00
David Rowe
889851f6ea Fix typo 2015-02-18 13:51:50 -08:00
Ryan Huffman
a069a2f21c Add default font to running scripts window 2015-02-18 13:34:48 -08:00
Ryan Huffman
e048f7a36c Add font scaling to running scripts window 2015-02-18 13:34:28 -08:00
Ryan Huffman
9550339a2a Move preferences dialog font scaling to UIUtil 2015-02-18 13:34:01 -08:00
Ryan Huffman
ba66155d46 Add font scaling to login dialog 2015-02-18 13:33:39 -08:00
Ryan Huffman
0d60c09d03 Add UI font scaling to UIUtil 2015-02-18 13:33:19 -08:00
David Rowe
a947cda0b2 Update SVG URL to Amazon S3 2015-02-18 13:02:37 -08:00