Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 04:13:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19187 commits 71 branches 56 tags 1.2 GiB
Commit graph

19187 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
5f58c76842 Fix hands being put in face if Leap on HMD is set but Leap not connected 
The joints were reporting themselves as "active" even though the Leap
wasn't connected, both at startup if not connected and after unplugging.
 2014-11-26 12:03:10 -08:00
Philip Rosedale
7737994399 Merge pull request #3865 from ctrlaltdavid/20197 
CR for Job #20197 - Bug: Initial ping stats mis-reported
 2014-11-26 08:08:50 -08:00
Brad Hefta-Gaub
883fda241f Merge pull request #3864 from huffman/entity-tools-front-draw 
Update entity tools to draw grabbers in front
 2014-11-25 12:55:16 -08:00
Ryan Huffman
0b23b57e1e Update border comment in Cube3DOverlay 2014-11-25 12:43:01 -08:00
Ryan Huffman
75d560744b Update rotation handles to drawInFront = true 2014-11-25 12:34:03 -08:00
Brad Hefta-Gaub
c4ea6bac1d Merge pull request #3863 from huffman/overlay-front-draw 
Overlay Front Draw
 2014-11-25 12:27:21 -08:00
Ryan Huffman
2cb30c2157 Update color used for Cube3DOverlay border 2014-11-25 12:17:46 -08:00
Ryan Huffman
f8c8ed868e Update float that should be bool 2014-11-25 12:08:48 -08:00
Ryan Huffman
c5f2b3b588 Add borderSize to Cube3DOverlay 2014-11-25 12:05:13 -08:00
Ryan Huffman
b3ca6fda72 Update entity tool grabbers look and size 2014-11-25 12:04:11 -08:00
Ryan Huffman
b97870f32e Update extra entity tool stretch handles to be optionally visible 2014-11-25 12:01:29 -08:00
Brad Hefta-Gaub
969d178e44 Merge pull request #3862 from AndrewMeadows/bispinor 
more correct EntityItem list maintenance
 2014-11-25 11:59:48 -08:00
AndrewMeadows
450b365bb6 Merge pull request #3860 from ZappoMan/cleanupMenus 
remove spatial audio menu items
 2014-11-25 11:28:18 -08:00
Ryan Huffman
9020fee31a Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw 2014-11-25 09:53:18 -08:00
Ryan Huffman
649ae4a448 Update 3D overlays to only use one list 2014-11-25 09:49:10 -08:00
Ryan Huffman
4febc45b6a Add drawInFront to Base3DOverlay::getProperty 2014-11-25 08:44:38 -08:00
Ryan Huffman
925c2a8f6c Update array to use pointers 2014-11-25 08:34:44 -08:00
Ryan Huffman
8b982872c2 Add calls to Overlays::render3DFront() 2014-11-24 23:19:53 -08:00
Ryan Huffman
0b46e35f31 Add support for separate list of 3d overlays to be drawn in front 2014-11-24 23:19:17 -08:00
Ryan Huffman
1d865ace9d Add drawInFront property to Base3DOverlay 2014-11-24 21:16:29 -08:00
Ryan Huffman
1b1482bab3 Adjust size of stretch overlays to be smaller 2014-11-24 21:00:04 -08:00
Andrew Meadows
8966ab32d8 add lifetime to gun bullets 2014-11-24 20:37:52 -08:00
Andrew Meadows
1c636fe6b2 more correct entity list maintenance 2014-11-24 20:37:09 -08:00
David Rowe
732ad8f993 Use valid font for Windows so that '-'s are displayed 2014-11-24 18:33:10 -08:00
David Rowe
01867e2459 Display "--" for ping values if not yet valid 2014-11-24 18:32:47 -08:00
Andrzej Kapolka
c5e923f091 Merge pull request #3859 from samcake/tot 
support texture transform and lightmap
 2014-11-24 15:42:49 -08:00
Sam Gateau
1f10a44ae4 More typos in glsl 2014-11-24 15:38:12 -08:00
Sam Gateau
6a63099a0f Fixed syntax issues and review critics, put all the debugging code in a #define block 2014-11-24 15:24:20 -08:00
Sam Gateau
68e2df8fc2 add a emissive parameter value to the lightmap shaders 2014-11-24 14:35:42 -08:00
ZappoMan
08772bbae0 remove spatial audio menu items 2014-11-24 13:07:22 -08:00
Sam Gateau
f67b4b9ff4 clean out comments so the 2 rendering modes for entities work, scene batch or per model batch 2014-11-24 11:44:54 -08:00
Sam Gateau
6591f4dac2 adjust lighmap shading equation 2014-11-24 11:18:21 -08:00
Ryan Huffman
664de8215f Merge pull request #3850 from Adrianl3d/master 
Added notifications.js
 2014-11-24 10:38:37 -08:00
Sam Gateau
8b23a2cd1e adding the shader files for the lightmap case 2014-11-24 10:33:31 -08:00
Adrianl3d
ffe66cd5c5 Clean up code 
Fix code to standards
 2014-11-25 04:23:00 +10:00
Sam Gateau
1f22d5b493 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-24 10:05:39 -08:00
Philip Rosedale
137642f8a5 Merge pull request #3858 from ZappoMan/modelSceneRendering 
make render entities as scene the default
 2014-11-23 14:08:25 -08:00
Philip Rosedale
64761bedd9 Merge pull request #3857 from ZappoMan/lobbyTweaks 
Added "description" to lobby
 2014-11-23 14:07:55 -08:00
ZappoMan
2e9a9bf5c2 make render entities as scene the default 2014-11-23 12:01:58 -08:00
ZappoMan
80c1f5038c Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks 2014-11-23 11:39:05 -08:00
ZappoMan
f23d8f6c20 text sizing tweaks 2014-11-23 11:21:05 -08:00
ZappoMan
437af06245 switch to 3d text for description 2014-11-23 11:16:33 -08:00
ZappoMan
5ea6973fe7 fix isFacingAvatar for 3d text overlays 2014-11-23 10:53:03 -08:00
Philip Rosedale
a4f3fc1cb5 Merge pull request #3855 from ZappoMan/sitEntityScript 
fix bugs in unloading scripts when changing domains
 2014-11-22 23:42:25 -08:00
ZappoMan
53bd8fd6d2 handle no description and blank panels better 2014-11-22 21:30:58 -08:00
ZappoMan
efe202b7e8 make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby 2014-11-22 21:25:43 -08:00
ZappoMan
310e31377d handle line wrapping in description 2014-11-22 14:49:56 -08:00
ZappoMan
f014025b81 first cut at lobby tweaks 2014-11-22 14:28:06 -08:00
ZappoMan
93755e6506 fix bugs in unloading scripts when changing domains 2014-11-22 11:53:50 -08:00
Brad Hefta-Gaub
e9207ab74d Merge pull request #3854 from PhilipRosedale/master 
Entity script allowing you to grab and 'inspect' an object
 2014-11-22 07:44:14 -08:00