Brad Hefta-Gaub
|
6d6b66f19a
|
Merge pull request #4641 from huffman/window-close-quit
Quit application when main window is closed
|
2015-04-15 09:42:52 -07:00 |
|
Brad Hefta-Gaub
|
a105f579ce
|
Merge pull request #4621 from jherico/oculus_crash
Attempt to stop the crashing on exit caused by the Oculus SDK
|
2015-04-15 08:52:17 -07:00 |
|
Brad Hefta-Gaub
|
348dce86c1
|
Merge pull request #4645 from Atlante45/generated_ratio
Generated audio moved to developer script
|
2015-04-15 08:46:07 -07:00 |
|
Brad Hefta-Gaub
|
6fbda0e81b
|
Merge pull request #4646 from Atlante45/editors_mute_environment
Only editor can mute environment
|
2015-04-15 08:45:56 -07:00 |
|
Atlante45
|
2f2be70eb8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio
|
2015-04-15 17:30:57 +02:00 |
|
Atlante45
|
92ad0b3fc4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editors_mute_environment
|
2015-04-15 17:30:36 +02:00 |
|
Atlante45
|
604a13f8ad
|
Only editor can mute environment
|
2015-04-15 17:04:59 +02:00 |
|
Atlante45
|
d2775fe9b3
|
Fix for people running older version of interface
|
2015-04-15 16:52:41 +02:00 |
|
Leonardo Murillo
|
3f0d9b7532
|
Merge pull request #4602 from ctrlaltdavid/20447
CR for Worklist #20447 - Prepare Interface to include DDE face tracking
|
2015-04-15 08:49:31 -06: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 |
|
Clément Brisset
|
7b149fe898
|
Merge pull request #4640 from huffman/fix-spinner
Fix stuck-spinners in entity properties
|
2015-04-15 14:36:59 +02:00 |
|
Atlante45
|
bd3b25383a
|
Some code cleanup
|
2015-04-15 14:20:50 +02:00 |
|
Brad Hefta-Gaub
|
aad45fbec4
|
Merge pull request #4637 from AndrewMeadows/thermonuclear
fix bug where fly speed is limited to walk speed
|
2015-04-14 14:29:09 -07:00 |
|
Ryan Huffman
|
4d34ba7bdf
|
Update main window to quit app when closed
|
2015-04-14 10:57:47 -07:00 |
|
Ryan Huffman
|
b6942e2300
|
Fix stuck-spinners in entity properties
|
2015-04-14 10:11:52 -07:00 |
|
David Rowe
|
f509d08378
|
Handle DDE already running
|
2015-04-13 23:12:13 -07:00 |
|
David Rowe
|
b7f7cebb80
|
Handle DDE stopping unexpectedly
|
2015-04-13 22:41:17 -07:00 |
|
David Rowe
|
3b6a35c38f
|
Merge branch 'master' into 20447
|
2015-04-13 17:22:34 -07:00 |
|
David Rowe
|
13c038879d
|
Don't repeat constant values
|
2015-04-13 17:13:03 -07:00 |
|
David Rowe
|
2c4f049851
|
Change OSX DDE program path per build system requirements
|
2015-04-13 17:11:27 -07:00 |
|
Andrew Meadows
|
86f89a1d6f
|
fix bug where fly speed is limited to walk speed
|
2015-04-13 13:23:15 -07:00 |
|
Andrew Meadows
|
fe482b35ff
|
Merge pull request #4635 from sethalves/fix-extents-race
don't compute shape info until both render and collision geometries are ...
|
2015-04-13 10:19:06 -07:00 |
|
Seth Alves
|
8479f0d4c1
|
don't compute shape info until both render and collision geometries are fully loaded
|
2015-04-13 09:34:38 -07:00 |
|
Andrew Meadows
|
f969517ab0
|
Merge pull request #4633 from Atlante45/master
Fix ghost avatars
|
2015-04-13 08:45:01 -07:00 |
|
Andrew Meadows
|
0a5ae8e7e1
|
Merge pull request #4610 from thoys/20367
CR for Job #20367 - Enable getPublicScripts, and getRunningScripts
|
2015-04-13 08:42:39 -07:00 |
|
Clément Brisset
|
ccfb912b89
|
Merge pull request #4632 from ctrlaltdavid/fix-typo
Fix typo
|
2015-04-13 15:59:33 +02:00 |
|
Atlante45
|
809c7919aa
|
Fix ghost avatars
|
2015-04-13 15:57:36 +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 |
|
Thijs Wenker
|
cf403a7ad8
|
Merge branch 'master' of https://github.com/worklist/hifi into 20367
|
2015-04-09 23:47:20 +02:00 |
|
Thijs Wenker
|
0cb5ee5bd1
|
- Scripts JS object renamed to ScriptDiscoveryService.
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
|
2015-04-09 23:46:49 +02: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 |
|