Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 20:13:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
42862 commits 76 branches 59 tags 1.2 GiB
Commit graph

42862 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
5314755e0d Merge pull request #7782 from ctrlaltdavid/20898 
Automatically upgrade toolbar position to bottom center of window
 2016-04-28 16:37:34 -07:00
Brad Hefta-Gaub
bc57719f5f Merge pull request #7771 from ericrius1/lampFix 
Lamp fix- moves light position up a bit on desklamp at home
 2016-04-28 16:29:03 -07:00
Brad Hefta-Gaub
6488744bd5 Merge pull request #7780 from imgntn/defaultScripts 
Remove directory.js from default scripts
 2016-04-28 16:28:33 -07:00
Brad Hefta-Gaub
b72ac35e8e Merge pull request #7785 from imgntn/editicons 
Re-add locking/visibility tools to edit.js
 2016-04-28 16:27:34 -07:00
James B. Pollack
e68909ce3e re add local paths 2016-04-28 13:48:09 -07:00
James B. Pollack
aafed4e1b8 fix horizontal typo in examples 2016-04-28 13:42:10 -07:00
James B. Pollack
b52406e127 horizontal 2016-04-28 13:40:58 -07:00
James B. Pollack
795d866da9 re add locking/visibility tools to edit.js 2016-04-28 13:29:54 -07:00
David Rowe
1cf53829d3 Fix upgrading for all toolbar buttons 2016-04-29 08:20:20 +12:00
David Rowe
b7188bad30 Automatically upgrade toolbar position to bottom center of window 2016-04-29 07:13:56 +12:00
James B. Pollack
90c59c5af0 remove directory from default 2016-04-28 10:39:53 -07:00
Andrew Meadows
b95c81d0ba Merge pull request #7763 from huffman/fix/gpu-ident-debug 
Fix assert crash in GPUIdent
 2016-04-28 08:02:11 -07:00
Seth Alves
5cec928ad1 Merge pull request #7776 from huffman/fix/build-copy-scripts 
Fix interfaces scripts not copying from /scripts in local builds
 2016-04-27 19:15:09 -07:00
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
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
Stephen Birarda
9fe9100cac change produced installer names to beta 2016-04-27 15:57:32 -07:00
James B. Pollack
bced3c2c3c change path for defaultscripts.js in scriptengine 2016-04-27 13:34:42 -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
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
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
afb2342781 Merge remote-tracking branch 'upstream/master' into defaultScripts 2016-04-26 16:16:56 -07:00
James B. Pollack
37fa703279 use system path instead of default for loading scripts 2016-04-26 15:50:45 -07:00
James B. Pollack
cd59c462d1 users and voxel fixes 2016-04-26 15:34:24 -07: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
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
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
James B. Pollack
db00df8020 update butterflies url to production 2016-04-26 13:26:34 -07:00
James B. Pollack
4431d869e7 move butterflies.js to tutorials at freidricas request 2016-04-26 13:25:43 -07:00
James B. Pollack
927ac60a8c add images for voxels 2016-04-26 13:24:22 -07:00
Zach Pomerantz
63b0c0a9ad Reset pipeline after rendering text3d 2016-04-26 13:23:16 -07:00
Brad Hefta-Gaub
e7d26a8a63 CR feedback magic numbers 2016-04-26 11:45:48 -07:00
Brad Hefta-Gaub
ee277dcf9d Merge branch 'master' of https://github.com/highfidelity/hifi into qmlWindowFixes 2016-04-26 11:44:51 -07:00
Andrew Meadows
e158ea9d92 update asset urls in users.js 2016-04-26 11:41:39 -07:00
Brad Hefta-Gaub
0ae6e9f241 remove debug messages 2016-04-26 11:36:21 -07:00