Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 12:07:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43084 commits 76 branches 59 tags 1.2 GiB
Commit graph

43084 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
648e6a74d7 don't let people access scripts outside of /~/ 2016-04-28 15:43:58 -07:00
howard-stearns
0b2fffa5de Merge branch 'master' of https://github.com/highfidelity/hifi into hand-controller-pointer 2016-04-28 15:30:44 -07:00
howard-stearns
c68cae5dc0 stash some commented-out code before update 2016-04-28 15:28:50 -07:00
howard-stearns
89e4670361 checkpoint 2016-04-28 14:51:17 -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
Seth Alves
8c278563f5 allow scripts on the web to refer to interface-local javascript libraries 2016-04-28 13:41:50 -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
Zach Pomerantz
30e7b950a1 Fix script engine deletion 2016-04-28 11:41:36 -07:00
howard-stearns
f3adfb7c50 disable controller-button to mouse click mapping when off-hud and no 
visualization.
 2016-04-28 10:49:45 -07:00
James B. Pollack
90c59c5af0 remove directory from default 2016-04-28 10:39:53 -07:00
howard-stearns
5ac67119a1 Pretty solid except for in-world clicking via red ball instead of laser 
end, and not turning off clicking when no visualization.
 2016-04-28 10:28:04 -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
James B. Pollack
3f0807fc68 add utils and rewrite a lot of include refs 2016-04-27 23:49:38 -07:00
James B. Pollack
b2564e8266 move toybox resetter scripts 2016-04-27 23:42:01 -07:00
Zach Pomerantz
2f20e58301 Avoid crashing on missed pipelines 2016-04-27 19:54:52 -07:00
Zach Pomerantz
854c0ea3e3 Clean out updateMemoryCost 2016-04-27 19:20:43 -07:00
Zach Pomerantz
1e8d45aecb Put ScriptableResource state enum in prototype 2016-04-27 19:20:43 -07:00
Zach Pomerantz
0c78d5bdd1 Change ScriptableResource signal to state 2016-04-27 19:20:42 -07:00
Zach Pomerantz
de8145ec71 Nest TextureType JS interface in Type 2016-04-27 19:20:41 -07:00
Zach Pomerantz
c2909946e6 Split test to prefetch, movie 2016-04-27 19:20:33 -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
David Rowe
eee3cedd95 Fix typo 2016-04-28 12:55:41 +12: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
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
howard-stearns
d2a92acc73 checkpoint demo2 2016-04-27 15:38:25 -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
Howard Stearns
e2101a8996 checkpoint 2016-04-27 10:32:18 -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