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

18961 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
340742ec36 Merge pull request #3821 from ZappoMan/movables 
More work on the movable.js script
 2014-11-18 16:53:09 -08:00
Brad Hefta-Gaub
02b8ef2a05 Merge pull request #3822 from birarda/master 
restore default domain for clean app launch
 2014-11-18 15:48:27 -08:00
Stephen Birarda
2274b35d08 connect to sandbox domain by default 2014-11-18 15:35:11 -08:00
Brad Hefta-Gaub
ee19a2d5a7 Merge pull request #3820 from huffman/grid-updates 
Grid tool updates + fixes
 2014-11-18 14:57:08 -08:00
Brad Hefta-Gaub
b94f8c6b87 Merge pull request #3818 from samcake/temp0 
Introduce the Stereo optimization for occulus rendering path
 2014-11-18 14:56:14 -08:00
ZappoMan
7af3843bed Merge branch 'master' of https://github.com/highfidelity/hifi into movables 2014-11-18 14:50:07 -08:00
ZappoMan
c070835681 use move sounds for turning until further research and foley work 2014-11-18 14:41:56 -08:00
ZappoMan
b53124cba7 tweaks to sound behavior 2014-11-18 14:25:12 -08:00
Ryan Huffman
2bfd3d213a Update ToolWindow to auto-hide itself when main window loses focus 2014-11-18 12:50:37 -08:00
Ryan Huffman
ad3d7fbfb4 Improve performance of drawing GridOverlay3D 2014-11-18 12:24:52 -08:00
Ryan Huffman
16e3887cbc Set snapToGrid to default to false 2014-11-18 10:28:14 -08:00
Ryan Huffman
a4cc12e448 Add snapToSpacing functionality 2014-11-18 10:28:03 -08:00
Ryan Huffman
10008cb41f Fix snapToGrid checkbox not working 2014-11-18 10:27:26 -08:00
Brad Hefta-Gaub
e1085a6cbb Merge pull request #3816 from AndrewMeadows/bispinor 
changes to EntityTree simulation state management
 2014-11-18 10:03:22 -08:00
Ryan Huffman
c39bd362b7 Fix grid controls not updateable 2014-11-18 09:52:00 -08:00
dev
853015da4c Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-18 09:47:25 -08:00
dev
2997589559 Merge branch 'temp0' of https://github.com/samcake/hifi into temp0 2014-11-18 09:46:43 -08:00
dev
4442b46880 Introduce the stereo improvment for the Oculus rendering path 2014-11-18 09:44:30 -08:00
Philip Rosedale
4168249ef5 Merge pull request #3817 from ZappoMan/movables 
Add "rotate" and "sounds" to movable.js
 2014-11-18 09:17:08 -08:00
Andrew Meadows
2761409270 fix build error on linux 2014-11-18 08:55:01 -08:00
ZappoMan
8f9ca32a2b added sounds to moving 2014-11-17 22:13:49 -08:00
ZappoMan
bc4e7ab662 add rotate support to movable.js 2014-11-17 20:13:17 -08:00
ZappoMan
35b5dd520e added simulated holdingClickOnEntity in case of no mouse move 2014-11-17 20:12:58 -08:00
Andrew Meadows
b07a580651 merge updstream/master into andrew/bispinor 2014-11-17 17:50:17 -08:00
Andrew Meadows
47615ba9c2 changeEntityState() --> updateEntityState() 2014-11-17 17:38:26 -08:00
Andrew Meadows
af606f01a9 combined SimulationStates Moving and Changing 
also funnel entity updates by UDP packet through a single list
 2014-11-17 17:35:44 -08:00
Clément Brisset
62471c90e3 Merge pull request #3815 from Atlante45/draggable_js 
User separate gverb instance for local reverb
 2014-11-17 17:09:22 -08:00
Atlante45
5eac93dcfd User separate gverb instance for local reverb 2014-11-17 16:59:23 -08:00
Andrew Meadows
114364e37a cleanup/optimization of Octree::readElementData() 2014-11-17 16:39:26 -08:00
Andrew Meadows
971804b98e name change shinkIfNeeded() -> shrinkIfNeeded() 2014-11-17 16:14:49 -08:00
AndrewMeadows
b48c2c2717 Merge pull request #3813 from Atlante45/draggable_js 
Faster and better Local reverb / no echo
 2014-11-17 15:16:06 -08:00
AndrewMeadows
c2e80aed70 Merge pull request #3809 from Atlante45/mute_signal 
JS Mute signal
 2014-11-17 15:14:40 -08:00
Clément Brisset
b72e578083 Merge pull request #3814 from ZappoMan/movables 
first cut at movable entities script
 2014-11-17 15:09:35 -08:00
ZappoMan
1ac9f2f563 first cut at movable entities script 2014-11-17 14:51:46 -08:00
Atlante45
a8c38aab64 dryFraction factorisation 2014-11-17 14:47:20 -08:00
Atlante45
082b9ff59f Faster and better Local reverb / no echo 2014-11-17 13:43:55 -08:00
Chris Collins
9fac84a937 Changed the Alpha on the editmodels overlay 
Changed the Alpha on the editmodels overlay
 2014-11-17 12:58:54 -08:00
Andrzej Kapolka
50d7fc04f5 Merge pull request #3812 from ey6es/master 
Adjust mirror/billboard distances for new avatar scale.
 2014-11-17 12:20:55 -08:00
Andrzej Kapolka
5b47b067b7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-11-17 12:20:14 -08:00
Clément Brisset
b2317d4495 Merge pull request #3811 from Atlante45/draggable_js 
Proportional dry fraction
 2014-11-17 12:14:17 -08:00
Atlante45
de2b86957b Proportional dry fraction 2014-11-17 12:04:45 -08:00
Andrzej Kapolka
3f3eae9350 Adjusted distances for new avatar sizes. 2014-11-17 12:02:09 -08:00
Philip Rosedale
2e6330e3c4 Merge pull request #3810 from Atlante45/new_reverb_settings_description 
New text for reverb settings
 2014-11-17 11:50:19 -08:00
AndrewMeadows
42fba18018 Merge pull request #3808 from ZappoMan/persistThreadImprovements 
Persist File Backup Improvements
 2014-11-17 11:41:49 -08:00
Atlante45
18faa78aa3 New text for reverb settings 2014-11-17 11:22:32 -08:00
ZappoMan
bdfe02bbd0 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h
 2014-11-17 11:22:00 -08:00
ZappoMan
ec64bef951 revert debugging change 2014-11-17 11:18:38 -08:00
AndrewMeadows
e2218de71b Merge pull request #3807 from ZappoMan/flightTimeDebugging 
Flight time debugging
 2014-11-17 10:59:46 -08:00
Atlante45
0528a9ff9b Remove forgotten setLastMuted 2014-11-17 10:49:35 -08:00
Atlante45
4615afe034 Remove lastMuted member in AvatarAudioStream 2014-11-17 10:32:28 -08:00