Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 08:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
50711 commits 71 branches 56 tags 1.2 GiB
Commit graph

50711 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
8b94e64082 Merge pull request #9539 from huffman/feat/tealight-entity-server 
Add tealight.js entity server script
 2017-01-31 20:51:19 -08:00
Brad Hefta-Gaub
2fc6b4b0af Merge pull request #9544 from humbletim/fix-rightclick-menu 
Hide webview context menus when clicked
 2017-01-31 13:03:50 -08:00
samcake
04d5173328 Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda 
compute Model's local bounds outside pending changes queue
 2017-01-31 11:40:21 -08:00
Brad Hefta-Gaub
3bbb57599b Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix 
Fix bug that causes GCC not to detect AVX2
 2017-01-31 11:11:35 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue 
Adding support for disabling texturing from the material
 2017-01-31 10:39:44 -08:00
Brad Hefta-Gaub
485973368e Merge pull request #9549 from kencooke/audio-wasapi-leakfix 
Fix memory-leak in Windows audio stack (audiodg.exe grows without bound)
 2017-01-31 10:38:24 -08:00
Brad Hefta-Gaub
c1834a033c Merge pull request #9563 from birarda/entity-script-server 
avoid recursion to unchanged octree elements with frustumless queries too
 2017-01-31 09:40:20 -08:00
Seth Alves
6db9e7a0cf Merge pull request #9393 from highfidelity/tablet-ui 
Tablet UI
 2017-01-31 09:16:59 -08:00
Seth Alves
2ffdc213a9 Merge pull request #9567 from sethalves/tablet-ui 
Tablet ui
 2017-01-31 08:58:33 -08:00
Seth Alves
7c2957cfa7 merge from upstream 2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098 Merge pull request #9267 from AndrewMeadows/report-all-collision-events 
fix for missed START collision events
 2017-01-31 08:54:58 -08:00
Brad Hefta-Gaub
459b2da6c3 Merge pull request #9558 from zfox23/FILTERS_FixFilters1 
ENTITY FILTERS: Improve zone filter; maxVelocity filter; documentation
 2017-01-31 08:52:49 -08:00
Brad Hefta-Gaub
6b97db66d5 Merge pull request #9458 from zzmp/audio/threaded-local 
local audio bypass
 2017-01-31 08:49:49 -08:00
Brad Hefta-Gaub
5287c94786 Merge pull request #9555 from huffman/fix/entity-is-child-of-crash 
Fix Entities.isChildOfParent crashing if given unknown ID
 2017-01-31 08:42:45 -08:00
Brad Hefta-Gaub
619bcdeed8 Merge pull request #9553 from huffman/fix/polyvox-import 
Fix importing of PolyVox entities
 2017-01-31 08:42:28 -08:00
David Kelly
8f924e338e Merge pull request #9564 from davidkelly/dk/2708 
Require password verification in domain-server settings
 2017-01-31 08:35:36 -07:00
Seth Alves
7d80679652 Merge pull request #9566 from sethalves/tablet-ui 
Tablet ui
 2017-01-31 05:03:51 -08:00
Seth Alves
39d195fce2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-31 05:02:07 -08:00
Brad Hefta-Gaub
87805fe4eb Merge pull request #9559 from Atlante45/fix/animation-jitter 
Fix animation jitter
 2017-01-30 20:27:21 -08:00
Clément Brisset
3d3e03ec8d Merge pull request #9562 from highfidelity/AlanZimmerman-patch-1-1 
Fix label typo in help graphic
 2017-01-30 17:20:40 -08:00
Ken Cooke
2ce357db3a Fix bug that causes GCC not to detect AVX2 2017-01-30 17:11:48 -08:00
Stephen Birarda
1b1ae48650 don't recurse on octree elements that have not changed 2017-01-30 17:01:45 -08:00
Alan Z
6e7260207f Fix label typo in help graphic 
fixes #2748 in Fogbugz
 2017-01-30 16:51:22 -08:00
David Kelly
eaf033107c Require password verification in domain-server settings 
If you modify the security settings to use a username/password for
access to the domain server settings, we now have a second password
field which must match the first one you entered.
 2017-01-30 17:13:13 -07:00
Zach Fox
18fd965c33 Add note about floats? 2017-01-30 16:07:43 -08:00
Atlante45
c65e884151 Don't set joint "set" flags for animation values 2017-01-30 16:04:54 -08:00
samcake
249ec80d74 Writting a better version of the no texture case 2017-01-30 15:48:48 -08:00
Zach Fox
740a0add8a Updates 2017-01-30 15:47:04 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Anthony Thibault
5a0990fbe4 Merge pull request #9550 from hyperlogic/tablet-ui2 
tablet-ui -> master, PR feedback
 2017-01-30 14:20:28 -08:00
Ryan Huffman
e58c9326a0 Fix Entities.isChildOfParent crashing if given unknown ID 
If an entity was not in the local tree a null deref crash would occur.
This commit makes sure the entity pointer is checked for null before it is used.
 2017-01-30 13:48:33 -08:00
Ryan Huffman
f553656e36 Fix importing of PolyVox entities 
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
 2017-01-30 13:33:42 -08:00
druiz17
74085452b4 Merge pull request #9551 from hyperlogic/tablet-ui 
Improved legibility of tablet in desktop mode.
 2017-01-30 13:25:40 -08:00
Andrew Meadows
6ef4420f37 remove commented out cruft 2017-01-30 13:21:23 -08:00
Andrew Meadows
31861d3192 use inverted collision for B-A event 2017-01-30 13:21:23 -08:00
Andrew Meadows
aa8e7d27db move depth filtering closer to source 2017-01-30 13:21:23 -08:00
Andrew Meadows
b5537304a3 more correct CONTINUE collision event filter 2017-01-30 13:21:23 -08:00
Andrew Meadows
2541bfb1a8 only create collision events for owned entities 2017-01-30 13:21:23 -08:00
Andrew Meadows
0809149a8c harvest collision events before disowning 2017-01-30 13:21:23 -08:00
Andrew Meadows
2162a364a9 minor cleanup 2017-01-30 13:21:23 -08:00
Andrew Meadows
8cf7aee009 fix bug: second collision event with bad data 2017-01-30 13:21:23 -08:00
Andrew Meadows
b7cd8827f9 collision events for owned objects only 
also: fewer entityID lookups for scripted collision sounds and events
 2017-01-30 13:21:23 -08:00
Andrew Meadows
ed17c4fa16 fix an old typo about when to send collision event 2017-01-30 13:19:38 -08:00
Andrew Meadows
54b4612ee3 fix for missed START collision events 2017-01-30 13:18:26 -08:00
Zach Fox
725cfa8045 Fix it! 2017-01-30 13:00:52 -08:00
Howard Stearns
89cc6ac315 Merge pull request #9548 from howard-stearns/non-blocking-entity-filter-init 
fetch entity filter script asynchronously (but reject edits while waiting)
 2017-01-30 12:46:23 -08:00
Anthony J. Thibault
0542945110 Moved SoundEffect into a separate compilation unit. 
Also, fixed license header in TabletScriptingInterface, to include proper author and date.
 2017-01-30 12:46:22 -08:00
Anthony J. Thibault
98b53d1d29 Don't allow mouse dragging the tablet in HMD mode. 2017-01-30 12:07:18 -08:00
Ken Cooke
ab0d5ec178 Fix for memory-leak in Windows audio stack (audiodg.exe grows without bound) 2017-01-30 11:59:30 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode. 
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
 2017-01-30 11:24:59 -08:00