Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51860 commits 2 branches 0 tags 1.1 GiB
Commit graph

51860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
1b2120d7e1 Sit script first draft 2017-02-27 16:38:54 -08:00
Atlante45
7132969083 Add hips pinning capability to MyAvatar 2017-02-27 16:38:54 -08:00
Atlante45
6821c8621f More sit work 2017-02-27 16:38:54 -08:00
Atlante45
cc5967e8f9 Pull part of the Out Of Body Exp code 2017-02-27 16:38:53 -08:00
Ryan Huffman
40b238c12e Add new teleport seat model + beam 2017-02-27 16:38:53 -08:00
Ryan Huffman
c632884aac Update teleport script to handle detecting seats 2017-02-27 16:38:53 -08:00
Ryan Huffman
9197819291 Cleanup teleport to make use of new TARGET 2017-02-27 16:38:53 -08:00
Ryan Huffman
b8c7905fa4 Cleanup some duplication of code in teleport.js 2017-02-27 16:38:53 -08:00
samcake
9527c51ff1 Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar 2017-02-27 16:32:28 -08:00
howard-stearns
c04fd0ec66 smaller glyph size 2017-02-27 16:07:05 -08:00
Chris Collins
53505d6013 Merge pull request #9787 from samcake/flash 
Fix the broken normals on Seth's avatar
 2017-02-27 15:51:36 -08:00
Chris Collins
a8ae693cef Merge pull request #9786 from druiz17/tablet-scaling-fix 
Tablet homebutton dimension and position now scales with tablet
 2017-02-27 15:51:02 -08:00
Matti Lahtinen
b1639ee3aa Removed a Stray Print json that would spam logs. 2017-02-27 23:40:06 +02:00
samcake
f050cc31f2 Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar 2017-02-27 13:32:24 -08:00
Menithal
9fbde41dc4 Styling formating and Rebuild attempt 2017-02-27 23:27:48 +02:00
David Rowe
6fcc096bcf Fix JavaScript error 2017-02-28 10:14:38 +13:00
David Rowe
08cae1d3f2 Make other avatar's grab beam finish at entity's centroid 2017-02-28 10:02:06 +13:00
David Rowe
f4a3627b76 Make other avatar's grab beam start at more natural position 2017-02-28 09:47:36 +13:00
David Kelly
3bf3f16a6a whitespace 2017-02-27 12:56:03 -07:00
David Kelly
e7c8085bc8 switch to using glyph button 2017-02-27 12:44:23 -07:00
Dante Ruiz
b0b203edf9 Merge branch 'master' into tablet-scaling-fix 2017-02-27 19:34:58 +00:00
Dante Ruiz
21c15927cf Homebutton dimension and position scales with tablet 2017-02-27 19:33:52 +00:00
David Rowe
31b6d528df Merge branch 'master' into 21176 2017-02-28 08:29:44 +13:00
Seth Alves
df034ea6da remove commented-out code 2017-02-27 11:27:59 -08:00
Seth Alves
8110921abf git rid of _mouseToOverlays until I remember why I thought I needed it 2017-02-27 11:11:04 -08:00
Ryan Huffman
5b59939195 Merge pull request #9602 from huffman/feat/shortbow-entity-server 
Add shortbow to marketplace scripts
 2017-02-27 11:09:52 -08:00
Stephen Birarda
80af749b69 change max FPS for youtube on URL change 2017-02-27 11:09:17 -08:00
Stephen Birarda
d18936ea18 only force youtube web entities to 30 FPS 2017-02-27 09:44:34 -08:00
Stephen Birarda
2ceb3d85bd increase max renderable web entity FPS to 30 2017-02-27 09:33:49 -08:00
samcake
699d177b20 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-27 09:18:20 -08:00
Seth Alves
1864975c51 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-27 06:35:22 -08:00
Seth Alves
1f402f7e4e Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti 2017-02-27 06:34:46 -08:00
sam
709c2e4240 Fixing the emissive on overlayfor models 2017-02-27 02:52:00 -08:00
Brad Hefta-Gaub
795ff9a531 Merge pull request #9760 from birarda/bug/ess-crashes 
fix a crash in ESS on ES shutdown
 2017-02-26 22:29:39 -08:00
Seth Alves
ebdb1cd3bd Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti 2017-02-26 20:29:36 -08:00
Andrew Meadows
6269284b3d Merge pull request #9758 from kunalgosar/passwordmatchingbug 
Fix Password Setting Bug
 2017-02-26 16:37:16 -08:00
Andrew Meadows
dbd1526d56 Merge pull request #9757 from kunalgosar/EntityFocusFix 
Fix for Web Entity not leaving Focus
 2017-02-26 16:35:55 -08:00
Brad Hefta-Gaub
7472efc637 don't count NoData avatars as having been broadcast, fix avatars slightly out of view from freezing 2017-02-26 14:07:45 -08:00
Seth Alves
88c850afa2 voxel-paint paints with capsules rather than spheres 2017-02-26 12:56:17 -08:00
Stephen Birarda
f213b32167 clear the entity viewer before restarting ESS script engine 2017-02-26 09:38:51 -08:00
Menithal
1d8be2aeaa Added missing dynamic 2017-02-26 19:17:46 +02:00
Seth Alves
542cb7ab85 optimize RenderablePolyVoxEntityItem::compressVolumeDataAndSendEditPacket 2017-02-26 09:03:34 -08:00
Menithal
69949cd6b5 Finalized Grab-Clone action 2017-02-26 18:49:13 +02:00
Seth Alves
6227db9fc0 optimize RenderablePolyVoxEntityItem::setSphere 2017-02-26 08:30:29 -08:00
Seth Alves
1db7d8b116 Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti 2017-02-26 06:32:49 -08:00
Seth Alves
422b0bb952 don't set _dirtyFlags if polyvox is collisionless 2017-02-25 21:14:13 -08:00
Seth Alves
7a31a99e3c back out previous experiment 2017-02-25 21:13:20 -08:00
Seth Alves
1e81edbaea make a copy of volData before computing the visual mesh 2017-02-25 15:32:08 -08:00
Philip Rosedale
4925b3c47c Merge pull request #9756 from ctrlaltdavid/21122 
Point index finger and raise thumb if not touching controller
 2017-02-25 14:59:48 -08:00
sam
7a4ec35b99 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-25 13:01:09 -08:00