Commit graph

24001 commits

Author SHA1 Message Date
Atlante45
d2775fe9b3 Fix for people running older version of interface 2015-04-15 16:52:41 +02:00
Atlante45
62d3b39c25 less loud generated noise
Prevents the audio mixer from muting you because of too much noise
2015-04-15 16:22:52 +02:00
Atlante45
5f9d7a00fa Correct default to pink noise 2015-04-15 16:22:18 +02:00
Atlante45
9ea72f2a03 Added generated audio to developer menu script 2015-04-15 16:16:13 +02:00
Atlante45
c2c1ccc2b7 Remove generated audio options from menu 2015-04-15 15:50:22 +02:00
Atlante45
b1cfd33438 Add generated audio controls to scripting interface 2015-04-15 15:49:47 +02:00
Atlante45
8f8e4d8dc6 Add generated audio methods to audio interface 2015-04-15 15:49:11 +02:00
Atlante45
bd3b25383a Some code cleanup 2015-04-15 14:20:50 +02:00
Clément Brisset
ccfb912b89 Merge pull request #4632 from ctrlaltdavid/fix-typo
Fix typo
2015-04-13 15:59:33 +02:00
David Rowe
caaf090b87 Fix typo 2015-04-12 13:02:27 -07:00
Philip Rosedale
4ad5a6c138 Merge pull request #4630 from Atlante45/fix_quick_turn
Fix quick turn
2015-04-10 13:43:36 -07:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol
Acceleration and owner in wire protocol
2015-04-10 09:07:47 -07:00
Atlante45
910e13edeb Merge branch 'master' of https://github.com/highfidelity/hifi into fix_quick_turn 2015-04-10 17:51:32 +02:00
Atlante45
176f1beb08 Fix camera quick turn 2015-04-10 17:50:41 +02:00
Philip Rosedale
61e6c0461b Merge pull request #4628 from huffman/fix-selection-error
Fix error in entity properties not showing selections
2015-04-09 20:52:21 -07:00
Ryan Huffman
5a9ee73476 Fix error in entity properties not showing selections 2015-04-09 20:10:02 -07:00
Philip Rosedale
d24264bd81 Merge pull request #4626 from sethalves/island
more changes to vhacd tool -- useful for generating hull for low-poly island
2015-04-09 15:34:48 -07:00
Andrew Meadows
f93ee340fc Merge pull request #4627 from sethalves/no-upper-size-limit-for-collisions
don't keep large things out of physics engine
2015-04-09 15:14:39 -07:00
Seth Alves
4ada3fc9a4 don't keep large things out of physics engine 2015-04-09 15:12:51 -07:00
Seth Alves
efa5c473d2 add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields 2015-04-09 14:29:17 -07:00
Clément Brisset
fea7a58774 Merge pull request #4605 from ericrius1/light
Updated lightcontroller.js logic to find the nearest light when user cli...
2015-04-09 22:49:22 +02:00
Philip Rosedale
eaec0a6ea7 Merge pull request #4625 from ctrlaltdavid/users-tweaks
Tweak users display to work better with variety of backgrounds
2015-04-09 13:34:21 -07:00
David Rowe
d6c15549e4 Tweak users display to work better with variety of backgrounds 2015-04-09 13:03:12 -07:00
Brad Davis
3d6cf82659 Merge pull request #4624 from ctrlaltdavid/memory-fixes
Replace try with nothrow
2015-04-09 12:30:44 -07:00
Andrew Meadows
0751de4304 Merge pull request #4618 from ctrlaltdavid/large-address-aware
Add /LARGEADDRESSAWARE linker flag for Windows builds
2015-04-09 11:18:06 -07:00
Eric Levin
396325629e added back original light controller script 2015-04-09 10:43:34 -07:00
David Rowe
ae3d606e95 Replace try with nothrow 2015-04-09 10:01:31 -07:00
Seth Alves
66ea6f4eb4 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-09 09:59:00 -07:00
Clément Brisset
59a5fac2f1 Merge pull request #4619 from ctrlaltdavid/memory-fixes
Memory fixes
2015-04-09 18:51:02 +02:00
Eric Levin
c0e7cd1f6a deleted unnecessary line with typo 2015-04-09 09:50:12 -07:00
samcake
91d6046051 Merge pull request #4622 from jherico/starfield_hack_fix
Ensure blending is enabled during starfield rendering
2015-04-09 09:45:14 -07:00
Brad Davis
21dd87c11c Merge pull request #4620 from Atlante45/remove_url_extra_whitespace
Trim entity properties set from JS that are strings
2015-04-09 09:29:46 -07:00
Seth Alves
73a1265624 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-09 09:21:06 -07:00
Brad Davis
5efb960645 Ensure blending is enabled during starfield rendering 2015-04-09 09:18:53 -07:00
David Rowe
b2dd53ac43 Coding standard 2015-04-09 08:37:24 -07:00
Atlante45
298a81cea9 Trim entity properties set from JS that are strings 2015-04-09 14:42:26 +02:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting
CR for Animation fixes
2015-04-09 11:39:13 +02:00
Philip Rosedale
f51cafa066 Merge pull request #4616 from huffman/marketplace-always-visible
Marketplace always visible
2015-04-08 20:51:51 -07:00
David Rowe
76d6c6cac5 Delete char* items properly 2015-04-08 20:03:42 -07:00
David Rowe
e768852645 Fix catching bad_alloc
Non-allocation wasn't caught on Windows; it just crashed.
2015-04-08 20:02:22 -07:00
David Rowe
12f5b992c9 Add /LARGEADDRESSAWARE linker flag for Windows builds
Enables Interface to use more than 2GB of memory.
Reduces the incidence of bad_alloc crashes.
2015-04-08 20:01:01 -07:00
Seth Alves
62ff8bf735 set PROP_LAST_ITEM automatically 2015-04-08 17:07:20 -07:00
Seth Alves
51a0fdf3d4 formatting 2015-04-08 15:43:49 -07:00
Seth Alves
2448051c75 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-08 15:39:40 -07:00
Seth Alves
1dd01cde00 expand svo to hold acceleration and id of current simulator node 2015-04-08 15:39:34 -07:00
Seth Alves
30a8b61df3 quiet compiler 2015-04-08 15:39:21 -07:00
Seth Alves
5c709e2638 quiet compiler 2015-04-08 15:39:07 -07:00
Ryan Huffman
a0e324f9f5 Add error for when importing on a domain without permissions 2015-04-08 13:58:14 -07:00
Ryan Huffman
b6af9fde9e Make marketplace button always visible 2015-04-08 13:57:41 -07:00
Philip Rosedale
5e681ee56b Merge pull request #4615 from huffman/align-checkboxes
Align checkboxes
2015-04-08 13:39:25 -07:00