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

43055 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
David Rowe
7406e5fd9c Add Navigate > Set Home Location menu item 2016-04-27 07:57:43 +12:00
James B. Pollack
e24c6f1b17 cell stuff 2016-04-26 12:29:43 -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
Andrew Meadows
e87b06657c remove whitespace and fix formatting 2016-04-26 11:24:38 -07:00
Andrew Meadows
e436c355a1 get viewport dimensions from controller 2016-04-26 11:23:29 -07:00
Andrew Meadows
8a02a585f2 use array of colors 2016-04-26 11:23:05 -07:00
Andrew Meadows
6e28538063 support toggling locked and visible properties 2016-04-26 11:22:45 -07:00
Andrew Meadows
39a1b9e75d update script/tutorials 2016-04-26 11:21:56 -07:00
Andrew Meadows
3a9cde8510 use local paths rather than remote URLs 2016-04-26 11:21:11 -07:00
Andrew Meadows
3d1abf8fb1 use the new JS script location 2016-04-26 11:20:08 -07:00
Andrew Meadows
c0b446ca4b archive remaining JS scripts 2016-04-26 11:18:22 -07:00
Andrew Meadows
9556995f2f move users.js and voxels.js 2016-04-26 11:15:21 -07:00
Brad Hefta-Gaub
28b5ef63b8 Merge pull request #7748 from ctrlaltdavid/20890 
Position default toolbar buttons bottom center of screen
 2016-04-26 10:18:40 -07:00
Brad Hefta-Gaub
cf49ba26ad Merge pull request #7760 from hyperlogic/tony/away-reset-avatar 
Reset avatar on exit of away-mode.
 2016-04-26 09:51:47 -07:00
Brad Hefta-Gaub
03321e1fca Merge pull request #7753 from thoys/planky-settings-fix 
Fix for Planky Settings window
 2016-04-26 09:51:21 -07:00
ericrius1
a492262095 Merge remote-tracking branch 'upstream/master' 2016-04-26 09:28:15 -07:00
Brad Hefta-Gaub
716d9e554c removed a bunch of dead code 2016-04-26 09:25:28 -07:00
Ryan Huffman
e5f2658fd9 Update GPUIdent to take address of spInstance directly 2016-04-26 09:23:08 -07:00
Brad Hefta-Gaub
c6be616401 Merge pull request #7758 from sethalves/fix-crash-in-model-loading 
fix a crash in RenderableModelEntityItem::getModel
 2016-04-25 23:50:04 -07:00
Geenz
a1171a33fd Merge remote-tracking branch 'highfidelity/master' 2016-04-25 23:52:39 -04:00
Geenz
d6ee569963 Add sRGB conversions to shaders. 2016-04-25 23:52:33 -04:00
Brad Hefta-Gaub
4ab7b660d4 fix a bunch of bugs in qml window placement 2016-04-25 20:19:54 -07:00
samcake
91bed86b32 ANd one more warning 2016-04-25 19:04:02 -07:00
samcake
5cb346330b Merging with master 2016-04-25 18:48:58 -07:00
samcake
8f2435daf0 No more warnings ? 2016-04-25 18:39:37 -07:00
James B. Pollack
61ff4d0f60 end of day 2016-04-25 18:27:04 -07:00
samcake
e8691c2f20 Fixing comments, code style and constnats 2016-04-25 18:15:52 -07:00
Andrew Meadows
50117e2ff4 add some new tutorial JS files 2016-04-25 17:53:10 -07:00
Andrew Meadows
3a2cb37ce2 move and rename some JS files 2016-04-25 17:50:35 -07:00
Andrew Meadows
e32fface93 add some local assets 2016-04-25 17:46:02 -07:00
Andrew Meadows
4630bdea58 move from examples/ to scripts/templates/ 2016-04-25 17:38:34 -07:00
Andrew Meadows
3f5a5a831e move examples/toybox to unpublishedScripts/DomainContent/Toybox/ 2016-04-25 17:37:40 -07:00
Andrew Meadows
0cc12fdaa6 move from examples/ to scripts/developer/ 2016-04-25 17:36:35 -07:00
Andrew Meadows
582b20227a move from examples/ to scripts/default/ 2016-04-25 17:35:27 -07:00
samcake
0e13b1623b Adding support for Equirectangular skymaps 2016-04-25 15:55:12 -07:00
Anthony J. Thibault
b7f157f4ff Reset avatar on exit of away-mode. 
Exposed MyAvatar.reset(bool) to script.
away.js now calls this on exit of away-mode.
 2016-04-25 14:10:20 -07:00
Clément Brisset
d74b5bdb17 Merge pull request #7756 from sethalves/add-missing-delete 
fix memory leak in AssetMappingModel
 2016-04-25 12:56:26 -07:00