Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 01:16:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21932 commits 69 branches 56 tags 1.2 GiB
Commit graph

21932 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
5553f0f531 Merge pull request #4275 from ctrlaltdavid/20306 
CR for Job #20306 - When you load Interface on a PC if takes up the entire screen, this needs to change
 2015-02-12 09:50:12 -08:00
Andrew Meadows
7304585103 Merge pull request #4271 from huffman/fix-overlays-text-size 
Fix overlays text size
 2015-02-12 09:35:37 -08:00
Seth Alves
6506d87eb6 Merge branch 'master' of github.com:highfidelity/hifi into lockers-can-change-metavoxels 2015-02-12 09:16:56 -08:00
Andrew Meadows
357dd963f3 Merge pull request #4273 from ZappoMan/bugfix 
fix the quad color being broken after rendering text
 2015-02-12 09:00:16 -08:00
Andrew Meadows
e737921e67 Merge pull request #4270 from sethalves/clean-up-stats 
put bandwidth stats in first overlay column rather than in their own
 2015-02-12 08:58:53 -08:00
Andrew Meadows
5bb504ad55 Merge pull request #4268 from huffman/remove-upload-model 
Remove upload from file from editEntities.js
 2015-02-12 08:57:22 -08:00
Andrew Meadows
b4bd60e979 give TextEntityItem a box collision shape 2015-02-12 08:28:34 -08:00
Stephen Birarda
43e777163e use a QPointer to trigger delayed delete 2015-02-11 19:15:33 -08:00
David Rowe
6f03035169 Explicit casts for OSX and Linux 2015-02-11 18:05:25 -08:00
Stephen Birarda
79674fb94f use a wrapper on audio injector for script ownership 2015-02-11 17:20:00 -08:00
Stephen Birarda
449719bc7c add option to restart a local audio injector 2015-02-11 16:58:30 -08:00
Seth Alves
b9882e6488 if a MetavoxelEditMessage is received from a node which is not an editer of this domain, ignore it 2015-02-11 16:53:32 -08:00
Stephen Birarda
e3c4ead323 remove unecessary injector stops 2015-02-11 16:23:57 -08:00
Stephen Birarda
05b7cd819e use isPlaying property instead of getter 2015-02-11 16:21:45 -08:00
Stephen Birarda
f9174366dc fixes for new injector API in other scripts 2015-02-11 16:20:48 -08:00
Stephen Birarda
d8646f6ea0 repairs for new injector API in air guitar script 2015-02-11 16:17:10 -08:00
Stephen Birarda
6a5c0fd9f2 repairs for new injector API in lobby script 2015-02-11 16:16:01 -08:00
David Rowe
967afd8d67 Restore to windowed, maximized, or full screen appropriately at start-up 2015-02-11 16:13:04 -08:00
Stephen Birarda
4894a5b414 better handling of cleanup for local injector 2015-02-11 16:11:55 -08:00
Stephen Birarda
0498c5c708 provide old ASI APIs in AudioInjector 2015-02-11 15:57:32 -08:00
Stephen Birarda
7b485829c4 cleanup AudioInjector memory management 2015-02-11 15:52:00 -08:00
ZappoMan
7a45b1bc96 fix the quad color being broken after rendering text 2015-02-11 15:50:04 -08:00
Andrew Meadows
9f59addbc2 merge upstream/master into andrew/thermonuclear 2015-02-11 13:35:28 -08:00
Andrew Meadows
8b34283d76 fix missing comma 2015-02-11 13:21:57 -08:00
Ryan Huffman
341e31a074 Remove extraneous initialized check 2015-02-11 13:08:11 -08:00
Andrew Meadows
4581802532 explicitly flag virtual functions as such 2015-02-11 13:03:22 -08:00
Andrew Meadows
bd1817817b restore order of PROP_USER_DATA 2015-02-11 12:59:59 -08:00
Ryan Huffman
51ff897ee5 Update Font to not setup GL until first draw 2015-02-11 12:59:12 -08:00
Ryan Huffman
a527bd85ba Update Text3DOverlay::textSize to use new TextRenderer::getExtents 2015-02-11 12:13:26 -08:00
Seth Alves
a281695132 keep bandwidths stats visible even if stats are expanded 2015-02-11 11:35:52 -08:00
Stephen Birarda
c5c3d24c2d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-11 11:18:20 -08:00
Seth Alves
62507721c7 put bandwidth stats in first overlay column rather than in their own 2015-02-11 11:05:44 -08:00
Ryan Huffman
d7e18d6f6d Update TextOverlay::textSize to use new TextRenderer::getExtents 2015-02-11 11:04:04 -08:00
Brad Hefta-Gaub
9a7ed8055f Merge pull request #4267 from samcake/master 
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
 2015-02-11 09:45:29 -08:00
Ryan Huffman
957686e12e Remove upload from file from editEntities.js 2015-02-11 09:04:56 -08:00
Andrew Meadows
5975380892 Merge pull request #4266 from ZappoMan/bugfix 
fix color issues with quads
 2015-02-11 09:03:10 -08:00
Andrew Meadows
13c953494c Merge pull request #4264 from huffman/entity-resize 
Increase entity-resize timeout to 2 minutes
 2015-02-11 09:02:26 -08:00
Andrew Meadows
68c1e9ef71 Merge pull request #4260 from birarda/master 
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
 2015-02-11 09:02:18 -08:00
Andrew Meadows
d9b57de649 merge upstream/master into andrew/thermonuclear 2015-02-11 08:56:34 -08:00
Andrew Meadows
ac8db02029 add ShapeType to UI of entity properties editor 2015-02-11 08:54:35 -08:00
Andrew Meadows
b983f6fccf bump entity packet version 2015-02-11 08:52:49 -08:00
Andrew Meadows
ff27ab74ae expose _shapeType to script and server 2015-02-11 08:46:41 -08:00
Andrew Meadows
d89548312e manipulate the extents for SHAPE_TYPE_SPHERE 
The conversion from ShapeInfo to btShape MUST be reversable!
Otherwise we leak shapes in the ShapeManager class.
 2015-02-11 08:44:10 -08:00
Andrew Meadows
f4a4c9786c don't create shape for SHAPE_TYPE_NONE 2015-02-11 08:43:55 -08:00
Andrew Meadows
3239c259f9 remove commented out cruft 2015-02-11 08:43:19 -08:00
Andrew Meadows
123d73783b remove warning about unused variable 2015-02-11 08:42:36 -08:00
Sam Gateau
a6f006a36d more cleaning 2015-02-10 18:41:36 -08:00
Sam Gateau
b9fd116dbf Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu 2015-02-10 18:38:48 -08:00
ZappoMan
8016fb5e0d fix color issues with quads 2015-02-10 17:35:27 -08:00
Ryan Huffman
6eca8610b6 Increase entity-resize timeout to 2 minutes 2015-02-10 15:54:04 -08:00