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

43049 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marko Kudjerski
b6bd02aea6 Merge pull request #7774 from birarda/alpha-is-beta 
change produced installer names to beta
 2016-04-27 17:52:28 -07:00
David Rowe
26e8e22b8b Move directory, examples, and edit toolbar buttons down 
Moved down as far as they can go within the getRecommendedOverlayRect(),
i.e., there's a 50px margin.
 2016-04-28 12:23:47 +12:00
Andrew Meadows
5f98af1898 avoid crossed eyes 2016-04-27 16:58:13 -07:00
Andrew Meadows
9c0aeb9b81 remove cruft 2016-04-27 16:58:13 -07:00
Andrew Meadows
8a691cf449 Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle 
Improve eye tracking when face to face
 2016-04-27 16:54:07 -07:00
Andrew Meadows
4160e0c1df Merge pull request #7773 from imgntn/defaultScripts 
change path for defaultscripts.js in scriptengine
 2016-04-27 16:35:51 -07:00
Ryan Huffman
f92f29ecab Fix interfaces scripts not copying from /scripts in local builds 2016-04-27 16:34:30 -07:00
David Rowe
e5ee98ee60 Fix up filenames in headers 2016-04-28 11:19:30 +12:00
David Rowe
16874baf5f Use UI Toolkit border styles for various dialogs 
File > Help...
File > About Interface
Settings > Avatar Settings > Browse
Go To button (directory.js)
Examples button (examples.js)
 2016-04-28 11:14:39 +12:00
Stephen Birarda
9fe9100cac change produced installer names to beta 2016-04-27 15:57:32 -07:00
David Rowe
9ecffd626e Capitalize title of directory window from "directory" to "Directory" 2016-04-28 09:01:03 +12:00
James B. Pollack
bced3c2c3c change path for defaultscripts.js in scriptengine 2016-04-27 13:34:42 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Zach Pomerantz
6b53c1e85d Avoid leaking ScriptableResource 2016-04-27 11:55:02 -07:00
Andrew Meadows
5042561e80 Merge pull request #7730 from imgntn/defaultScripts 
/scripts for launch
 2016-04-27 11:36:20 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Andrew Meadows
c686418be0 optimize use of EntityItem::getDimensions() 2016-04-27 10:34:29 -07:00
Andrew Meadows
f6aa0a11a8 Merge pull request #7766 from ZappoMan/fixAutoResize 
fix auto resize of models on import
 2016-04-27 10:03:18 -07:00
Andrew Meadows
93f4bc759d Merge pull request #7743 from samcake/color 
group several separate glUniform parameters into a single Uniform Buffer
 2016-04-27 10:02:56 -07:00
ericrius1
72f272b5d3 lampfix 2016-04-27 09:48:16 -07:00
ericrius1
1297ae5d0d Merge remote-tracking branch 'upstream/master' 2016-04-27 09:29:45 -07:00
James B. Pollack
92f61dc86f prepend /system to default scripts 2016-04-27 00:44:04 -07:00
James B. Pollack
6c16e8c6c7 rename default scripts 2016-04-27 00:43:30 -07:00
samcake
4202e60ac3 trying to add the skymap on translucents 2016-04-26 18:20:15 -07:00
Brad Hefta-Gaub
19416fe722 Merge pull request #7761 from samcake/lemon 
Add support for equi-rectangular skymaps (2 by 1)
 2016-04-26 17:15:24 -07:00
Brad Hefta-Gaub
db6a07171f Merge pull request #7764 from zzmp/fix/text3d-pipeline 
Fix strange rendering with Text3DOverlay
 2016-04-26 17:15:09 -07:00
Howard Stearns
70552b2455 Merge pull request #7762 from ZappoMan/qmlWindowFixes 
fix a bunch of bugs in qml window placement
 2016-04-26 17:00:54 -07:00
James B. Pollack
fc5960fa15 individual buttons 2016-04-26 17:00:12 -07:00
Brad Hefta-Gaub
48e63ea828 add support to abort evaluation of long running scripts on shutdown 2016-04-26 16:24:53 -07:00
David Rowe
5e00a1ef49 Implement "go home" action 2016-04-27 11:24:19 +12:00
Brad Hefta-Gaub
a21bc66fa3 add support to abort evaluation of long running scripts on shutdown 2016-04-26 16:21:11 -07:00
James B. Pollack
afb2342781 Merge remote-tracking branch 'upstream/master' into defaultScripts 2016-04-26 16:16:56 -07:00
Geenz
bf31fc728a And another. 2016-04-26 18:54:02 -04:00
James B. Pollack
37fa703279 use system path instead of default for loading scripts 2016-04-26 15:50:45 -07:00
Geenz
83d6f7f1e3 Quick fix for incorrect conversion. 
We want sRGB to linear, not linear to sRGB.
 2016-04-26 18:49:03 -04:00
James B. Pollack
cd59c462d1 users and voxel fixes 2016-04-26 15:34:24 -07:00
David Rowe
f74be226c8 Add "home" button to address bar 2016-04-27 10:28:05 +12:00
Brad Hefta-Gaub
b597f7001b fix auto resize 2016-04-26 15:13:11 -07:00
James B. Pollack
db197b5014 fix users 2016-04-26 14:50:19 -07:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00
James B. Pollack
251769a0b9 put toolbar.js at latest 2016-04-26 14:35:39 -07:00
James B. Pollack
5cb88b957c update paths for users and voxels 2016-04-26 14:35:24 -07:00
Geenz
ef7098b39a Missed a few. 2016-04-26 17:12:04 -04:00
James B. Pollack
2f069b4051 sort out voxel pics 2016-04-26 14:09:22 -07:00
James B. Pollack
8d506f6242 new voxel pic 2016-04-26 14:04:57 -07:00
Geenz
dacc2bdb09 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-04-26 17:01:16 -04:00
Geenz
ae5ef6d948 Remove toLinearVec3 from ColorUtils 
toGamma22Vec3 should probably stay since that is a valid conversion from linear to a gamma space of 2.2.
 2016-04-26 17:00:59 -04:00
Anthony J. Thibault
71f67c99cc MyAvatar: use coneSphereAngle for eyeTracking look at targets 2016-04-26 13:43:03 -07:00
Anthony J. Thibault
d9063b199e GeometryUtils: coneSphereAngle test 2016-04-26 13:31:06 -07:00
Brad Hefta-Gaub
82f905dc84 fix qml issue 2016-04-26 13:29:22 -07:00