Atlante45
|
2f2be70eb8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio
|
2015-04-15 17:30:57 +02:00 |
|
Atlante45
|
d2775fe9b3
|
Fix for people running older version of interface
|
2015-04-15 16:52:41 +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 |
|
Ryan Huffman
|
b6942e2300
|
Fix stuck-spinners in entity properties
|
2015-04-14 10:11:52 -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 |
|
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 |
|
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 |
|
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 |
|
David Rowe
|
d6c15549e4
|
Tweak users display to work better with variety of backgrounds
|
2015-04-09 13:03:12 -07:00 |
|
Eric Levin
|
396325629e
|
added back original light controller script
|
2015-04-09 10:43:34 -07:00 |
|
Eric Levin
|
c0e7cd1f6a
|
deleted unnecessary line with typo
|
2015-04-09 09:50:12 -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 |
|
Philip Rosedale
|
f51cafa066
|
Merge pull request #4616 from huffman/marketplace-always-visible
Marketplace always visible
|
2015-04-08 20:51:51 -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 |
|
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 |
|
Ryan Huffman
|
e3dea8ccc8
|
Remove margin in entityProperties
|
2015-04-08 13:24:03 -07:00 |
|
Ryan Huffman
|
92b91c9a38
|
Fix checkboxes not aligning with label
|
2015-04-08 13:23:48 -07:00 |
|
Ryan Huffman
|
e2a7072270
|
Update new entity positioning to be in front of camera
|
2015-04-08 12:50:02 -07:00 |
|
Ryan Huffman
|
83918c53b9
|
Update entityProperties properties to take up less space
|
2015-04-08 10:18:29 -07:00 |
|
Ryan Huffman
|
dc503ac068
|
Update entityProperties checkboxes to be inlined
|
2015-04-08 10:18:04 -07:00 |
|
Eric Levin
|
b8719f6e5f
|
made new alternative light script
|
2015-04-08 09:21:24 -07:00 |
|
Eric Levin
|
6de4cec836
|
made randomly chosen sound persistent between sessions by storing sound index in user data. Now using previous rotation and position to compute offset position
|
2015-04-08 09:20:29 -07:00 |
|
Eric Levin
|
a16f6c2ce4
|
remove unnecessary print statement
|
2015-04-07 19:35:41 -07:00 |
|
Eric Levin
|
9c220b3e9b
|
light container now assigned 1 of 3 random light switch sounds. Also light now changes position based on container's change in position AND rotation.
|
2015-04-07 19:25:37 -07:00 |
|
David Rowe
|
7acc413c66
|
Change visibility radio buttons to pop-up menu
|
2015-04-07 10:43:50 -07:00 |
|
Eric Levin
|
7d2fa8d7ce
|
Updated lightcontroller.js logic to find the nearest light when user clicks on light switch entity- this will allow lights to work even when a user has disabled other users from spawning items in his domain
|
2015-04-07 10:20:19 -07:00 |
|
David Rowe
|
a844b73fcc
|
Move widget parameters into propeties
|
2015-04-07 09:27:53 -07:00 |
|
Thijs Wenker
|
af34add63c
|
added example for the new Scripts functions:
example\misc\scriptsExample.js
|
2015-04-07 17:39:50 +02:00 |
|
David Rowe
|
187ca2a403
|
Widgetize pop-up menu
|
2015-04-07 00:38:07 -07:00 |
|
David Rowe
|
0cbe4d3673
|
Apply users filter per control value
|
2015-04-06 22:09:03 -07:00 |
|
David Rowe
|
798d6437b1
|
Add pop-up menu of "show me" values
|
2015-04-06 21:54:15 -07:00 |
|
David Rowe
|
6cd512762d
|
Add "Show me" prompt, value, and button to users online window
|
2015-04-06 20:51:17 -07:00 |
|
David Rowe
|
5a86f21506
|
Remove "2D" from identifiers
|
2015-04-06 18:39:30 -07:00 |
|
Clément Brisset
|
efbd74f539
|
Merge pull request #4597 from huffman/light-overlays
Light overlays
|
2015-04-06 16:02:44 +02:00 |
|
Ryan Huffman
|
f311cc5f07
|
Add light overlays
|
2015-04-03 16:27:42 -07:00 |
|
Ryan Huffman
|
748534cb9a
|
Fix spotlight checkbox on entity properties
|
2015-04-03 16:25:28 -07:00 |
|
Atlante45
|
0434b1fd28
|
Remove unload callback
|
2015-04-03 16:09:23 +02:00 |
|
Brad Davis
|
605cf19f6f
|
Merge pull request #4565 from ctrlaltdavid/20422
CR for #20422 - Add the ability to manage friends via Interface
|
2015-04-02 14:10:40 -07:00 |
|
Clément Brisset
|
01dc1b058c
|
Merge pull request #4580 from birarda/master
use non-persistent settings to avoid lobby crash confusion
|
2015-04-02 17:37:24 +02:00 |
|
Stephen Birarda
|
69f0c50a3c
|
fix cleanup order to ensure environment is re-rendered
|
2015-04-01 17:50:12 -07:00 |
|