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

6173 commits

Author SHA1 Message Date
Sam Gateau
87471df7a1 First version of the lighmap working 2014-11-21 18:08:34 -08:00
Andrzej Kapolka
282732677f Catch and log BitstreamExceptions when reading datagrams. 2014-11-21 16:45:39 -08:00
Andrzej Kapolka
4b24a6ca80 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-21 16:27:30 -08:00
Andrzej Kapolka
6cd96c95f4 Include a context in the Bitstream so that streamed objects can find their 
LOD.
 2014-11-21 16:26:58 -08:00
AndrewMeadows
8d9df8570c Merge pull request #3847 from ey6es/metavoxels 
Big metavoxel update: removed unused pieces, converted heightfields to "spanners" in order to allow arbitrary transforms, switched to 16 bit heightfields with lossless compression, some rendering improvements.
 2014-11-21 15:57:00 -08:00
ZappoMan
bd2adf08e3 fix to drift in usecTimestampNow() caused when computer sleeps 2014-11-21 13:33:53 -08:00
Andrzej Kapolka
41eaf340c6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-21 12:47:26 -08:00
Andrzej Kapolka
03e302c508 Removed a debug statemen. 2014-11-20 17:34:37 -08:00
Philip Rosedale
cd2a6f0f9c merge fix 2014-11-20 17:35:50 -06:00
Andrzej Kapolka
0a976ad262 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-20 11:26:29 -08:00
Brad Hefta-Gaub
168487e0a7 Merge pull request #3840 from huffman/entity-snap-on-create 
Entity snap on create (+ remove getEntityItemID)
 2014-11-20 09:58:54 -08:00
Sam Gateau
7daff18101 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-20 09:57:59 -08:00
Brad Hefta-Gaub
32f60c4255 Merge pull request #3839 from birarda/master 
trim whitespace for place name lookup, potential lobby crash fix
 2014-11-20 09:57:39 -08:00
Sam Gateau
764ad72471 adding the light map support from FBX 2014-11-20 09:54:41 -08:00
Ryan Huffman
6a68281308 Remove EntityScriptingInterface::getEntityItemID 2014-11-20 09:39:41 -08:00
Stephen Birarda
1aa98dfc4c trim whitespace for place name lookup 2014-11-20 09:24:43 -08:00
Philip Rosedale
5101e469dc Merge branch 'master' of https://github.com/worklist/hifi 2014-11-19 23:54:31 -06:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Clément Brisset
2c6a76ec17 Merge pull request #3830 from huffman/entity-list-window 
Entity list window
 2014-11-19 17:05:48 -08:00
Brad Hefta-Gaub
925e2fab66 Merge pull request #3835 from birarda/lobby 
lobby changes, Sound and AudioInjectorOptions stereo tweaks
 2014-11-19 16:59:54 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
63be5ae9bf Merge pull request #3834 from ZappoMan/fixMissingRegistrationPointBug 
fix a major bug in updateEntity() caused by the new properties not containing "registrationPoint"
 2014-11-19 16:42:16 -08:00
Brad Hefta-Gaub
270939dee4 Merge pull request #3833 from AndrewMeadows/thermonuclear 
flag EntityItem when changed by update
 2014-11-19 16:40:40 -08:00
Brad Hefta-Gaub
75304fd419 Merge pull request #3832 from Atlante45/fix_left_right_jumping 
Fix left/right audio jumping
 2014-11-19 16:40:04 -08:00
Brad Hefta-Gaub
0b7c3d3356 Merge pull request #3828 from AndrewMeadows/bispinor 
don't slide feet during idle animations
 2014-11-19 16:38:34 -08:00
ZappoMan
2a08a6d48e fix a bug in updateEntity() caused by the new properties not containing registrationPoint 2014-11-19 16:07:07 -08:00
Andrew Meadows
11e7339e9e add UPDATE_COLLISION_GROUP and UPDATE_MOTION_TYPE 2014-11-19 15:52:57 -08:00
Ryan Huffman
a18a83d45c Update getEntityItemID() to check for id existence 2014-11-19 15:31:41 -08:00
Andrew Meadows
97d1dc4200 use updateFoo() where entity properties need relay 
clear EntityItem updateFlags when processed
 2014-11-19 15:12:22 -08:00
Stephen Birarda
987b75d8f7 switch to next musak when finished 2014-11-19 14:52:57 -08:00
Atlante45
0a9a6f1ef8 Fix parsing of silent packets properties 2014-11-19 14:32:50 -08:00
Atlante45
b5abf44aa3 Comment packt type number every 5 2014-11-19 14:31:49 -08:00
Andrew Meadows
a183248f38 add updateFoo() methods that accumulate flags 
about properties that have changed
 2014-11-19 14:12:26 -08:00
Stephen Birarda
45450c4fe3 handle offset passed in AudioInjectorOptions for mixer injections 2014-11-19 13:42:24 -08:00
Stephen Birarda
81c5f9ba5a inject lobby music at a random starting point 2014-11-19 13:36:27 -08:00
Ryan Huffman
3ff44964b5 Add entity list window 2014-11-19 13:25:38 -08:00
Stephen Birarda
03bfaa4869 handle RAW stereo audio files by using stereo.raw extension 2014-11-19 12:20:12 -08:00
Andrzej Kapolka
b68c836b12 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-19 11:49:27 -08:00
Andrew Meadows
7f4e0c206c cache indeces to toe joints 2014-11-19 09:13:03 -08:00
Philip Rosedale
9afaf8f6d8 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 21:58:40 -08:00
Andrzej Kapolka
0cc92dc87e More spanner voxelization bits. 2014-11-18 19:15:06 -08:00
Andrzej Kapolka
59fcff740b Remove remaining heightfield attribute bits. 2014-11-18 17:17:07 -08:00
Andrzej Kapolka
a0f75c990e Working on fetching/clearing heightfield chunks. 2014-11-18 17:12:47 -08:00
Andrzej Kapolka
632f3bfa7f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-18 17:12:40 -08:00
Stephen Birarda
8c65c6c1c8 fix comment for actual time format 2014-11-18 17:02:28 -08:00
Stephen Birarda
705d3da089 cleanup time in log prefix 2014-11-18 17:00:33 -08:00
Stephen Birarda
2274b35d08 connect to sandbox domain by default 2014-11-18 15:35:11 -08:00
Andrzej Kapolka
add615810b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-18 11:19:04 -08:00
Philip Rosedale
79497586dd Merge branch 'master' of https://github.com/worklist/hifi 2014-11-18 10:15:32 -08:00
Andrew Meadows
2761409270 fix build error on linux 2014-11-18 08:55:01 -08:00
Andrzej Kapolka
ba50beab91 Normal fix. 2014-11-17 18:30:21 -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
Philip Rosedale
ce6464eaf0 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 17:19:08 -08:00
Andrzej Kapolka
4308a45028 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 16:46:51 -08:00
Andrzej Kapolka
e946479b00 Working on heightfield voxelization. 2014-11-17 16:46:35 -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
c2e80aed70 Merge pull request #3809 from Atlante45/mute_signal 
JS Mute signal
 2014-11-17 15:14:40 -08:00
Andrzej Kapolka
2bb01d737c Renormalization. 2014-11-17 13:19:58 -08:00
Andrzej Kapolka
f18d4e4a0e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-17 12:23:22 -08:00
Philip Rosedale
1836b5639e Merge branch 'master' of https://github.com/worklist/hifi 2014-11-17 11:59:27 -08:00
Andrzej Kapolka
683306797d Working on adjusting the range limits when we raise/lower past the original 
bounds.
 2014-11-17 11:43:16 -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
ZappoMan
ce54eda022 Merge branch 'master' of https://github.com/highfidelity/hifi into flightTimeDebugging 2014-11-17 10:31:26 -08:00
Atlante45
46eebe9d40 Give noisy mutes their own packet type 2014-11-17 10:26:47 -08:00
Atlante45
0507edf90f Merge branch 'master' of https://github.com/highfidelity/hifi into mute_signal 2014-11-17 09:56:55 -08:00
Atlante45
2585013615 JS signal when AM mutes client 2014-11-17 09:54:43 -08:00
ZappoMan
f44513ebe7 added support for rolling version numbers in backups 2014-11-15 22:55:12 -08:00
ZappoMan
59c13f3c38 coding standard cleanup, fix warning 2014-11-15 22:26:55 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
ZappoMan
c70a7e0553 coding standard cleanup, fix warning 2014-11-15 20:46:30 -08:00
ZappoMan
05fa3c89a7 Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity 2014-11-15 20:38:07 -08:00
ZappoMan
28fc6d15f4 test 2014-11-14 22:53:29 -08:00
ZappoMan
f0cd258a13 test 2014-11-14 22:51:04 -08:00
ZappoMan
66f519d613 dry up EntityItemProperties with macros 2014-11-14 22:15:19 -08:00
ZappoMan
55ac9c8ef7 make sure properties include type for proper encoding 2014-11-14 21:16:50 -08:00
Andrzej Kapolka
f192f2428e Height painting. 2014-11-14 18:06:38 -08:00
Philip Rosedale
9e5ad96bfe Merge branch 'master' of https://github.com/worklist/hifi 2014-11-14 17:55:25 -08:00
Clément Brisset
c80dff064f Merge pull request #3798 from ZappoMan/persistThreadImprovements 
Persist thread improvements/Backup support
 2014-11-14 17:25:17 -08:00
Andrzej Kapolka
bba042e823 Heightfield material paint bits. 2014-11-14 16:52:29 -08:00
ZappoMan
dd349ebfd1 coding standard cleanup, fix warning 2014-11-14 16:03:43 -08:00
ZappoMan
62c64479c2 first cut at text entity 2014-11-14 15:58:12 -08:00
Andrzej Kapolka
6dc4abd286 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 13:22:37 -08:00
Brad Hefta-Gaub
8485a07352 Merge pull request #3799 from samcake/temp0 
improvement on stereo rendering (but not Occulus....)
 2014-11-14 13:06:43 -08:00
Andrzej Kapolka
779f5f7614 Default avatar fixes. 2014-11-14 13:02:02 -08:00
Andrzej Kapolka
aae168dd46 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-14 12:43:52 -08:00
Sam Gateau
0973d197cf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 12:25:00 -08:00
Andrzej Kapolka
14eb87aefd Eliminate wacky scales in favor of newfangled "meters." 2014-11-14 12:23:47 -08:00
ZappoMan
de12b2543d winblows 2014-11-14 11:50:45 -08:00
ZappoMan
c33272bcd8 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 2014-11-14 11:34:37 -08:00
ZappoMan
899a3985a5 OctreePersistThread defaults to no backup, server always uses settings 2014-11-14 11:32:18 -08:00
ZappoMan
6ee4e611ac add persist settings to domain settings, make default backup interval 30 minutes 2014-11-14 11:31:06 -08:00
ZappoMan
cd4b267732 implement persist backup 2014-11-14 11:11:32 -08:00
Philip Rosedale
752a255aee Merge branch 'master' of https://github.com/worklist/hifi 2014-11-14 10:57:11 -08:00
Stephen Birarda
86284036f1 put back timestamp in log 2014-11-14 10:35:13 -08:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
ZappoMan
11058355a0 implement aboutToFinish for persist thread to allow final save before shutdown 2014-11-14 09:55:32 -08:00
AndrewMeadows
edc599bc2d Merge pull request #3792 from ZappoMan/bugFixes 
fix a couple bugs
 2014-11-14 08:33:49 -08:00
ZappoMan
7b69642c67 fix bug in animation jitter on turn 2014-11-13 23:03:12 -08:00
ZappoMan
744f9bc508 better handle corrupt packets that would cause unreasonably deep recursion 2014-11-13 22:26:18 -08:00
Andrzej Kapolka
b879471a4b Cursor rendering on spanners. 2014-11-13 20:55:36 -08:00
ZappoMan
5da0d1e55a fix regexs for dangerously deep recurssion suppression 2014-11-13 20:53:31 -08:00
Brad Hefta-Gaub
3441167838 Merge pull request #3790 from Atlante45/entities_userdata 
Entities userdata
 2014-11-13 20:43:57 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
Andrzej Kapolka
b2ac33db16 Ray tests for heightfield spanners. 2014-11-13 19:53:16 -08:00
ZappoMan
6a4f1c857f fix a couple bugs 2014-11-13 18:35:04 -08:00
Andrzej Kapolka
75e1cf8a7b Migrate getHeightfieldHeight to spanner heightfields. 2014-11-13 18:00:25 -08:00
Atlante45
f914f02a0b Move user data to end of enum 2014-11-13 17:44:22 -08:00
Atlante45
9fc7451581 Move macros to the end 2014-11-13 17:06:57 -08:00
Atlante45
40576b3c03 moved append to the end 2014-11-13 17:02:45 -08:00
Philip Rosedale
300708b3a2 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-13 16:38:01 -08:00
Atlante45
f8be98260c String specific macros 2014-11-13 16:32:15 -08:00
Stephen Birarda
7630aab963 only debug request sound if there is a network request 2014-11-13 16:18:19 -08:00
Atlante45
f47620231e Entities have user data 2014-11-13 16:16:20 -08:00
Andrzej Kapolka
dd87a45211 Fix for server saving, use Paeth filter before compressing heightfield data. 2014-11-13 16:11:48 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
Stephen Birarda
a771f72ed2 Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-11-13 14:15:02 -08:00
Andrzej Kapolka
8a0ff4acf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
 2014-11-13 12:17:37 -08:00
Sam Gateau
420118e9db Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-13 11:04:12 -08:00
Philip Rosedale
a23390fe82 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-13 10:59:26 -08:00
Sam Gateau
7e2c4c0561 SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint 2014-11-13 10:57:32 -08:00
Stephen Birarda
fed711e331 Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-11-13 10:37:49 -08:00
Stephen Birarda
fd6b9c3550 changes to sound class to allow caching of sounds 2014-11-13 10:16:42 -08:00
ZappoMan
3e521e089b fix unix build 2014-11-13 09:48:15 -08:00
ZappoMan
8ad3ce7daf bump packet version 2014-11-13 09:32:59 -08:00
ZappoMan
8ec12ea954 add full animation settings support 2014-11-13 08:59:06 -08:00
ZappoMan
701059d797 removed some debug 2014-11-13 08:58:33 -08:00
ZappoMan
bc60c90308 only actually set the properties if they were in the buffer 2014-11-13 08:39:19 -08:00
ZappoMan
09a06c9d82 add debug streamer for xColor 2014-11-13 08:14:01 -08:00
ZappoMan
43f44f4131 suppress some potentially repeated log messages 2014-11-13 07:52:00 -08:00
ZappoMan
e4355cd139 calculated animationSettings property to include older properties 2014-11-13 07:34:54 -08:00
Philip Rosedale
d248e1e2c4 Add reflect(direction, normal) to Vec3 scripting calls 2014-11-12 23:03:26 -08:00
David Rowe
fac6b6b426 Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
ZappoMan
4077f6c2ab Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification 2014-11-12 20:39:39 -08:00
Andrzej Kapolka
110cf93cc4 Basic encoding/decoding up and running again. 2014-11-12 19:27:25 -08:00
ZappoMan
c9e8c21d8d partial work on blending of animation settings 2014-11-12 19:23:48 -08:00
Andrzej Kapolka
aaffd023e2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-12 18:03:54 -08:00
ZappoMan
8a2e3d5045 add animationSettings property to model entities 2014-11-12 17:41:55 -08:00
Sam Gateau
b6c004c431 Fix syntax that doesn't compile on linux and used smart glm::max instruction 2014-11-12 17:16:43 -08:00
ZappoMan
ef17659ea2 cleanup 2014-11-12 16:57:42 -08:00
ZappoMan
dd22683672 fixing up animation loop issues 2014-11-12 16:53:16 -08:00
Sam Gateau
c0496fd466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 16:52:34 -08:00
Sam Gateau
8fb04af59d defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design 2014-11-12 16:40:45 -08:00
ZappoMan
ba79f40007 add some debug 2014-11-12 16:12:34 -08:00
ZappoMan
245f019836 first cut at migrating entity animation frame calculations to use AnimationLoop 2014-11-12 16:10:35 -08:00
Andrzej Kapolka
49a9387020 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-12 15:42:36 -08:00
Andrzej Kapolka
d05bb49a74 Yet more heightfield spanner bits. 2014-11-12 15:40:54 -08:00
ZappoMan
6ff8abcbdd sepearate looping logic from AnimationHandle 2014-11-12 14:47:10 -08:00
ZappoMan
68bd6c23d9 sepearate looping logic from AnimationHandle 2014-11-12 14:47:02 -08:00
Sam Gateau
e47524d70a fix syntax and missing constant name 2014-11-12 10:41:50 -08:00
Sam Gateau
5f0fdeccb2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 00:27:12 -08:00
Sam Gateau
b716a512c6 Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level 2014-11-12 00:26:44 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
ed9a2bf676 fix for AudioInjector QScriptValue conversion typos 2014-11-11 20:48:34 -08:00
Stephen Birarda
9a45a70764 repairs to Sound script conversion typos 2014-11-11 20:47:40 -08:00
Brad Hefta-Gaub
1d80fd7e4f Merge pull request #3772 from PhilipRosedale/master 
Less aggressive audio muting default, entity getter returns by reference
 2014-11-11 20:32:46 -08:00
Stephen Birarda
9aa950e657 fix audio injector cleanup for local only injectors 2014-11-11 17:34:03 -08:00
Stephen Birarda
cb5d5dd3a8 handle looping via AudioInjectorLocalBuffer 2014-11-11 16:57:25 -08:00
Sam Gateau
7a9f45d34f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-11 16:40:11 -08:00
Sam Gateau
668c5e298d clean up the Transform class and the rendering path in Model.cpp 2014-11-11 16:39:00 -08:00
Stephen Birarda
a5a02b5f8a add AudioInjectorLocalBuffer for more control 2014-11-11 16:34:00 -08:00
Philip Rosedale
ca878b9933 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-11 15:48:43 -08:00
Andrzej Kapolka
16bf2a3ad3 More chipping away at heightfield spanners. 2014-11-11 15:37:15 -08:00
Stephen Birarda
0e30c65e60 handle cleanup of local injection, volume 2014-11-11 15:12:11 -08:00
Philip Rosedale
e6bbb53483 Merge pull request #3774 from ZappoMan/newEntityNotification 
implement "preload" method for entity Scripts
 2014-11-11 14:46:23 -08:00
Stephen Birarda
83529c1fed fix QIODevice fail in AudioInjector by passing explicit size 2014-11-11 14:45:33 -08:00
Andrzej Kapolka
08475cc90b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-11 14:40:34 -08:00
Andrzej Kapolka
caef237376 More work on spannerizing heightfields. 2014-11-11 14:40:05 -08:00
Brad Hefta-Gaub
d38496c3c7 Merge pull request #3771 from huffman/entity-grid-tool 
Add entity grid tool
 2014-11-11 14:21:26 -08:00
ZappoMan
8ec3f8ce99 implement support for calling preload when the script changes 2014-11-11 14:21:06 -08:00
Stephen Birarda
cd3877b584 handle local audio output via AudioInjector directly for control 2014-11-11 14:14:43 -08:00
Philip Rosedale
8c35d4e3dc remove debug line 2014-11-11 14:08:59 -08:00
ZappoMan
2bc7896dee first cut at preload script behavior 2014-11-11 13:46:48 -08:00
Philip Rosedale
0508726c40 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-11 13:23:55 -08:00
Stephen Birarda
d0e8c294da handle passing of local audio interface to AudioInjector 2014-11-11 11:22:16 -08:00
Stephen Birarda
3d1bb68c72 fix for playSound argument to match QScriptValue conversion 2014-11-11 11:04:33 -08:00
Stephen Birarda
ef2c181c98 repairs to audio classes for Sound* to QScriptValue 2014-11-11 10:55:07 -08:00
Philip Rosedale
d9141b4010 Merge pull request #3750 from Atlante45/reverb_for_own_voice 
Reverb for own voice
 2014-11-11 10:52:26 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Stephen Birarda
a8681cd5b6 changes to allow AudioInjectorOptions to operate as a hash from js 2014-11-11 10:24:21 -08:00
Stephen Birarda
d083e75d2d groundwork for better locally looped audio 2014-11-11 09:59:10 -08:00
Ryan Huffman
b04fd89e4f Update grid tool html location 2014-11-11 09:55:30 -08:00
Sam Gateau
ad51416c28 move the transform class files to the Shared library, still problem with negative scale composition 2014-11-11 09:54:35 -08:00
Andrzej Kapolka
e0e9eaa15d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-10 18:06:51 -08:00
Andrzej Kapolka
b94dab0e8f More work on heightfield spanners. 2014-11-10 18:06:38 -08:00
Andrzej Kapolka
0664ff3181 Moved spanners into separate file, working on heightfields as spanners. 2014-11-10 15:51:41 -08:00
Philip Rosedale
38a142eeb8 return value by reference 2014-11-10 15:23:13 -08:00
Andrzej Kapolka
a77525209d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-10 11:54:05 -08:00
Andrzej Kapolka
431bb0af1d Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/Application.cpp
 2014-11-10 11:46:09 -08:00
Andrzej Kapolka
536d6287bd Added merged flag to Spanner. 2014-11-10 11:44:42 -08:00
Brad Hefta-Gaub
338c5aea94 Merge pull request #3767 from birarda/plugs 
fix a bug produced by not setting deleted var to NULL
 2014-11-10 11:21:24 -08:00
Stephen Birarda
fda5b0fffd fix a bug produced by not setting deleted var to NULL 2014-11-10 11:03:15 -08:00
Atlante45
d0a535aee5 Switch members in EntityItemProperties to hack around corruption bug 2014-11-10 10:24:14 -08:00
Stephen Birarda
9b2acadb4b include c++ header for memset 2014-11-07 17:24:05 -08:00
Stephen Birarda
6a4808aac8 include string.h for memset usage 2014-11-07 17:22:54 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00