Andrew Meadows
c7952311e5
Merge pull request #4784 from thoys/20522
...
Added transparency and positioning updating of Planky button
2015-05-07 16:55:06 -07:00
ZappoMan
20fe43c852
wire up new zone properties, fix bug in group proprties decode
2015-05-07 13:05:00 -07:00
ZappoMan
d9f17d010c
first cut at adding new zone properties to edit tools
2015-05-07 11:41:23 -07:00
Atlante45
faabf29e84
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 19:58:26 +02:00
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
ZappoMan
af2c3d91cf
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 18:05:54 -07:00
Thijs Wenker
b76e22c952
spelling mistake
2015-05-07 01:14:16 +02:00
Thijs Wenker
b3af1840c7
Added transparency and positioning updating of Planky button
2015-05-07 00:14:49 +02:00
Thijs Wenker
477447b95f
Planky game script
2015-05-06 23:36:44 +02:00
ZappoMan
f2ebb6e821
fix output of group names to be lowercase
2015-05-06 11:30:41 -07:00
ZappoMan
edb84a1a14
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 10:52:04 -07:00
Atlante45
50ba154615
Correctly wire setDrawZones
2015-05-06 17:04:01 +02:00
Clément Brisset
0470e72459
Merge pull request #4777 from cozza13/20529
...
CR for Job #20529 - Change defaulscripts.js
2015-05-06 16:12:22 +02:00
Chris Collins
7396bb138d
Removed headmove
...
removed head move, it is not being used by Oculus users at the moment
2015-05-05 16:52:38 -07:00
Seth Alves
e637a9b5ae
Merge pull request #4776 from PhilipRosedale/master
...
dice don't go away unless 'X' key is clicked, harmonicOscillator.js
2015-05-05 16:52:35 -07:00
Philip Rosedale
5fb79df4c9
dice don't go away unless 'X' key is clicked, added harmonicOscillator test script
2015-05-05 15:18:16 -07:00
ZappoMan
0cb14650b6
added skybox group properties to zones
2015-05-05 14:12:02 -07:00
ZappoMan
5fc5df7c55
change skyboxMode to backgroundMode
2015-05-05 12:38:44 -07:00
samcake
61f6139f4f
Merge pull request #4764 from ZappoMan/atmosphereInZones
...
First cut at adding "Atmosphere" support to zone
2015-05-05 11:00:58 -07:00
ZappoMan
4422c63c79
another sample for changing atmosphere properties
2015-05-04 20:31:37 -07:00
ZappoMan
4b9c6728e7
fix issue with skyboxMode getting randomly set
2015-05-04 18:58:35 -07:00
Eric Levin
39efde7e8c
added rotation ability to grab script
2015-05-04 18:14:46 -07:00
ZappoMan
8b3b32c70d
add example
2015-05-04 17:21:50 -07:00
Seth Alves
8890c40e15
Merge pull request #4750 from PhilipRosedale/master
...
Add limit to grab range to reduce max energy added by grabbing
2015-05-04 15:59:07 -07:00
Philip Rosedale
7e7500eaad
fix for coding standard
2015-05-04 15:57:21 -07:00
Stephen Birarda
6312d8643b
Merge pull request #4759 from ericrius1/dice
...
changed dice script to only play sound locally on collision, to avoid ev...
2015-05-04 14:27:09 -04:00
Eric Levin
d930c942ff
changed dice script to only play sound locally on collision, to avoid every client which sees collision injecting audio and creating that overloud effect
2015-05-04 10:16:50 -07:00
Stephen Birarda
6cff75f7c1
resolve conflicts on merge with upstream/master
2015-05-04 10:05:44 -07:00
Stephen Birarda
274e98974b
Merge pull request #4734 from Atlante45/ac_fix
...
Fix for bot_procedural
2015-05-04 12:44:08 -04:00
Philip Rosedale
475dad6863
Add limit to grab range to reduce max energy added by grabbing
2015-05-02 16:25:48 -07:00
Stephen Birarda
edade7baba
resolve conflicts on merge with upstream master
2015-05-01 16:24:16 -07:00
Stephen Birarda
6d0e612923
remove other tabs from moveJoints
2015-05-01 16:16:01 -07:00
Stephen Birarda
b32aecc456
fix tabs/spaces in moveJoints
2015-05-01 16:15:35 -07:00
Ryan Huffman
ddec694393
Update add-zone icon in edit.js
2015-05-01 15:38:06 -07:00
Seth Alves
5390630497
Merge pull request #4743 from huffman/sphere-color
...
Add support for changing sphere color in edit.js
2015-05-01 13:17:46 -07:00
Ryan Huffman
e7a8255af2
Replace zoneOverlayManager with internal drawZoneBoundaries
2015-05-01 13:02:28 -07:00
Ryan Huffman
7f84b27880
Add support for changing sphere color in edit.js
2015-05-01 11:59:39 -07:00
Seth Alves
6139fc0d73
Merge pull request #4738 from huffman/entity-naming
...
Add 'name' property to entities
2015-05-01 11:58:30 -07:00
Stephen Birarda
7a2a391852
add script to move joints for av rate testing
2015-05-01 11:53:20 -07:00
Eric Levin
3ee111d757
added script to generate a lot of physical blocks within a specified range
2015-05-01 09:56:21 -07:00
Eric Levin
cac5fa1371
refactored grab script using velocity and spring force
2015-05-01 09:39:39 -07:00
Ryan Huffman
73a5b8c4e2
Add support for 'name' to edit.js
2015-05-01 08:42:23 -07:00
Eric Levin
4c80633a41
fixed bug where non-script related content would be deleted on script ending
2015-04-30 16:42:32 -07:00
Atlante45
762e6255d6
Fix botProcedural include
2015-05-01 00:34:24 +02:00
Eric Levin
a9c5f044c8
changed grab script so user can only grab with left mouse click and we update velocityof grabbed object every frame instead of flinging it onb release
2015-04-30 11:39:27 -07:00
Eric Levin
45ba678686
can now fling up and down as well as in xz plane
2015-04-29 23:40:53 -07:00
Eric Levin
2b9ec8b6bf
fixed bug in grab.js where drop line overlay was not showing in correct position on first grab
2015-04-29 22:13:26 -07:00
Brad Hefta-Gaub
40d2e97d44
Merge pull request #4673 from ctrlaltdavid/20496
...
CR for 20496 - Modify lobby.js to work as avatar selector
2015-04-29 21:51:08 -07:00
Brad Hefta-Gaub
f093c9e535
Merge pull request #4727 from huffman/edit-speedup
...
Update edit.js to buffer mouseMove events
2015-04-29 21:46:27 -07:00
Ryan Huffman
0d2991b9b0
Update edit.js to buffer mouseMove events
...
This helps keep events from getting backed up on the event queue by
handling move events in the update() loop and dropping extra move events
that might come before an update.
2015-04-29 16:24:36 -07:00
Eric Levin
489fbaac57
added grab.js to defaultScripts.js
2015-04-29 09:45:58 -07:00
Eric Levin
8b9236a18d
added grab.js script, which allows users to grab and fling physical objects
2015-04-29 09:44:22 -07:00
David Rowe
9576ad19a7
Move "Stereo Audio" option into developerMenu.js
...
And rename it "Stereo Input" to better relect what it does.
2015-04-28 14:14:10 -07:00
Stephen Birarda
b387c3e93a
Merge pull request #4689 from Atlante45/master
...
Send generated touchEndEvent if we don't get one from Qt
2015-04-24 13:07:12 -04:00
Atlante45
53577107de
Formatting
2015-04-24 19:06:46 +02:00
Atlante45
e2b60d35f0
Generate touchEndEvent if last event was more than 50 ms ago
2015-04-24 18:50:03 +02:00
Brad Hefta-Gaub
6c830459a6
Merge pull request #4688 from huffman/fix-zone-overlay
...
Fix new zone overlays not moving
2015-04-24 09:09:17 -07:00
Ryan Huffman
6a48010c0b
Fix new zone overlays not moving
2015-04-24 09:01:12 -07:00
Atlante45
82a53c9139
Turn off all sections then turn on selected one
...
This fixes the issue of properties present in a couple sections but not
all that are going to only be displayed for the last section the are in
that is being processed.
2015-04-24 16:53:39 +02:00
Atlante45
32b78f02b4
Group ShapeType and CompoundShapeURL + add it to Zones
2015-04-24 16:52:51 +02:00
Andrew Meadows
0daaf20f01
Merge pull request #4675 from sethalves/detect-ballistic
...
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
2015-04-23 14:19:51 -07:00
ZappoMan
aac5675579
add full domain example
2015-04-23 13:45:00 -07:00
Seth Alves
bc65616bb3
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-23 13:09:22 -07:00
Brad Hefta-Gaub
33557e5b05
Merge pull request #4680 from huffman/edit-zone-limits
...
Add limits to zone fields in entity properties window
2015-04-23 12:42:32 -07:00
Atlante45
0b1d4fb1d6
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
2015-04-23 21:16:11 +02:00
Ryan Huffman
1657c50920
Add limits to zone fields in entity properties window
2015-04-23 12:00:13 -07:00
Ryan Huffman
361bf7e441
Remove unnecessary print
2015-04-23 10:15:18 -07:00
Ryan Huffman
78207f0d51
Make zones pickable in edit.js while control is down
2015-04-23 10:00:05 -07:00
Ryan Huffman
30b9e16c1a
Remove unused findRayIntersection from zoneOverlayManager
2015-04-23 09:52:21 -07:00
Ryan Huffman
d45e935b93
Add show zone overlay option to menu
2015-04-23 09:52:01 -07:00
Ryan Huffman
4a99c21e7b
Add zoneOverlayManager.js
2015-04-23 09:36:53 -07:00
Ryan Huffman
6612f9cb61
Fix key light properties in proeprties window
2015-04-23 09:33:58 -07:00
Ryan Huffman
ab261f4443
Update zone overlay to only be visible when edit is on
2015-04-23 09:33:33 -07:00
Ryan Huffman
af46ece9af
Remove overlays.js include
2015-04-23 09:33:10 -07:00
Ryan Huffman
af93634fcb
Merge branch 'master' of github.com:highfidelity/hifi into edit-zones
2015-04-23 09:32:37 -07:00
Ryan Huffman
5654e3abed
Add zone overlay manager
2015-04-23 09:32:15 -07:00
Atlante45
d18229d52d
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
2015-04-23 15:58:57 +02:00
Atlante45
c91ca146d5
Add different shapes to zone example
2015-04-23 15:22:58 +02:00
Atlante45
837a0d3ba8
rename collision model in edit.js
2015-04-23 12:13:52 +02:00
Seth Alves
5a7f8a2f5a
git rid of unneeded bump code. re-indent billiards.js and rez in balls with some y velocity so they fall to the table
2015-04-22 17:06:21 -07:00
ZappoMan
fb4e334c70
implement volume priority for zones
2015-04-22 12:38:34 -07:00
ZappoMan
ac81e3e847
added example script
2015-04-22 11:27:35 -07:00
David Rowe
2eb5059668
Display avatar images and change avatar upon selection
2015-04-22 10:59:53 -07:00
David Rowe
63d0efcdec
Open and close avatar selector with Ctrl-A
2015-04-22 09:48:09 -07:00
David Rowe
24178b72fb
Use lobby.js as starting point for avatarSelector.js
2015-04-22 09:48:08 -07:00
Ryan Huffman
3dfbd70d41
Add new zone button
2015-04-21 13:16:55 -07:00
Ryan Huffman
4e2bcc0690
Add zone properties to entity property panel
2015-04-21 12:47:11 -07:00
Sam Gateau
48364cb598
refined the names of the key light porperties in Stage
2015-04-21 11:04:14 -07:00
Sam Gateau
687ca7fee5
Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working
2015-04-17 19:00:40 -07:00
Sam Gateau
f1e0d5855e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-17 11:33:39 -07:00
Clément Brisset
59e75826fe
Merge pull request #4634 from ctrlaltdavid/20471
...
CR for Job #20471 - Create rain.js
2015-04-17 16:33:27 +02:00
Sam Gateau
1c5c7cc239
faking a checkbox to do a boolean property control
2015-04-16 17:55:55 -07:00
Sam Gateau
b5b146b81b
Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution
...
Expose these to javascript
2015-04-16 17:35:37 -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
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
David Rowe
d057573825
Set raindrops spinning
2015-04-09 19:38:15 -07:00
David Rowe
54c0aeaa03
Work around entities not always getting velocity set at creation
2015-04-09 18:57:58 -07:00
David Rowe
10ac6bc9ca
Don't render overlay unless debug
2015-04-09 18:17:45 -07:00
David Rowe
54980f46a9
Set raindrops falling
2015-04-09 17:29:14 -07:00
David Rowe
66ea84977a
Create raindrops at specified rate
2015-04-09 16:18:10 -07:00
David Rowe
00f42c1e6c
Move to acScripts
2015-04-09 15:52:59 -07:00
David Rowe
e4e372b2a3
Create a raindrop with a lifetime
2015-04-09 15:51:19 -07:00
David Rowe
55b92f7d1e
Circle of origin for rain
2015-04-09 15:18:31 -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
Stephen Birarda
862f26a095
put the friendly lobby back in default scripts
2015-04-01 17:41:17 -07:00
Stephen Birarda
40f7e683da
don't attach iron man helmet while in lobby
2015-04-01 17:38:32 -07:00
Stephen Birarda
b27a86fb25
always render yourself, handle change of render values elsewhere
2015-04-01 17:36:43 -07:00
Stephen Birarda
03292fd869
allow developerMenuItems to handle new render options
2015-04-01 17:26:56 -07:00
Stephen Birarda
560f53b842
use new API to toggle environment from lobby
2015-04-01 17:08:15 -07:00
Ryan Huffman
775bbdaebb
Remove unnecessary css
2015-04-01 16:04:52 -07:00
Ryan Huffman
0f518b6dbd
Update styling of property spinners in edit.js
2015-04-01 16:02:21 -07:00
David Rowe
96e888864a
Merge branch 'master' into 20422
2015-04-01 14:56:48 -07:00
Brad Hefta-Gaub
e6b770ea19
Merge pull request #4576 from birarda/master
...
pull lobby from default scripts to avoid permanent iron man
2015-04-01 14:23:46 -07:00
Stephen Birarda
d6f43287dc
pull the lobby from default scripts to avoid permanent iron man
2015-04-01 14:21:43 -07:00
Philip Rosedale
b5f79c7e6e
Merge pull request #4571 from huffman/select-all-edit
...
Add select all on focus behavior to entity properties window
2015-04-01 14:06:00 -07:00
Ryan Huffman
f0dd20b21e
Merge pull request #4570 from samcake/orange
...
Clean up the sunLightExample.js and create the cookies.js
2015-04-01 13:55:03 -07:00
Philip Rosedale
cd40b82e7d
Merge pull request #4568 from huffman/line-height-update
...
Update edit.js lineHeight to be more usable
2015-04-01 13:44:57 -07:00
Philip Rosedale
4ec1d304e0
Merge pull request #4567 from thoys/20423
...
CR for Job #20423 - Take gun.js to the next level.
2015-04-01 13:43:52 -07:00
Sam Gateau
9918357724
fix var declaration issues
2015-04-01 13:37:41 -07:00
Brad Hefta-Gaub
1de1527414
Merge pull request #4569 from ctrlaltdavid/20431
...
CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading
2015-04-01 13:00:16 -07:00
Ryan Huffman
c835fb63c3
Add select all on focus behavior to entity properties window
2015-04-01 12:52:46 -07:00
Sam Gateau
695a5bcfd7
Adding the cookies sciprt that provide a simple ui useful for debug and example, complete the interface on the scene script interface to provide the getters
2015-04-01 12:23:31 -07:00
Sam Gateau
3b92910a91
Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters
2015-04-01 12:22:35 -07:00
Ryan Huffman
eb7d940ed9
Update edit.js lineHeight property handling
2015-04-01 11:36:05 -07:00
Thijs Wenker
f3ff48ab60
Merge branch 'master' of https://github.com/worklist/hifi into 20423
2015-04-01 19:14:14 +02:00
Thijs Wenker
bd8ea7bfc0
Merge branch 'master' of github.com:PhilipRosedale/hifi into 20423
...
Conflicts:
examples/controllers/hydra/gun.js
2015-04-01 19:13:46 +02:00
Stephen Birarda
a1f1f7603d
Merge pull request #4564 from PhilipRosedale/master
...
Buttons at bottom in dice, gun so not to conflict with edit.js
2015-04-01 09:06:34 -07:00
Thijs Wenker
f22c739642
updated gunscript
2015-04-01 16:26:55 +02:00
Philip Rosedale
9642bd199d
Buttons at bottom
2015-03-31 22:12:06 -07:00
Philip Rosedale
8114fdd1e2
move button locations, names some constants in avatar controller
2015-03-31 21:51:50 -07:00
David Rowe
e06f28b7c5
Merge branch 'master' into 20422
...
Conflicts:
examples/users.js
interface/src/Application.cpp
2015-03-31 21:01:54 -07:00
Eric Levin
fd3fc0acdd
added unload function to lightController.js so light is deleted when it's parent entity is
2015-03-31 19:08:30 -07:00
Seth Alves
04901e99fc
fix error message
2015-03-31 18:41:29 -07:00
Seth Alves
4e83301c65
add a bool value to Node which indicates if it is allowed to rez new entities
2015-03-31 18:27:46 -07:00
David Rowe
edaa4cdc65
Remove local file reading from scripts
2015-03-31 16:57:15 -07:00
Philip Rosedale
9635c6d248
Merge branch 'master' of https://github.com/worklist/hifi
2015-03-31 16:29:55 -07:00
Philip Rosedale
b7f0be761c
gun buildings fall on creation, dice stops correctly
2015-03-31 16:27:09 -07:00
Brad Hefta-Gaub
867c8078bd
Merge pull request #4553 from PhilipRosedale/master
...
Blocks fall when made, better edge colors
2015-03-31 15:53:44 -07:00
Philip Rosedale
f4695643e3
Blocks fall when made, better edge colors
2015-03-31 14:13:19 -07:00
Brad Hefta-Gaub
434349d947
Merge pull request #4541 from ctrlaltdavid/20428
...
CR for Job #20428 - Add the ability to minimize/maximize users.js
2015-03-31 13:09:46 -07:00
Ryan Huffman
79305141d1
Fix edit.js not selecting all when tabbing between properties
2015-03-31 10:51:07 -07:00
Philip Rosedale
0c9e6ad3c0
Merge pull request #4543 from stojce/20397
...
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
2015-03-31 08:13:54 -07:00
David Rowe
495b62b356
Add minimized state
2015-03-30 20:46:39 -07:00
David Rowe
622f10bd25
Add minimize button
2015-03-30 20:46:38 -07:00
Philip Rosedale
5cd031739b
Merge pull request #4536 from PhilipRosedale/master
...
Fix error with angular speed
2015-03-30 17:07:22 -07:00
Philip Rosedale
63c1bdd0a8
Fix error with angular speed
2015-03-30 17:03:09 -07:00
Stephen Birarda
9f0e146782
Merge pull request #4530 from birarda/master
...
fix for marketplace URL on right click
2015-03-30 15:15:01 -07:00
Stephen Birarda
909c4ad919
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-03-30 15:10:53 -07:00
Stephen Birarda
75da852b39
fix for marketplace url on right click
2015-03-30 15:10:16 -07:00
Stojce Slavkovski
72f1f5ba62
stop makeHouses.js gracefully
...
remove exit cleanup
2015-03-30 22:08:26 +02:00
Stojce Slavkovski
eb46a4b647
Merge branch 'master' of https://github.com/highfidelity/hifi into 20397
2015-03-30 21:23:23 +02:00
Philip Rosedale
685de8cc7f
Merge pull request #4522 from huffman/rename-attribution
...
Rename attribution to marketplaceID
2015-03-30 10:57:28 -07:00
David Rowe
cbf2012bf5
Add menu items that set visibility
...
And synchronize visibility settings between Interface and users.js.
2015-03-29 18:35:56 -07:00
David Rowe
be69c0b58f
Add add/remove friends menu item
...
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
2015-03-28 13:05:23 -07:00
Stojce Slavkovski
463625f101
revert cleanup
2015-03-28 00:53:57 +01:00
Stojce Slavkovski
42a1079322
limit 20 per sec. / don't delete on script stop
2015-03-28 00:27:57 +01:00
David Rowe
418ff5929e
Make friends add/remove button open WebWindow dialog
2015-03-27 15:38:20 -07:00
David Rowe
4e6dcf0d8e
Add friends add/remove button
2015-03-27 15:38:20 -07:00
Ryan Huffman
ed62356f65
Remove attribution field from edit properties window
2015-03-27 13:36:56 -07:00
Ryan Huffman
1bdfa3abb5
Update right-click menu to look for marketplaceID
2015-03-27 13:36:22 -07:00
David Rowe
90c1da2094
Merge branch 'master' into 20416
...
Conflicts:
examples/notifications.js
2015-03-27 12:13:29 -07:00
Ryan Huffman
36c79ccc03
Merge pull request #4520 from cozza13/20426
...
CR for Job #20426 - Remove references to models out of edit.js
2015-03-27 09:39:36 -07:00
Chris Collins
83af2feded
Remove reference to FBX files
...
Remove reference to FBX files
2015-03-27 09:33:19 -07:00
Ryan Huffman
c9f4f4626b
Update default light color to (150,150,150)
2015-03-27 09:21:32 -07:00
Brad Hefta-Gaub
7f74bd1ae9
Merge pull request #4513 from ctrlaltdavid/20421
...
CR for Job #20421 - Add scrollbar to Users Online window
2015-03-26 16:50:30 -07:00
Brad Hefta-Gaub
0cee3892ff
Merge pull request #4516 from huffman/fix-edit-buttons
...
Fix marketplace showing for all edit properties buttons
2015-03-26 16:38:47 -07:00
Ryan Huffman
28e2e65da9
Fix marketplace showing for all edit properties buttons
2015-03-26 16:23:36 -07:00
ZappoMan
8e7ead2ead
fix locking issue in enter/leave entity scripts
2015-03-26 16:05:31 -07:00
David Rowe
ef9d665146
Highlight scrollbar when it is being moved
2015-03-26 12:22:27 -07:00
David Rowe
876f3e8a23
Scroll when click above or below bar
2015-03-26 12:22:26 -07:00
David Rowe
c7fe7aa157
Update users displayed per scrollbar position
2015-03-26 12:22:26 -07:00
David Rowe
14e92eecad
Click and drag scrollbar
2015-03-26 12:22:25 -07:00
David Rowe
1e1a277065
Scrollbar bar height varies with percentage of users displayed
2015-03-26 12:22:24 -07:00
David Rowe
98c88aab04
Handle no users able to be displayed, insufficient screen height
2015-03-26 12:22:23 -07:00
David Rowe
ba1a7c6761
Show/hide scrollbar depending on whether needed or not
2015-03-26 12:22:23 -07:00
David Rowe
567375368e
Show first N users that can fit
2015-03-26 12:22:22 -07:00
David Rowe
8e66f5998a
Add scrollbar background and bar
2015-03-26 12:22:21 -07:00
David Rowe
7c4ea855a8
Limit height of users window per screen space available
2015-03-26 12:22:20 -07:00
Brad Hefta-Gaub
918154e407
Merge pull request #4491 from huffman/export-json
...
Update export entities to export as JSON
2015-03-25 16:49:23 -07:00
Philip Rosedale
4cfa4ada92
Merge pull request #4508 from huffman/right-click-marketplace
...
Right click marketplace menu
2015-03-25 16:36:23 -07:00
Philip Rosedale
29b9212259
Merge pull request #4501 from Atlante45/light_types
...
Light types
2015-03-25 16:34:05 -07:00
Philip Rosedale
0c85881908
Merge pull request #4504 from huffman/disable-duplicate-on-locked-entity
...
Disable duplicate on locked entity
2015-03-25 16:31:49 -07:00
Stephen Birarda
f075674415
Merge pull request #4502 from huffman/webwindow-open-url
...
Add more functionality to WebWindow (get/set url, raise)
2015-03-25 13:25:29 -07:00
Ryan Huffman
b5b1c5a90b
Remove extraneous print
2015-03-25 12:30:42 -07:00
Ryan Huffman
b8174b164f
Update marketplace popup to hide on position or orientation change
2015-03-25 12:30:00 -07:00
Ryan Huffman
d07acfe9ac
Add right-click marketplace popup
2015-03-25 12:29:38 -07:00
Ryan Huffman
8eed2b6603
Add PopupMenu to edit.js
2015-03-25 12:28:56 -07:00
Ryan Huffman
ea3ec91f71
Remove inspect tool from edit.js
2015-03-25 12:27:15 -07:00
Leonardo Murillo
d1d183e190
More .com changes
2015-03-25 13:05:10 -06:00
Ryan Huffman
5b4b78043a
Remove unneeded print messages
2015-03-25 11:22:28 -07:00
Ryan Huffman
dec89ba96f
Disable duplicating locked entities
2015-03-25 11:22:07 -07:00
Ryan Huffman
bb4417acc6
Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url
2015-03-25 10:49:24 -07:00
Atlante45
715fe1096f
Random but persistant switch sound
2015-03-25 17:33:27 +01:00
Atlante45
725a8795fb
Merge branch 'master' of https://github.com/highfidelity/hifi into light_types
2015-03-25 16:39:11 +01:00
Atlante45
19886bd33c
Better handling of callback
2015-03-25 16:38:27 +01:00
Atlante45
afb96709f1
Only update userData when light entity is identified
2015-03-25 15:44:37 +01:00
Atlante45
92d3944044
Use preOp function for all common checks/updates
2015-03-25 15:04:06 +01:00
Philip Rosedale
9c24d2d0eb
Merge pull request #4496 from stojce/20397
...
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
2015-03-24 17:35:44 -07:00
ZappoMan
0e44126106
added LOD Warnings to notifications.js
2015-03-24 16:38:13 -07:00
Ryan Huffman
d54526b8bb
Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl
2015-03-24 15:43:36 -07:00
Ryan Huffman
a901bc4b11
Update edit.js to export as .svo.json
2015-03-24 10:28:12 -07:00
David Rowe
cb6abfb2e6
Display notification if domain connection refused
2015-03-23 12:05:56 -07:00
Atlante45
c26f17e16b
Update from light properties
2015-03-23 18:36:40 +01:00
Atlante45
ea0f3f05e7
Tune sound down
2015-03-23 17:55:23 +01:00
Atlante45
fdfdba5d2d
Couple tweaks
2015-03-23 17:46:57 +01:00
Atlante45
963be820d0
Remove comments
2015-03-23 17:28:11 +01:00
Atlante45
40ed0146e2
Better handling of erased lights
2015-03-23 17:26:43 +01:00
Atlante45
30ea2eb722
Nicer way to update light Properties
2015-03-23 17:20:21 +01:00
Atlante45
efd177d80d
Fix property save
2015-03-23 17:06:34 +01:00
Atlante45
66f954142a
Fix light multiple creations
2015-03-23 17:06:12 +01:00
Atlante45
5fadcbe7d9
Prints cleanup
2015-03-23 17:05:46 +01:00
Atlante45
6b4845abf3
Some improvements to lightController
2015-03-23 16:47:24 +01:00
Atlante45
34248ea8fd
Merge branch 'master' of https://github.com/highfidelity/hifi into light_types
2015-03-23 13:04:34 +01:00
Atlante45
34ab470624
lightController first draft
2015-03-20 21:21:18 +01:00
Atlante45
e4e0e2fd6b
Update Edit.js HTML to display attribution property
2015-03-20 18:04:05 +01:00
Stojce Slavkovski
57011c2d4b
get models from S3
2015-03-19 20:55:18 +01:00
Stojce Slavkovski
d0c4dddc1b
Merge branch 'master' of https://github.com/highfidelity/hifi into 20397
2015-03-19 19:34:34 +01:00
Stojce Slavkovski
00f1d96af5
Use existing house models
2015-03-18 19:30:08 +01:00
ZappoMan
9dd913bd6d
add copyright header to LODWarning.js
2015-03-17 15:51:08 -07:00
ZappoMan
6dbdfb7e7b
add LODWarning.js to default scripts
2015-03-17 15:49:34 -07:00
ZappoMan
37ccd7b9f8
add LOD warnings script
2015-03-17 15:47:23 -07:00
Stojce Slavkovski
af789f842d
#20397 initial version of script
2015-03-17 22:47:18 +01:00
ZappoMan
1e03335012
implement scripting interface for LODManager
2015-03-17 13:18:29 -07:00
Ryan Huffman
66517fa1c0
Add ability to show marketplace url from edit properties
2015-03-17 09:07:33 -07:00
Atlante45
c421adaf58
Fix unresolve merge conflict
2015-03-16 16:27:33 +01:00
Atlante45
ad16f49d01
Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection
2015-03-16 14:28:24 +01:00
Clément Brisset
dfd39ca1e1
Merge pull request #4448 from huffman/loading-image
...
Add hourglass image to loading svo overlay
2015-03-16 06:25:41 -07:00
Clément Brisset
934d9c087a
Merge pull request #4447 from ctrlaltdavid/20394
...
CR for Job #20394 - Build friends.js v1
2015-03-16 06:24:35 -07:00
Stephen Birarda
641581a825
Merge pull request #4446 from huffman/marketplace-window
...
Marketplace window
2015-03-13 17:51:44 -07:00
Ryan Huffman
76f474bff1
Add hourglass image to loading svo overlay
2015-03-13 14:48:33 -07:00
Ryan Huffman
d512a67c8a
Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays
2015-03-13 14:13:56 -07:00
Ryan Huffman
dc3453a878
Add Window.raiseMainWindow()
2015-03-13 14:10:46 -07:00
David Rowe
67b2d0c8ab
Trim text to fit in window
2015-03-13 12:18:49 -07:00
David Rowe
f49ed0951e
Fix clickable areas
2015-03-13 12:04:43 -07:00
Ryan Huffman
33f255fad2
Merge branch 'master' of github.com:highfidelity/hifi into marketplace-window
2015-03-13 11:46:21 -07:00
Ryan Huffman
905de8b03c
Adjust marketplace window size
2015-03-13 11:46:15 -07:00
Atlante45
36814e837b
Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection
2015-03-13 19:05:17 +01:00
Ryan Huffman
e94bac1971
Fix subimage indexing in toolBars.js
2015-03-13 10:07:31 -07:00
Ryan Huffman
504dceda6b
Update edit.js icons
2015-03-13 10:07:12 -07:00
Stephen Birarda
edaee9716b
Merge pull request #4438 from huffman/edit-rename
...
Move editEntities.js to edit.js
2015-03-13 09:39:34 -07:00
Clément Brisset
f5777867da
Merge pull request #4439 from ctrlaltdavid/20394
...
CR for Job #20394 - Build friends.js v1
2015-03-13 09:00:14 -07:00
Atlante45
55a88e6076
Allow selection of all entities inside box in editEntities
2015-03-13 16:24:33 +01:00
Ryan Huffman
a3c2df5c77
Add menu option to turn on/off showing lights in edit mode
2015-03-12 16:16:29 -07:00
Ryan Huffman
165199c69d
Update light overlay size
2015-03-12 15:55:31 -07:00
Ryan Huffman
2bedd1cfc7
Move editEntities.js to edit.js
2015-03-12 12:39:06 -07:00
Ryan Huffman
ebf70f818a
Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2
...
Conflicts:
examples/editEntities.js
2015-03-12 11:39:26 -07:00
Ryan Huffman
4335a41002
Update editEntities to call setActive on init
2015-03-12 11:38:51 -07:00
Ryan Huffman
c13ba4a318
Add toggling of light visibility
2015-03-12 11:38:29 -07:00
Ryan Huffman
ccbbba3def
Update light default dimensions
2015-03-12 11:18:42 -07:00
Ryan Huffman
d82598327b
Add light overlays
2015-03-12 11:18:32 -07:00
Brad Hefta-Gaub
f91a19a918
Merge pull request #4424 from huffman/open-svo
...
Handle drag-n-dropped .svos and using interface to open .svo files
2015-03-12 08:15:25 -07:00
David Rowe
dfd9506223
Add user location after username
...
Credit @nbq
2015-03-11 21:20:47 -07:00
David Rowe
2e16794615
Change font size to 12
2015-03-11 21:18:53 -07:00
David Rowe
eb22b0085b
Add radio buttons
2015-03-11 20:05:35 -07:00
David Rowe
a109a18bc3
Add visibility control
2015-03-11 19:28:29 -07:00
Ryan Huffman
1904e5e209
Make look.js the default look script and remove the old scripts
2015-03-11 16:17:44 -07:00
Ryan Huffman
76ebac1185
Add import svo requests in editEntities
2015-03-11 15:44:26 -07:00
Philip Rosedale
cc3a86af94
Merge pull request #4419 from huffman/merge-touch-mouse
...
Add look.js
2015-03-11 14:40:27 -07:00
David Rowe
549eead9f2
Prepare to add visibility control
2015-03-11 12:36:57 -07:00
Clément Brisset
885e6206e9
Merge pull request #4420 from ctrlaltdavid/20394
...
CR for Job #20394 - Build friends.js v1
2015-03-11 11:17:04 -07:00
David Rowe
fd423e5019
Fix units
2015-03-11 11:07:02 -07:00
David Rowe
1a18decc6d
Fix typo
2015-03-11 10:49:36 -07:00
David Rowe
bbffa6474b
Add users.js to default scripts
2015-03-11 10:32:14 -07:00
David Rowe
532e4feebb
Remove dead code and fix typos
2015-03-11 10:30:09 -07:00
Ryan Huffman
6c978c0ff3
Add look.js
...
Merges both lookWithMouse and lookWithTouch, and updates mouse look to
only work with right-click
2015-03-11 10:27:38 -07:00
David Rowe
22ff97fd27
Make visible by default
2015-03-11 10:25:24 -07:00
David Rowe
d36399c65d
Add heading
2015-03-11 10:21:49 -07:00
David Rowe
c30bf5667f
Fix teleporting to user
2015-03-11 10:15:34 -07:00
Ryan Huffman
e4f7e35587
Hide edit tools when inactive
2015-03-11 10:10:11 -07:00
David Rowe
ad08a7dde2
Position window at bottom left of screen
2015-03-11 09:37:18 -07:00
David Rowe
a3c4429e0b
Longer wait until requesting status again after request error
2015-03-11 09:36:26 -07:00
David Rowe
d071bc50a4
Change from paragraph of usernames to single column of usernames
2015-03-10 17:20:08 -07:00
Brad Hefta-Gaub
6f24a62758
Merge pull request #4414 from birarda/master
...
workaround for missing touch begin event in 5.4.x
2015-03-10 17:09:33 -07:00
Stephen Birarda
3579bb46ab
handle touch update without a touch begin event
2015-03-10 17:04:30 -07:00
Philip Rosedale
2e85cf7459
Merge pull request #4413 from birarda/master
...
fix stereo to stereo resampling via soxr
2015-03-10 16:09:31 -07:00
Stephen Birarda
8ede9fb39b
fix stereo to stereo resampling
2015-03-10 15:50:30 -07:00
Seth Alves
cf20596d6d
Merge pull request #4406 from ZappoMan/svoFromURL
...
Support for importing from a network URL
2015-03-10 15:41:41 -07:00
David Rowe
4e8fcd47c0
Show/hide users window with menu item
2015-03-10 13:51:25 -07:00
Philip Rosedale
182a1a726d
remove debug
2015-03-10 13:34:16 -07:00
Philip Rosedale
2d6c51ac77
Detect moving objects before catching them
2015-03-10 13:32:56 -07:00
David Rowe
59762175e4
Grow/shrink window as size of users list changes
2015-03-10 12:44:34 -07:00
ZappoMan
e16961c958
removed dead code
2015-03-10 12:36:31 -07:00
ZappoMan
feddea821a
cleanup import from file vs url
2015-03-10 12:35:12 -07:00
David Rowe
a4fe9c1a12
Click on username to TP to them
2015-03-10 12:32:48 -07:00
ZappoMan
5facb39aa7
support for import entities from network URL
2015-03-10 12:21:37 -07:00
David Rowe
63d8da0233
Display user names in 2D window
2015-03-10 10:57:47 -07:00
David Rowe
d25d3bc6ab
Get users online from Web API
2015-03-10 10:57:46 -07:00
Andrew Meadows
a758ccd75a
Merge pull request #4402 from birarda/master
...
add underlying controls for user discoverability
2015-03-10 08:30:46 -07:00
Stephen Birarda
2f22c0cd96
cleanup username API from GlobalServicesScriptingInterface
2015-03-09 16:28:01 -07:00
Seth Alves
99300a5bc8
merge from master
2015-03-09 13:39:51 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Seth Alves
08c3fa6363
merge from upstream
2015-03-08 17:29:05 -07:00
Seth Alves
cdeda67942
Collision Model url
2015-03-07 20:25:18 -08:00
Seth Alves
1bf8054cec
Collision Model
2015-03-07 20:24:50 -08:00
Seth Alves
f6948193f1
add fields for collision model url
2015-03-07 20:24:11 -08:00
Seth Alves
72ebae72c0
allow adding entities with model urls that end in .obj
2015-03-07 20:22:32 -08:00
Andrew Meadows
ba6e66f169
merge upstream/master into andrew/isentropic
2015-03-07 18:03:49 -08:00
Andrew Meadows
5b854857c1
fix JS scripts to use radians per second
...
in entity properties
2015-03-07 18:02:41 -08:00
David Rowe
d112c455e2
Add hmdDefaults.js script
2015-03-06 17:49:31 -08:00
Brad Hefta-Gaub
fd6f8c7792
Merge pull request #4382 from huffman/import-export
...
Improvements to Import/Export entities
2015-03-06 16:31:57 -08:00
Ryan Huffman
b3631de93c
Remove print statements from entityList.js
2015-03-06 12:03:36 -08:00
Ryan Huffman
9247ccd7b3
Remove ExportMenu.js and ModelImporter.js
2015-03-05 13:55:22 -08:00
Ryan Huffman
08b905095d
Remove Paste Models and rename Import/Export to Entities
2015-03-05 13:54:27 -08:00
Ryan Huffman
a2617b2c96
Update editEntities import/export
2015-03-05 13:52:59 -08:00
Stephen Birarda
8f2dc7e38b
resolve conflicts on merge with upstream master
2015-03-03 12:22:25 -08:00
Brad Hefta-Gaub
b88d52a310
Merge pull request #4363 from huffman/block-restricted-users
...
Add permission-checking to edit entities
2015-03-03 11:04:46 -08:00
Stephen Birarda
03de43d451
simplify notifications.js after chat removal
2015-03-03 10:22:57 -08:00
Stephen Birarda
cf227b94de
remove global services example that leveraged xmpp
2015-03-03 10:17:53 -08:00
Stephen Birarda
a893f11ad7
remove load script from message that used xmpp
2015-03-03 10:17:29 -08:00
Clément Brisset
5ef86f88f5
Merge pull request #4364 from huffman/save-on-blur
...
Fix properties window changes not taking affect when losing focus
2015-03-03 08:35:49 -08:00
Ryan Huffman
98e0f235cc
Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users
2015-03-02 14:47:26 -08:00
Brad Hefta-Gaub
6d8ccfbc2a
Merge pull request #4357 from huffman/update-light-entity-properties
...
Update light entity properties
2015-03-02 13:51:48 -08:00
Ryan Huffman
f739bf2116
Fix properties window changes not taking affect when losing focus
2015-03-02 11:20:00 -08:00
Ryan Huffman
26e3b331ee
Update editEntities.js lock checking to use event instead of polling
2015-03-02 10:42:09 -08:00
Ryan Huffman
0638459052
Add permission-checking to edit entities
2015-03-02 09:51:41 -08:00
Ryan Huffman
a48c428f42
Update highlighted handle color
2015-02-27 15:29:00 -08:00
Ryan Huffman
dc2cb93cce
Add degrees symbol to rotation degrees text
2015-02-27 15:11:43 -08:00
Ryan Huffman
a0d9e92c64
Update size of rotation overlay
2015-02-27 15:11:23 -08:00
Ryan Huffman
4f4ab144b2
Update handle colors and up/down arrow image
2015-02-27 15:10:56 -08:00
Ryan Huffman
cd3281521c
Update size of rotation degrees text
2015-02-27 15:08:29 -08:00
Ryan Huffman
3ffd47a0b0
Update editEntities rotation arrows
2015-02-27 15:08:13 -08:00
Ryan Huffman
20f3d23ae7
Update editEntities to use new light properties
2015-02-27 13:46:26 -08:00
Brad Hefta-Gaub
addc729654
Merge pull request #4350 from huffman/multi-select
...
Multi select properties for edit entities
2015-02-27 10:54:42 -08:00
Brad Hefta-Gaub
08dc883b0e
Merge pull request #4351 from huffman/update-light-properties
...
Update light properties (primarily for editEntities.js)
2015-02-27 10:54:19 -08:00
Brad Hefta-Gaub
e78b2ced4a
Merge pull request #4349 from huffman/no-nearby-entities-msg
...
Add message to edit entities list for when no entities are nearby
2015-02-27 10:53:17 -08:00
Sam Gateau
c7eeebe52c
and fixing a bug with shadowing of lightmapped surface
2015-02-26 18:07:43 -08:00
Sam Gateau
74f0d98fd6
REfining the naming and introducing an orientation offset
2015-02-26 17:44:04 -08:00
Sam Gateau
f6a9bd1870
REfining the naming and introducing an orientation offset
2015-02-26 17:26:41 -08:00
Ryan Huffman
74bc48ce55
Add message to edit entities list for when no entities are nearby
2015-02-26 14:34:32 -08:00
Ryan Huffman
ecc003c5e1
Adjust colors for disabled input elements
2015-02-26 14:23:25 -08:00
Ryan Huffman
3c5f11e6ed
Add initial support for multi-selection in properties window
2015-02-26 14:23:11 -08:00
Sam Gateau
96d5a2ab42
fixing tab maybe
2015-02-26 12:10:08 -08:00
Sam Gateau
bc8d688cde
fixing tab maybe
2015-02-26 12:04:33 -08:00
Ryan Huffman
c3a7257439
Remove unused light properties from entity properties window
2015-02-26 11:03:06 -08:00
Sam Gateau
fcb293d0b2
CLean up before pr
2015-02-26 10:45:00 -08:00
Sam Gateau
a757229c0e
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-02-25 19:18:01 -08:00
Sam Gateau
b4cb5ca9d1
add an example script to control the sun light
2015-02-25 19:09:18 -08:00
Brad Hefta-Gaub
8c26be49d7
Merge pull request #4330 from huffman/edit-off-on-domain-change
...
Turn editEntities off on domain change
2015-02-24 20:11:39 -08:00
Brad Hefta-Gaub
9ded2699e2
Merge pull request #4327 from thoys/20364
...
CR for Job #20364 - Add toggle to turn off sounds in notifications.js
2015-02-24 20:06:57 -08:00
Philip Rosedale
573390b429
fix dice for collision shapes, add angular velocity
2015-02-24 11:55:41 -08:00
Philip Rosedale
9d021a1a1e
remove unused line
2015-02-24 11:49:12 -08:00
Philip Rosedale
7489b468f3
give angular velocity to the thrown ball
2015-02-24 11:48:35 -08:00
Ryan Huffman
c9818c184a
Update editEntities to turn off when switching domains
2015-02-24 10:47:55 -08:00
Thijs Wenker
793116b90c
ability to mute all notifications or just certain types
2015-02-23 21:00:26 +01:00
Andrew Meadows
f2fc781523
change shapeType to use strings in billiards.js
2015-02-23 11:42:36 -08:00
Andrew Meadows
456acd8833
merge upstream/master into andrew/bispinor
2015-02-23 11:41:40 -08:00
Andrew Meadows
d5733f3782
Merge pull request #4318 from PhilipRosedale/master
...
Billiard balls are now textured models
2015-02-20 17:59:33 -08:00
Andrew Meadows
27e6f99deb
use strings for shapeType for JS Entity properties
2015-02-20 16:54:58 -08:00
Ryan Huffman
cf0b13f869
Update notifications.js audio to be local-only
2015-02-20 14:22:59 -08:00
Brad Hefta-Gaub
5d6d9bb1d4
Merge pull request #4320 from huffman/fix-camera-move-on-mirror
...
Fix entity camera tool from taking over in mirror mode
2015-02-20 10:40:03 -08:00
Brad Hefta-Gaub
32bbc8d551
Merge pull request #4317 from birarda/master
...
dynamically grab animation URL as model URL from model
2015-02-20 10:39:30 -08:00
Ryan Huffman
c665a3873d
Fix entity camera tool from taking over in mirror mode
2015-02-20 10:11:55 -08:00
Philip Rosedale
66d1eeb327
Add textured models as balls
2015-02-19 21:11:51 -08:00
Stephen Birarda
51ad631c54
dynamically grab animation URL as model URL from model
2015-02-19 13:14:46 -08:00
David Rowe
a947cda0b2
Update SVG URL to Amazon S3
2015-02-18 13:02:37 -08:00
Clément Brisset
87f4ae2425
Merge pull request #4304 from thoys/20245
...
CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications
2015-02-18 09:55:34 -08:00
Thijs Wenker
d10f37291b
check if sounds are downloaded before play thanks @Atlante45
2015-02-18 18:25:16 +01:00
Clément Brisset
7183400e43
Merge pull request #4305 from ctrlaltdavid/20308
...
CR for Job #20308 - Refine progress.js
2015-02-18 08:10:57 -08:00
Andrew Meadows
1c8f1bbcdd
Merge pull request #4299 from talentraspel/20338
...
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
2015-02-17 17:47:47 -08:00
Thijs Wenker
96b3114a36
style
2015-02-17 23:37:37 +01:00
Thijs Wenker
4d12a6d81c
Merge branch 'master' of https://github.com/worklist/hifi into 20245
...
Conflicts:
examples/notifications.js
2015-02-17 23:30:58 +01:00
Kai Ludwig
4048627de7
2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.
2015-02-17 18:50:20 +01:00
Kai Ludwig
fa1bcc43e6
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.
2015-02-17 18:40:20 +01:00
Andrew Meadows
5cd1950bed
Merge pull request #4297 from huffman/fix-mouse-look-clash
...
Fix mouse look clash
2015-02-17 09:33:50 -08:00
Andrew Meadows
d896f3a811
Merge pull request #4252 from thoys/20224
...
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
2015-02-17 09:03:17 -08:00
Ryan Huffman
97e70920ce
Move handling of add model buttons to mouseRelease
2015-02-17 08:23:39 -08:00
Ryan Huffman
d1f7a730ad
Make add-model button non-selectable
2015-02-17 08:23:11 -08:00
Brad Hefta-Gaub
f6ff0665ca
Merge pull request #4286 from huffman/fix-nat-dims
...
Fix "reset to natural dimensions" when dimensions not known
2015-02-13 16:31:34 -08:00
Ryan Huffman
2df850eb8d
Fix natural dimensions check
2015-02-13 15:02:16 -08:00
Ryan Huffman
0495833ca6
Disallow entity models to be reset to natural dimensions if unknown
2015-02-13 15:00:37 -08:00
Brad Hefta-Gaub
5c048db5f5
Merge pull request #4284 from sethalves/fix-butterflies
...
if butterflies stop moving, they are no longer kinematic, so give them a velocity
2015-02-13 12:45:08 -08:00
Seth Alves
6ff4f8c2c0
give butterflies an initial velocity so that they are on the kinematics list
2015-02-13 11:52:23 -08:00
Brad Hefta-Gaub
59b2c38eb1
Merge pull request #4277 from huffman/fix-select-box
...
Update editEntities to not select new entity when edit tools are off
2015-02-13 10:50:11 -08:00
Andrew Meadows
d69efa03d8
Merge pull request #4276 from birarda/master
...
repairs to memory management for AudioInjectors
2015-02-13 10:15:07 -08:00
Thijs Wenker
062c2cbcee
HUD LookAt positions could be NULL now if whenever they're out of range
...
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
2015-02-12 22:55:44 +01:00
Ryan Huffman
813673b720
Fix grid tool not showing minor grid width
2015-02-12 13:19:09 -08:00
Ryan Huffman
a3d09e6adc
Fix edit grid not showing up
2015-02-12 13:18:58 -08:00
Ryan Huffman
51ce8c7100
Update editEntities to not select new entity when edit tools are off
2015-02-12 13:09:37 -08:00
Stephen Birarda
0154ac9734
final script repairs for new AudioInjector API
2015-02-12 11:52:20 -08:00
Stephen Birarda
1120a5f963
use new injector API in inWorldTestTone
2015-02-12 11:50:48 -08:00
Stephen Birarda
eda7d8ffb1
use new injector APIs in movable script
2015-02-12 11:49:01 -08:00
Stephen Birarda
70e085009b
use injector restart in airGuitar script
2015-02-12 11:44:14 -08:00
Stephen Birarda
5715642e04
fix for restart API in lobby script
2015-02-12 11:13:30 -08:00
Stephen Birarda
ea52cea5dd
more cleanup for AudioInjector mem management
2015-02-12 10:56:40 -08:00
Stephen Birarda
7becf62ba9
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-02-12 10:28:04 -08:00
Brad Hefta-Gaub
fa5eebd93e
Merge pull request #4269 from AndrewMeadows/thermonuclear
...
ModelEntityItem gets _shapeType
2015-02-12 10:06:01 -08:00
Andrew Meadows
5bb504ad55
Merge pull request #4268 from huffman/remove-upload-model
...
Remove upload from file from editEntities.js
2015-02-12 08:57:22 -08:00
Stephen Birarda
e3c4ead323
remove unecessary injector stops
2015-02-11 16:23:57 -08:00
Stephen Birarda
05b7cd819e
use isPlaying property instead of getter
2015-02-11 16:21:45 -08:00
Stephen Birarda
f9174366dc
fixes for new injector API in other scripts
2015-02-11 16:20:48 -08:00
Stephen Birarda
d8646f6ea0
repairs for new injector API in air guitar script
2015-02-11 16:17:10 -08:00
Stephen Birarda
6a5c0fd9f2
repairs for new injector API in lobby script
2015-02-11 16:16:01 -08:00
Thijs Wenker
cb09656624
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-02-11 22:58:27 +01:00
Thijs Wenker
2c52c9c3c0
fixes for the virtualKeyboardTextEntityExample
2015-02-11 22:57:59 +01:00
Andrew Meadows
9f59addbc2
merge upstream/master into andrew/thermonuclear
2015-02-11 13:35:28 -08:00
Ryan Huffman
957686e12e
Remove upload from file from editEntities.js
2015-02-11 09:04:56 -08:00
Andrew Meadows
13c953494c
Merge pull request #4264 from huffman/entity-resize
...
Increase entity-resize timeout to 2 minutes
2015-02-11 09:02:26 -08:00
Andrew Meadows
68c1e9ef71
Merge pull request #4260 from birarda/master
...
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
2015-02-11 09:02:18 -08:00
Andrew Meadows
d9b57de649
merge upstream/master into andrew/thermonuclear
2015-02-11 08:56:34 -08:00
Andrew Meadows
ac8db02029
add ShapeType to UI of entity properties editor
2015-02-11 08:54:35 -08:00
Ryan Huffman
6eca8610b6
Increase entity-resize timeout to 2 minutes
2015-02-10 15:54:04 -08:00
Brad Hefta-Gaub
3e8f7dc3da
Merge pull request #4263 from huffman/text-size
...
Increase size of text entity
2015-02-10 15:04:32 -08:00
Ryan Huffman
9997ef1b97
Increase size of text entity
2015-02-10 14:23:00 -08:00
Stephen Birarda
fe79d8902e
replace data with metaverse for highfidelity urls
2015-02-10 10:05:38 -08:00
Ryan Huffman
39cc6c86ae
Update selected entity color to have more contrast
2015-02-10 09:03:48 -08:00
Ryan Huffman
8d65caaaef
Update entity list search input to be full width with margin
2015-02-10 09:03:21 -08:00
Ryan Huffman
7ac3bd3ee8
Add padding to buttons in entity list
2015-02-10 09:02:53 -08:00
Thijs Wenker
1d5afba1fa
removed some console noise
2015-02-09 18:40:36 +01:00
Thijs Wenker
e53b38e497
style / make sure the magnifier isn't rendered when we don't want it
2015-02-09 17:16:54 +01:00
Thijs Wenker
d810283d5a
just show the instructions the first 2 times
2015-02-09 16:47:00 +01:00
Thijs Wenker
8251542b78
show instructions whenever the first gamepad is plugged since the script is loaded
2015-02-07 14:35:14 +01:00
Thijs Wenker
0a41033c85
- set cursor invisible when virtual-keyboard is shown.
...
- get rid of the invisible cursor/magnifier states when cleaning up keyboard.
2015-02-07 13:58:11 +01:00
David Rowe
334f26c84f
Display some progress while waiting at 0% and limit speed of advance
2015-02-06 21:43:21 -08:00
David Rowe
4cd1d54f15
Fix progress bar's SVG dimensions
2015-02-06 21:42:58 -08:00
Thijs Wenker
e3ca1efe6b
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-02-07 00:34:38 +01:00
Brad Hefta-Gaub
390d2be48f
Merge pull request #4189 from birarda/android
...
add the gvr-interface target for GearVR
2015-02-06 14:07:28 -08:00
Stephen Birarda
0b10d0d1dc
add an example script for the portal
2015-02-06 10:38:23 -08:00
Stephen Birarda
65418b8b67
remove the text comparisons from images dir
2015-02-06 10:02:44 -08:00
Brad Hefta-Gaub
f8d62d332a
Merge pull request #4222 from jherico/text-renderer
...
Text renderer refactor to use signed distance field font rendering
2015-02-05 21:58:41 -08:00
Brad Hefta-Gaub
9058e9116a
Merge pull request #4233 from ctrlaltdavid/fix-lookwithmouse
...
Don't hide mouse events from C++ GUI
2015-02-05 11:38:04 -08:00
Brad Hefta-Gaub
16717b322e
Merge pull request #4237 from huffman/edit-user-data
...
Edit user data
2015-02-05 11:37:30 -08:00
Ryan Huffman
6863895533
Remove value from animation settings textarea
2015-02-05 11:19:18 -08:00
Ryan Huffman
850de6e67e
Add User Data to entity properties panel
2015-02-05 11:19:01 -08:00
Ryan Huffman
1e11e658a8
Update drag/drop distance to be based on cameraManager.enabled rather than camera mode
2015-02-05 10:18:34 -08:00
Ryan Huffman
2343da0a8a
Update drag/drop distance while in non-independent mode
2015-02-05 10:16:51 -08:00
Ryan Huffman
41720dbc4b
Add drag-drop functionality for placing entities
2015-02-05 10:07:31 -08:00
David Rowe
c0ac9333e9
Don't hide mouse events from C++ GUI
2015-02-04 23:04:06 -08:00
Brad Davis
e1af9f8126
Merge remote-tracking branch 'upstream/master' into text-renderer
2015-02-04 21:04:47 -08:00
Thijs Wenker
d270979f95
Instructions initial
2015-02-04 23:19:56 +01:00
Brad Hefta-Gaub
8b1a226d8e
Merge pull request #4230 from huffman/fix-select-shadow
...
Fix rotation of selection shadow for editEntities
2015-02-04 14:03:19 -08:00
Brad Hefta-Gaub
18f67aabec
Merge pull request #4229 from huffman/fix-text-default-props
...
Update the default properties for text entities
2015-02-04 13:58:52 -08:00
Ryan Huffman
0e28f66906
Fix rotation of selection shadow for editEntities
2015-02-04 13:45:06 -08:00
Ryan Huffman
efed79d76c
Update the default properties for text entities
2015-02-04 13:37:11 -08:00
Brad Hefta-Gaub
83d397ed98
Merge pull request #4223 from cozza13/20299
...
CR for Job #20299 - Add lookwithmouse.js to default scripts.
2015-02-04 13:33:14 -08:00
Thijs Wenker
38aab9570b
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-02-04 19:55:12 +01:00
Ryan Huffman
3af025574f
Decrease distance from object when focusing
2015-02-04 10:45:24 -08:00
Ryan Huffman
02d828443b
Update zoom sensitivity when using keys
2015-02-04 10:44:54 -08:00
Ryan Huffman
36238bb5df
Update editEntities to use left click for select
2015-02-04 10:43:55 -08:00
Ryan Huffman
09752589b8
Reenable on/off button
2015-02-04 10:43:28 -08:00
Ryan Huffman
4fbc7a5dcd
Add focus easing and auto-focus to menu and settings
2015-02-04 10:42:01 -08:00
Ryan Huffman
01a00b5127
Disable editEntities always-on
2015-02-04 10:40:50 -08:00
Chris Collins
ee49ce08cb
Added the script look with mouse to default script
...
Look with touch does not work on PC’s or any mouse that does not accept
two finger touch. I have therefore added look with mouse to default
scripts.
2015-02-04 09:53:38 -08:00
Brad Davis
f471597a73
Merge branch 'develop' into text-renderer
2015-02-03 23:07:19 -08:00
Brad Davis
3ead8fc8a2
Adding some more example images
2015-02-03 22:32:03 -08:00
Brad Davis
d64e7c464a
Merge branch 'develop' into text-renderer
2015-02-03 18:44:06 -08:00
David Rowe
ca302e305b
Add progress.js to defaultScripts.js
2015-02-03 16:17:06 -08:00
David Rowe
78bcf3ddcb
Update SVG URLs to use S3 files
2015-02-03 16:15:10 -08:00
David Rowe
8dd87aff16
Adjust size of 2D progress bar
2015-02-03 14:27:43 -08:00
David Rowe
46352d34ce
Make 3D progress bar match up with notifications
2015-02-03 14:27:43 -08:00
David Rowe
fdf4aeaeab
Display 3D progress bar
2015-02-03 14:27:42 -08:00
David Rowe
7beb5bf25f
Show and hide progress bar per downloads status
2015-02-03 14:27:41 -08:00
David Rowe
9b6a81cfb0
Display 2D progress bar
2015-02-03 14:27:41 -08:00
David Rowe
1fdebf63a4
Add progress.js; calculate download percent complete value
2015-02-03 14:27:40 -08:00
Brad Hefta-Gaub
b5e62922a2
Merge pull request #4215 from huffman/edit-changes
...
A few improvements to editEntities.js
2015-02-03 13:55:59 -08:00
Ryan Huffman
e2b6be2a92
Fix focus behavior when selecting an item without shift
2015-02-03 11:58:39 -08:00
Ryan Huffman
7f0fdbe23e
Make auto-focus in editEntities always use ease-on-focus
2015-02-03 11:50:58 -08:00
Ryan Huffman
814d585086
Make the entity list always visible
2015-02-03 11:44:38 -08:00
Ryan Huffman
ba5a96f541
Add Window.setFocus
2015-02-03 11:44:22 -08:00
Ryan Huffman
74dfd29708
Remove Mass from entity properties window
2015-02-03 11:44:01 -08:00
Philip Rosedale
35aeb86acc
First version, dice script
2015-02-02 23:15:18 -08:00
Philip Rosedale
2ae6514c87
Merge pull request #4200 from PhilipRosedale/master
...
Planet simulation script
2015-02-02 21:31:47 -08:00
Philip Rosedale
aa86db202c
Merge branch 'master' of https://github.com/worklist/hifi
2015-02-02 07:05:04 -08:00
Brad Davis
0726f7cd21
Example images from text rendering test
2015-02-01 19:49:01 -08:00
Thijs Wenker
d695e8b251
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-02-02 00:18:18 +01:00
Brad Davis
acf0b292e9
Adding example images
2015-01-31 21:53:34 -08:00
Ryan Huffman
a98829ed8a
Fix editEntities.js automatically turning on
2015-01-30 13:12:00 -08:00
Philip Rosedale
dfb1cffbd7
Add planet simulation
2015-01-30 10:24:26 -08:00
Ryan Huffman
0d1488e44f
Fix editEntities.js includes
2015-01-30 10:03:37 -08:00
Thijs Wenker
8f5f53c14b
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-30 18:50:01 +01:00
Ryan Huffman
77c78689d1
Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on
2015-01-30 09:28:09 -08:00
Ryan Huffman
018a4af9d6
Update camera tool to wrap cursor to window bounds rather than keep at center
2015-01-30 09:22:39 -08:00
Ryan Huffman
cddce8f795
Update editEntities to always be on + use right click for select
2015-01-30 09:21:27 -08:00
Ryan Huffman
5d8825f5eb
Remove call to gridTool.mousePressEvent
2015-01-30 08:56:37 -08:00
Thijs Wenker
adc7ed5f72
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-30 02:37:00 +01:00
Ryan Huffman
d06d8b8f01
Merge branch 'master' of github.com:highfidelity/hifi into revert-grid
...
Conflicts:
examples/libraries/gridTool.js
2015-01-29 17:27:58 -08:00
Ryan Huffman
7017fdbac0
Update style of grid tools
2015-01-29 16:59:58 -08:00
Ryan Huffman
0307448ec3
Fix color index for entity grid tool
2015-01-29 16:59:37 -08:00
Ryan Huffman
eb69720af4
Update when grid tool window is shown
2015-01-29 16:58:48 -08:00
Ryan Huffman
c00346e8cb
Revert "Remove gridControls.html"
...
This reverts commit a0cb40597b
.
2015-01-29 16:45:19 -08:00
Brad Hefta-Gaub
8a32bd2eed
Merge pull request #4164 from ctrlaltdavid/20183
...
CR for 20183 Add Oculus support to notifications.js
2015-01-29 13:38:49 -08:00
Thijs Wenker
34fd44c081
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-29 22:32:26 +01:00
Brad Hefta-Gaub
f5e092c0d2
Merge pull request #4187 from huffman/parallel-script-loading
...
Parallel script loading
2015-01-29 13:26:37 -08:00
Brad Hefta-Gaub
07d049ef2b
Merge pull request #4188 from PhilipRosedale/master
...
Add menu to paddleBall for hand choice
2015-01-29 10:56:57 -08:00
Philip Rosedale
0c3f4b894c
Menu for handedness, that really works.
2015-01-29 10:53:50 -08:00
Brad Hefta-Gaub
838cb41646
Merge pull request #4163 from PhilipRosedale/master
...
Popcorn & building blocks scripts, some fixes
2015-01-29 09:28:23 -08:00
Ryan Huffman
3447fea1db
Revert "Update grid tool to be an overlay"
...
This reverts commit 552a421f24
.
Conflicts:
examples/libraries/gridTool.js
2015-01-28 16:01:04 -08:00
Ryan Huffman
1b81ee17ab
Update how orbit-by-key is appleid
2015-01-28 12:23:58 -08:00
Ryan Huffman
09af7ed10f
Remove extra print statement
2015-01-28 12:21:58 -08:00
Ryan Huffman
a775476cfa
Remove editEntities move-by-arrow-key completely
2015-01-28 12:21:50 -08:00
Ryan Huffman
55f41eb452
Update gridTool to not use clone
2015-01-28 12:20:08 -08:00
Ryan Huffman
135c8c1bdf
Disable move entity by arrows
2015-01-28 12:19:54 -08:00
Ryan Huffman
5633be0e92
Add ability to move orbit camera using keys
2015-01-28 12:19:42 -08:00
Ryan Huffman
e1ca6d5048
Disable editentities auto-off when moving avatar
2015-01-28 12:16:28 -08:00
Thijs Wenker
46618db697
Merge branch 'master' of https://github.com/worklist/hifi into 20224
...
Conflicts:
interface/src/ui/ApplicationOverlay.h
2015-01-28 19:35:17 +01:00
Philip Rosedale
a85c6aa956
fix tabs?
2015-01-28 09:49:45 -08:00
Philip Rosedale
b515a0468b
Merge branch 'master' of https://github.com/worklist/hifi
2015-01-28 09:35:07 -08:00
Philip Rosedale
117e6abb46
remove debug and PR fixes
2015-01-28 09:34:15 -08:00
David Rowe
7286a9c5fb
Merge branch 'master' into 20276
2015-01-27 19:08:40 -08:00
David Rowe
2ee1570a40
Merge branch 'master' into 20276
2015-01-27 16:38:41 -08:00
Ryan Huffman
1ba398c0e3
Remove blank line
2015-01-27 15:57:27 -08:00
Ryan Huffman
defb796c1e
Update editEntities to auto-focus on selection
2015-01-27 15:56:24 -08:00
Thijs Wenker
3e4f4ecc6b
addOverlay rather than cloneOverlay now that we have a TextureCache for the ImageOverlay
2015-01-28 00:39:19 +01:00
Thijs Wenker
6947436994
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-27 22:29:49 +01:00
Brad Hefta-Gaub
0c4dc4100d
Merge pull request #4176 from huffman/fix-inspect
...
Fix inspect + editEntities cameras from clashing
2015-01-27 13:05:33 -08:00
Brad Hefta-Gaub
0c53193e79
Merge pull request #4175 from cozza13/20283
...
CR for Job #20283 - Clean up scripts that have recently been added.
2015-01-27 13:05:17 -08:00
Andrew Meadows
6b6e846378
Merge pull request #4177 from ZappoMan/fixGlitches
...
Some physics improvements
2015-01-27 13:02:11 -08:00
Chris Collins
283a056a43
remove VRui
...
remove VRui
2015-01-27 11:37:31 -08:00
Ryan Huffman
80002551f9
Update editEntities camera to not enable if camera is in independent mode
2015-01-27 11:28:39 -08:00
Ryan Huffman
2556b4790b
Update inspect.js to not activate if camera is in independent mode
2015-01-27 11:28:20 -08:00
Chris Collins
411541b884
Tidy up some scripts.
...
Tidy up scripts. Make some changes to some script references and
reorganize.
2015-01-27 11:04:50 -08:00
Philip Rosedale
e8f4783bea
border, new size for blocks, smoother hydra grab action
2015-01-26 22:06:59 -08:00
Philip Rosedale
8b5a451886
Grab now correctly adds linear velocity so that you can grab and throw things
2015-01-26 21:09:21 -08:00
Philip Rosedale
005cd2ba53
Add block building toolset, first version
2015-01-26 20:44:47 -08:00
Philip Rosedale
bf0cde060c
Merge branch 'master' of https://github.com/worklist/hifi
2015-01-26 20:35:34 -08:00
Philip Rosedale
e0c9af853c
remove 'STICKS' mode, add drop line to better tell what something you are holding is above
2015-01-26 20:19:46 -08:00
Atlante45
cf631bf3fc
Remove unnecessary stopAnimation in script to get rid of sacades
2015-01-26 19:20:47 -08:00
Philip Rosedale
6d3a9f7bc0
merge fix
2015-01-26 18:43:42 -08:00
Atlante45
64f8495681
Fixed mapped rotation + doubled it
2015-01-26 18:20:08 -08:00
Philip Rosedale
dd352e5a1a
Merge branch 'master' of https://github.com/worklist/hifi
2015-01-26 17:31:35 -08:00
Philip Rosedale
a1babe3a33
Put paddle exactly in hand, add animation of fingers gripping paddle
2015-01-26 17:20:31 -08:00
Atlante45
4b3291d946
Some cleanup in hydraGrab.js
2015-01-26 17:11:49 -08:00
Philip Rosedale
bfdbe2e675
Detach both guns on shutdown
2015-01-26 16:25:07 -08:00
ZappoMan
d9835701b0
added comment
2015-01-26 12:48:57 -08:00
ZappoMan
08fbcbaf40
tweaks for debugging
2015-01-26 12:38:02 -08:00
ZappoMan
a1ec44b8e0
add developer menu item to disable sending physics updates
2015-01-26 12:05:57 -08:00
Thijs Wenker
ffb35666e1
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-26 19:37:27 +01:00
David Rowe
c8a755df1b
Remove unused variable
2015-01-26 08:32:23 -08:00
Philip Rosedale
09527cc264
hit target
2015-01-25 21:52:08 -08:00
Philip Rosedale
67632fa589
remove debug
2015-01-25 21:51:12 -08:00
Philip Rosedale
901044fc53
First version, popcorn machine
2015-01-25 21:40:16 -08:00
Philip Rosedale
1048c9cda3
Merge branch 'master' of https://github.com/worklist/hifi
2015-01-23 16:09:51 -08:00
Philip Rosedale
806c1851be
add save/restore of gravity
2015-01-23 16:09:45 -08:00
Atlante45
7a1300d66c
Request blocking calls
2015-01-23 16:05:06 -08:00
Thijs Wenker
42cf9e846a
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-23 19:10:08 +01:00
David Rowe
22347dd794
Add AudioDevice.deviceChanged() signal and use to update audio menu
2015-01-22 19:11:55 -08:00
Ryan Huffman
4fd5f74365
Update editEntities.js to load includes in parallel
2015-01-22 14:14:49 -08:00
Philip Rosedale
59f79fd436
Add handedness choice, default to right handed
2015-01-22 13:42:19 -08:00
Philip Rosedale
45a84895e1
Paddle ball game, first version
2015-01-22 12:44:07 -08:00
David Rowe
7d1cc1f20d
Make 3D "x" button work
2015-01-21 21:44:55 -08:00
David Rowe
ef7ea0eaa6
Position and angle 3D notifications in lower part of view
2015-01-21 21:34:34 -08:00
Brad Hefta-Gaub
7d7411ceee
Merge pull request #4146 from PhilipRosedale/master
...
Improved Billiards, Gun
2015-01-21 19:36:20 -08:00
David Rowe
00de7062cc
Longer persist time for 3D notifications
2015-01-21 18:03:00 -08:00
David Rowe
f3147ab3e4
Move 3D notifications up as old ones are deleted
2015-01-21 17:58:50 -08:00
David Rowe
567ac9eb2f
Update 3D notification positions as avatar moves
2015-01-21 17:08:31 -08:00
Philip Rosedale
6567fcfe0b
Added shootable blocks on platform, grenade, buttons for making grid of targets
2015-01-21 16:17:25 -08:00
David Rowe
be6c6ed8ca
Add 3D notifications on a simple vertical plane
2015-01-21 16:10:33 -08:00
Thijs Wenker
62b95d1558
Merge branch '20224' of github.com:thoys/hifi into 20245
2015-01-22 01:10:14 +01:00
Thijs Wenker
724b56ed8c
HMD.getHUDLookAtPosition2D -> HMD.HUDLookAtPosition2D
2015-01-22 01:09:16 +01:00
Philip Rosedale
e02e0088af
Improvements to gun to add shootable targets on a platform
2015-01-21 13:58:48 -08:00
Ryan Huffman
2171427bbd
Update style.css to use pt instead of px for proper rendering on hidpi screens
2015-01-21 12:31:06 -08:00
Philip Rosedale
ffbe924734
Merge branch 'master' of https://github.com/worklist/hifi
2015-01-21 09:12:15 -08:00
Thijs Wenker
9c2f6c78a8
Merge branch '20224' of github.com:thoys/hifi into 20245
...
Conflicts:
examples/notifications.js
2015-01-21 17:26:22 +01:00
David Rowe
42b9ee8e77
Lint: Preferred control constructs
2015-01-21 08:14:45 -08:00
David Rowe
adba46f90c
Lint: Preferred operators
2015-01-21 08:14:44 -08:00
David Rowe
63310fac50
Lint: Syntax
2015-01-21 08:14:44 -08:00
David Rowe
ce0c91628a
Lint: Declaration order
2015-01-21 08:14:43 -08:00
David Rowe
c4b024e510
Lint: Variable declarations
2015-01-21 08:14:42 -08:00
David Rowe
e35c6be45e
Lint: White space
2015-01-21 08:14:41 -08:00
Thijs Wenker
719f76d42f
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-21 15:09:11 +01:00
Thijs Wenker
9e51bece63
More accurate HMD-cursor on virtual keyboard, thanks Simon and @ctrlaltdavid for the help on this!
2015-01-21 15:07:32 +01:00
Philip Rosedale
e95cd30be6
better reticle, balls drop properly on table
2015-01-20 16:30:50 -08:00
Ryan Huffman
1f86edbfbf
Remove console.log from entityList.html
2015-01-20 12:47:19 -08:00
Ryan Huffman
1a6557c72d
Remove removeEntity from entityList.html
2015-01-20 12:46:26 -08:00
Ryan Huffman
3a287a08ab
Fix removal of entity list menu item
2015-01-20 12:43:49 -08:00
Ryan Huffman
bc21faeefb
Add entityListTool.toggleVisible
2015-01-20 12:41:58 -08:00
Ryan Huffman
903921e11f
Update entity list to auto-refresh list on start
2015-01-20 12:40:31 -08:00
Ryan Huffman
891f6fa513
Move entity list to edit menu
2015-01-20 12:40:16 -08:00
Ryan Huffman
8202c84c79
Add entity list menu option
2015-01-20 12:37:39 -08:00
Ryan Huffman
0d9dbaccf7
Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates
2015-01-20 11:44:13 -08:00
Philip Rosedale
0f368f52fb
first cut of billiards.js, good enough to play with a bit
2015-01-20 09:46:18 -08:00
Thijs Wenker
6bad7a6002
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-17 01:35:35 +01:00
Ryan Huffman
d3a6a411fb
Update entity list to use list.js more directly
2015-01-16 16:23:29 -08:00
David Rowe
b2cadbe36a
Stop notifications of all users at startup
2015-01-16 15:24:26 -08:00
Brad Hefta-Gaub
cc9ae17964
Merge pull request #4122 from PhilipRosedale/master
...
Improvements to gun adding floating targets that topple
2015-01-15 21:34:22 -08:00
Philip Rosedale
abad341244
Merge branch 'master' of https://github.com/worklist/hifi
2015-01-15 17:35:12 -08:00
Philip Rosedale
a07b5a9723
laser pointers to guns, toppling targets (press 't')
2015-01-15 17:34:52 -08:00
David Rowe
61caf5e4b4
Fix path to hydraMove.js
2015-01-15 17:24:25 -08:00
Stephen Birarda
cdaecbd846
Update lobby.js
2015-01-15 16:40:13 -08:00
Stephen Birarda
336f28e014
repair to places array length
2015-01-15 15:00:42 -08:00
Stephen Birarda
00f4e92e06
fix places array grab
2015-01-15 14:58:49 -08:00
Thijs Wenker
5de4f8f249
Merge branch 'master' of https://github.com/worklist/hifi into 20224
...
Conflicts:
examples/libraries/virtualKeyboard.js
2015-01-15 22:59:05 +01:00
Thijs Wenker
12136e5305
cursor follows look at rotation now
2015-01-15 22:25:59 +01:00
Stephen Birarda
e538669343
resolve conflicts on merge with upstream
2015-01-15 13:12:05 -08:00
Ryan Huffman
92b99237a2
Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates
2015-01-15 11:13:01 -08:00
Ryan Huffman
705e6181a1
Move entity delete action to function
2015-01-15 11:12:46 -08:00
Brad Hefta-Gaub
d5d4b4ee18
Merge pull request #4113 from huffman/edit-entity-click
...
Update editEntities to do an accurate pick when the mouse is idle
2015-01-15 11:04:34 -08:00
Brad Hefta-Gaub
fbc040759e
Merge pull request #4112 from cozza13/20270
...
CR for Job #20270 - Change reference of global.js
2015-01-15 11:03:52 -08:00
Ryan Huffman
bf6d63cf0c
Make accurateRay parameter required
2015-01-15 10:59:24 -08:00
Ryan Huffman
dcb4d9f02d
Update editEntities to do accurate pick on mouse idle
2015-01-15 10:57:35 -08:00
Ryan Huffman
1b9b7b6797
Merge branch 'master' of github.com:highfidelity/hifi into update-properties-layout
...
Conflicts:
examples/html/entityProperties.html
2015-01-15 10:53:07 -08:00
Chris Collins
d6a3b94c73
Changed references of global.js to a var
...
Changed references of global.js to a var
2015-01-15 10:48:31 -08:00
Ryan Huffman
dbb978e278
Update style and layout of entity properties window
2015-01-15 10:22:39 -08:00
Stephen Birarda
79d214619d
update lobby for new places API
2015-01-14 18:18:26 -08:00
Thijs Wenker
80a81043ed
Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
...
Conflicts:
interface/src/Menu.cpp
2015-01-15 02:28:31 +01:00
Brad Hefta-Gaub
89967fbe7a
Merge pull request #4104 from AndrewMeadows/inertia
...
store density in EntityItem instead of mass
2015-01-14 17:17:45 -08:00
Philip Rosedale
fead12acca
Merge pull request #4102 from cozza13/20268
...
CR for Job #20268 - Change hands for gun scripts
2015-01-14 15:52:04 -08:00
Ryan Huffman
10f8e54903
Update style of properties windows
2015-01-14 15:50:42 -08:00
Clément Brisset
ce12e61a27
Merge pull request #4101 from huffman/fix-rotation-image
...
Fix rotation handles not showing up
2015-01-14 15:49:09 -08:00
Andrew Meadows
f90b128ac3
use density instead of mass in scripts/UI
2015-01-14 15:48:05 -08:00
Chris Collins
6ce71d9655
Fix library and placement reference
...
Fix library reference and switch the gun hand.
2015-01-14 13:54:34 -08:00
Ryan Huffman
e7eb12202a
Fix rotation handles not showing up
2015-01-14 09:41:34 -08:00
Thijs Wenker
2611e2f364
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-14 15:40:46 +01:00
Brad Hefta-Gaub
7e55d79ab7
Merge pull request #4099 from huffman/update-entity-properties
...
Add missing model properties to entity property window
2015-01-13 17:12:06 -08:00
Clément Brisset
3034b8f733
Merge pull request #4091 from ctrlaltdavid/20229
...
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
2015-01-13 17:07:17 -08:00
Andrew Meadows
26ab79e840
Merge pull request #4097 from huffman/update-camera-hud
...
Enable and update camera tool
2015-01-13 17:07:04 -08:00
Andrew Meadows
b4ee7b684c
Merge pull request #4070 from cozza13/20259
...
CR for Job #20259 - Fix up bad links on bot scripts
2015-01-13 17:06:36 -08:00
Thijs Wenker
e3c5558470
toggle magnifier when keyboard visibility changes
2015-01-14 01:18:53 +01:00
Thijs Wenker
38d49854cb
hide cursor
2015-01-14 01:06:44 +01:00
Ryan Huffman
c51cac6381
Remove Model List dialog
2015-01-13 15:38:28 -08:00
Ryan Huffman
7ddec78cd5
Add list.min.js for entity list tool
2015-01-13 15:36:25 -08:00
Ryan Huffman
9e8458edd9
Add support for teleport, delete, and filtering in entity list
2015-01-13 15:35:30 -08:00
Ryan Huffman
ce60a410cf
Reenable entity list tools
2015-01-13 15:34:26 -08:00
Thijs Wenker
74d56fb754
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-13 22:42:02 +01:00
Thijs Wenker
7b88deef16
Implement UI sounds for virtualKeyboard & notifications
2015-01-13 22:08:35 +01:00
Ryan Huffman
00f7bf7efe
Remove 'Edit Properties...' in favor of properties window
2015-01-13 10:12:15 -08:00
Ryan Huffman
96f75df831
Add missing model properties to entity property window
2015-01-13 10:09:05 -08:00
Ryan Huffman
0c58572d32
Reduce size of camera tool cubes
2015-01-13 08:45:11 -08:00
Ryan Huffman
e873df9680
Remove mode buttons from camera tool and increase size
2015-01-13 08:39:59 -08:00
Ryan Huffman
aad49e4404
Update camera tool to only show when edit entities is enabled
2015-01-13 08:26:32 -08:00
Ryan Huffman
80351a768e
Enable camera tool
2015-01-13 08:26:11 -08:00
Atlante45
2b48d31cbb
Move scripts to correct directory
2015-01-12 17:48:54 -08:00
Clément Brisset
10331c52a8
Merge pull request #4094 from birarda/master
...
repairs to AudioScriptingInterface playSound
2015-01-12 16:18:41 -08:00
Stephen Birarda
661221a189
repairs to AudioScriptingInterface playSound
2015-01-12 16:04:00 -08:00
Thijs Wenker
7acb4e4716
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-13 00:43:47 +01:00
Stephen Birarda
208af5cbca
Revert "don't play muzak from lobby to avoid error"
...
This reverts commit 69f5c769b8
.
2015-01-12 15:14:49 -08:00
Chris Collins
8f3aba3585
Removing double entry of gun.js
...
Removing double entry of gun.js
2015-01-12 14:39:13 -08:00
Andrew Meadows
22d500bd54
Merge pull request #4074 from huffman/rescale-properties
...
Add rescale button to edit properties window
2015-01-12 14:22:45 -08:00
Andrew Meadows
9f1a612865
Merge pull request #4073 from Atlante45/editModels
...
editModels => hydraGrab
2015-01-12 14:21:02 -08:00
Stephen Birarda
69f5c769b8
don't play muzak from lobby to avoid error
2015-01-12 10:07:20 -08:00
Thijs Wenker
636073474c
Merge branch '20224' of github.com:thoys/hifi into 20224
2015-01-12 09:40:27 +01:00
Ryan Huffman
8d8352946b
Add rescale button to edit properties window
2015-01-09 10:01:58 -08:00
Atlante45
5ab0df3288
removed editModels
2015-01-08 18:31:10 -08:00
Atlante45
22e7c6d507
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels
...
Conflicts:
examples/editModels.js
2015-01-08 18:30:38 -08:00
Chris Collins
9ca0df0796
Small fixes to scripts
...
-merge duplicate gun scripts
-fix url of sit
2015-01-08 16:05:32 -08:00
Atlante45
a46080cbf2
editModels > hydraGrab
2015-01-08 11:24:02 -08:00
Thijs Wenker
c791422fab
make gamepads and A (select key) and B (delete character) button function
2015-01-08 02:22:08 +01:00
Philip Rosedale
a04ce68fba
Merge pull request #4063 from ZappoMan/restoreLookAt
...
restore camera lookAt and keepLookingAt features
2015-01-07 16:31:07 -08:00
Thijs Wenker
da95d413a0
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-07 23:25:05 +01:00
Thijs Wenker
40b4a17ba8
include globals.js from runnable scripts for now.
2015-01-07 23:14:31 +01:00
ZappoMan
806e691bbf
restore camera lookAt and keepLookingAt features
2015-01-07 13:41:07 -08:00
Chris Collins
d15ae92e1e
Guitar fix
...
Guitar position fix
2015-01-07 13:40:36 -08:00
Brad Hefta-Gaub
23559743d9
Merge pull request #4060 from PhilipRosedale/gun
...
Added improved gun to /examples
2015-01-07 13:16:09 -08:00
Brad Hefta-Gaub
49508733aa
Merge pull request #4053 from cozza13/20254
...
CR for Job #20254 - Additional Script updates
2015-01-07 13:14:34 -08:00
Philip Rosedale
9bf56516e0
Added improved gun to /examples
2015-01-07 13:02:00 -08:00
Chris Collins
3a75a6f920
Minor typo fix
...
Minor typo fix
2015-01-07 12:57:40 -08:00
Thijs Wenker
527576eeba
or not...
2015-01-07 21:38:31 +01:00
Thijs Wenker
6771252eab
seems like you need to offset the include from the script that uses it
2015-01-07 21:34:34 +01:00
Thijs Wenker
4fdcdf095c
trying to fix url
2015-01-07 21:27:14 +01:00
Ryan Huffman
eafe1ae951
Update position of grid-to-avatar to be at the left foot
2015-01-07 12:15:36 -08:00
Ryan Huffman
fbdc509428
Increase size of url input boxes
2015-01-07 12:15:14 -08:00
Ryan Huffman
92fc08fa70
Update property list window to only show after selection
2015-01-07 12:14:47 -08:00
Thijs Wenker
ff6cae738b
fixed library paths
2015-01-07 20:47:59 +01:00
Thijs Wenker
19eec81173
moved goTo.js and virtualKeyboardTextEntityExample.js to the right category folder
2015-01-07 20:46:39 +01:00
Thijs Wenker
2d56070eae
Merge branch 'master' of https://github.com/highfidelity/hifi into 20224
...
Conflicts:
examples/controllers/oculus/virtualKeyboard.js
examples/libraries/virtualKeyboard.js
examples/virtualKeyboard.js
2015-01-07 20:45:18 +01:00
David Rowe
40274df279
Add downloads information changed event for JavaScript
2015-01-07 11:20:46 -08:00
Chris Collins
53f24954e0
Updates based on PR comments
...
Commented out Camera.stopLooking and Camera.keepLookingAt . This can be
put back when we merge back the C++ issue.
2015-01-07 11:15:30 -08:00
Thijs Wenker
0ec25acc9c
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-07 14:39:27 +01:00
Chris Collins
816e369c08
More Script updates
...
More Script updates
2015-01-06 22:32:45 -08:00
Chris Collins
0a1a64b7e6
Script updates and fixes to highfidelity-public
...
Script updates and fixes to highfidelity-public
2015-01-06 17:04:42 -08:00
David Rowe
8b0d859686
Add method to access downloads information in JavaScript
2015-01-06 15:54:07 -08:00
Chris Collins
95f8447191
Incremental update to scripts cleanup
...
-Moved more of the scripts around
-Fixed up the location on assets on start. e.g. gun.js
-Removed additional Scripts.
2015-01-06 15:47:25 -08:00
Chris Collins
602275a0f7
First pass moving scripts into an example folder.
...
This is just a quick first pass to move some of the scripts into an
examples folder. There are also a couple of obvious deletions.
2015-01-06 11:16:40 -08:00
Andrew Meadows
278be3d31b
remove use of "radius" property for entities
...
use "dimensions" instead
2015-01-05 18:13:50 -08:00
Andrew Meadows
ec86f0bd50
fixing toyball.js to work under Bullet
2015-01-05 17:30:50 -08:00
Andrew Meadows
162854c5a5
Merge pull request #4025 from ZappoMan/voxelEctomy
...
Voxel ectomy
2015-01-05 13:20:30 -08:00
Brad Hefta-Gaub
125dc5010e
Merge pull request #4039 from AndrewMeadows/inertia
...
Bullet physics part 2
2015-01-05 13:10:55 -08:00
Brad Hefta-Gaub
58a2a5eb83
Merge pull request #4027 from huffman/grid-shader-updates
...
Grid shader updates
2015-01-05 13:00:05 -08:00
Andrew Meadows
21b2d14956
converting existing JS scripts to use new damping
...
Old formula the scripts were using: v *= damping
So a value of 0.999 was "little damping" and a value of 0.001 was "very strong damping",
but now that is reversed.
New formula: v *= (1 j- damping)^dt
A damping value of 0.001 now means "very little damping"
and a value of 0.999 means "very strong damping".
2015-01-05 11:25:15 -08:00
Thijs Wenker
08c48f0779
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-03 15:02:58 +01:00
Ryan Huffman
cf04c3313a
Update inWorldTestTone.js to play in front of avatar
2015-01-02 11:43:41 -08:00
Thijs Wenker
f0320caad3
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2015-01-02 19:16:06 +01:00
Ryan Huffman
50bbeae30b
Disable camera tool temporarily
2014-12-31 15:40:11 -08:00
Thijs Wenker
605e895de7
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2014-12-31 21:17:03 +01:00
Ryan Huffman
a8de290482
Update grid alpha
2014-12-31 11:12:02 -08:00
ZappoMan
9630279459
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
...
Conflicts:
examples/editVoxels.js
examples/fallingSand.js
examples/growTrees.js
interface/src/Application.cpp
interface/src/Application.h
libraries/avatars/CMakeLists.txt
libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
ZappoMan
48285b21c4
remove voxel related scripts
2014-12-30 20:50:07 -08:00
Thijs Wenker
c73b496cac
press X button with gamepad
2014-12-31 02:25:55 +01:00
Thijs Wenker
398e88107c
renamed virtualKeyboardLocation.js to goTo.js as discussed
2014-12-31 01:53:10 +01:00
Thijs Wenker
33a4f80300
hide keyboard after submit
2014-12-31 01:49:01 +01:00
Thijs Wenker
a0e209276b
textbox visibility
2014-12-31 01:46:01 +01:00
Thijs Wenker
1365ecede3
removed unused variables
2014-12-31 01:42:19 +01:00
Thijs Wenker
e856d302d3
- improved keyboard visibility setting
...
- added posibility to teleport to location through hmd
2014-12-31 01:37:51 +01:00
Thijs Wenker
11d66ae83f
fixed text entity height
2014-12-31 00:51:34 +01:00
Ryan Huffman
cf798e0a2f
Fix orbit camera capturing mouse
2014-12-30 15:30:25 -08:00
Ryan Huffman
0105906dc7
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
...
Conflicts:
examples/editEntities.js
2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c
Rename 2D -> HUD, 3D -> World in Overlays
2014-12-30 14:50:17 -08:00
Thijs Wenker
a8122e5a85
virtualKeyboard.js - scale 50%
...
virtualKeyboardLocation.js - toggle visibility with Enter/Return key
virtualKeyboardTextEntityExample.js - attempt to fix character glyphs
2014-12-30 23:30:48 +01:00
Ryan Huffman
ea69dcaf29
Update grid colors
2014-12-30 13:10:23 -08:00
Clément Brisset
ecdf415954
Merge pull request #4016 from huffman/grid-tools-overlay
...
Grid tools overlay
2014-12-30 12:18:13 -08:00
Ryan Huffman
1da253d39f
Remove duplicate minorGridWidth variable
2014-12-30 12:13:40 -08:00
Ryan Huffman
16bf4e87e6
Remove unused function
2014-12-30 11:34:59 -08:00
Ryan Huffman
a0cb40597b
Remove gridControls.html
2014-12-30 11:31:47 -08:00
Ryan Huffman
552a421f24
Update grid tool to be an overlay
2014-12-30 11:31:29 -08:00
Ryan Huffman
fbd189bde3
Rename minorGridSpacing to minorGridWidth
2014-12-30 11:28:10 -08:00
Ryan Huffman
fdba41a69d
Add grid colors to Grid
2014-12-30 11:27:16 -08:00
Ryan Huffman
9a6bce3767
Add getters/setters to Grid
2014-12-30 11:26:44 -08:00
Ryan Huffman
a474243f08
Update to ignore mouseRelease events if mousePress event handles by tool
2014-12-30 11:21:50 -08:00
Thijs Wenker
4eec066d69
split up virtualKeyboard script in a library and two script that will use it:
...
virtualKeyboardLocation.js - Location through virtual keyboard
virtualKeyboardTextEntityExample.js - Initial example for virtual keyboard
2014-12-30 19:51:53 +01:00
Thijs Wenker
d299f3f0c5
no 3d mode for now
2014-12-29 23:10:15 +01:00
Thijs Wenker
8b6753f5f0
Merge branch '20224' of https://github.com/thoys/hifi into 20224
2014-12-29 21:13:34 +01:00
Thijs Wenker
e38aa89418
Overwrite keypress of Enter key
2014-12-29 21:11:34 +01:00
Thijs Wenker
89aa3f262c
Merge branch 'master' of https://github.com/worklist/hifi into 20224
2014-12-29 14:53:42 +01:00
Chris Collins
e105ba61e8
Fix for model uploading to work
...
Fix for model uploading to work. The deleted elements were causing an
error when trying to upload models.
2014-12-23 11:01:25 -08:00
Andrew Meadows
3e087bd75e
Merge pull request #3990 from ZappoMan/entityScriptsAndEvents
...
Entity Scripts bug fixes/improvements
2014-12-19 16:02:00 -08:00
Ryan Huffman
7249a7e299
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-12-19 15:27:33 -08:00
Ryan Huffman
588d7e62f4
Update camera-controls.svg url
2014-12-19 15:18:26 -08:00
Ryan Huffman
30e2a9c13f
Add notifications.js to defaultScripts
2014-12-19 14:18:44 -08:00
Ryan Huffman
eaad95c949
Merge pull request #3985 from Adrianl3d/20221
...
changes as per list
2014-12-19 11:36:52 -08:00
ZappoMan
32ea38b938
added leaveAllEntities support
2014-12-19 11:33:25 -08:00
ZappoMan
97d617bd17
revert some prototype script stuff for now
2014-12-19 11:01:35 -08:00
ZappoMan
d43ec2ee28
revert some prototype script stuff for now
2014-12-19 11:00:41 -08:00
Ryan Huffman
2e96bbe38b
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
2014-12-19 10:37:47 -08:00
Ryan Huffman
15389b5fce
Add camera UI to camera tool
2014-12-19 10:37:21 -08:00
ZappoMan
cfa5e5c61b
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents
...
Conflicts:
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-19 10:35:18 -08:00
Adrianl3d
51121554e5
clean up code
...
intentations lines 263 264
2014-12-20 04:28:39 +10:00
Brad Hefta-Gaub
821cbe610c
Merge pull request #3975 from ctrlaltdavid/20212
...
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
2014-12-19 09:55:45 -08:00
Ryan Huffman
93aaa38c4c
Add camera orientation overlay
2014-12-19 09:03:04 -08:00
Thijs Wenker
e913095af5
Merge branch 'master' of https://github.com/worklist/hifi into 20216
...
Conflicts:
interface/CMakeLists.txt
2014-12-19 13:53:33 +01:00
Ryan Huffman
5b89208068
Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/overlays/Cube3DOverlay.cpp
2014-12-18 16:46:17 -08:00
Ryan Huffman
1776b2dee2
Update line3d in editModels to use start instead of position
2014-12-18 16:41:41 -08:00
Ryan Huffman
5537fb970b
Update scripts to use instead of for line3d
2014-12-18 16:23:24 -08:00
Adrianl3d
af1591277c
changes as per list
...
removed dummy code, remove mic mute state at startup, some text changes.
2014-12-19 04:17:36 +10:00
Thijs Wenker
99b0cca8f3
realsenseHands.js example
2014-12-18 00:08:20 +01:00
Ryan Huffman
cb7f5a5b45
Roll gridTool.js back temporarily
2014-12-17 12:41:58 -08:00
Thijs Wenker
e883d1dbb7
3d mode
2014-12-17 21:21:51 +01:00
Brad Hefta-Gaub
61ec1bdd6a
Merge pull request #3977 from huffman/fix-minor-grid
...
Fix minor grid spacing not updating
2014-12-17 09:13:32 -08:00
Ryan Huffman
b95eac759e
Fix minor grid spacing not updating
2014-12-17 08:52:48 -08:00
ZappoMan
85c8951734
really remove the debug settings from Model rendering
2014-12-16 13:57:22 -08:00
Ryan Huffman
a9223f5887
Remove text from label
2014-12-12 15:45:31 -08:00
Ryan Huffman
2fab404f7f
Reorganize selectionManager selection checking
2014-12-12 15:35:39 -08:00
Ryan Huffman
dde9b92dbd
Update SelectionManager -> selectionManager
2014-12-12 15:31:54 -08:00
Ryan Huffman
33b4c614ea
Add buttons for moving selection to grid and resetting to natural dimensions
2014-12-12 15:28:57 -08:00
Ryan Huffman
a5cbc9b3e2
Fix properties window to work with undo/redo
2014-12-12 15:28:22 -08:00
Ryan Huffman
1a90a81037
Add id to properties window
2014-12-12 15:27:56 -08:00
Ryan Huffman
d1f5bf2e3c
Add rotation to properties window
2014-12-12 15:27:30 -08:00
Ryan Huffman
b8737ad525
Update 'f' focus to only work when something is selected
2014-12-12 15:26:07 -08:00
David Rowe
1ab9129616
Update laserPointer.js to detect pointing with Leap Motion or similar
2014-12-11 21:31:23 -08:00
Brad Hefta-Gaub
31cbd6e88c
Merge pull request #3954 from ctrlaltdavid/20226
...
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
2014-12-11 14:33:24 -08:00
Atlante45
b7d9023645
Don't stop defaultScripts
2014-12-11 12:06:24 -08:00
Stephen Birarda
76cf122d74
Merge pull request #3950 from birarda/master
...
use higher resolution images in lobby
2014-12-11 11:24:19 -08:00
Stephen Birarda
230b8740bf
add higher resolution images to lobby
2014-12-11 11:23:27 -08:00
AndrewMeadows
bb6f976699
Merge pull request #3945 from ZappoMan/someCleanup
...
AudioRefector-ectomy
2014-12-11 10:39:41 -08:00
Brad Hefta-Gaub
cfe0b28504
Merge pull request #3948 from huffman/lobby-black-panels
...
Update lobby to use new URLs + black panels in place of H
2014-12-10 20:16:22 -08:00
Ryan Huffman
0c746168ef
Update lobby to use new URLs + black panels in place of H
2014-12-10 19:48:05 -08:00
Brad Hefta-Gaub
de5702157b
Merge pull request #3946 from Atlante45/lobby_in_default
...
Lobby in defaultScripts
2014-12-10 17:27:14 -08:00
Atlante45
ccf8d0a787
DefaultScript.js doesn't appear in running scripts
2014-12-10 16:55:40 -08:00
Atlante45
ff372c5f4e
Added lobby.js to default scripts
2014-12-10 16:53:21 -08:00
ZappoMan
eda7432868
remove audio reflector
2014-12-10 15:37:48 -08:00
Ryan Huffman
9c9bfeed33
Add missing 'var' to local variable
2014-12-10 14:27:37 -08:00
Ryan Huffman
961f629074
Fix indentation, 4 -> 2
2014-12-10 14:26:42 -08:00
Ryan Huffman
7515c26d71
Merge remote-tracking branch 'upstream/master' into lobby-reorder
2014-12-10 14:17:47 -08:00
Ryan Huffman
a24acb4858
Fix style
2014-12-10 14:15:43 -08:00
Ryan Huffman
6fa1d7a7bd
Update lobby to start on the second row
2014-12-10 14:08:59 -08:00
Atlante45
10a6428277
Chess board correct orientation
2014-12-10 10:37:54 -08:00
David Rowe
ff6db7a9fa
Merge branch 'master' into 20226
2014-12-09 19:20:30 -08:00
David Rowe
3ea3a497c6
Update scripts to use new textSize() method
2014-12-09 18:33:29 -08:00
Brad Hefta-Gaub
69f7a89003
Merge pull request #3937 from Atlante45/mouse_pick_in_oculus
...
Mouse pick improvments
2014-12-09 18:33:25 -08:00
Brad Hefta-Gaub
9c1be46893
Merge pull request #3929 from huffman/new-entities-default
...
New entities default
2014-12-09 18:00:25 -08:00
AndrewMeadows
1697636db5
Merge pull request #3933 from ZappoMan/entityCollisions
...
move emit of collisions to after done moving entities, so that callbacks can delete entities
2014-12-09 17:46:41 -08:00
Philip Rosedale
756e1b4d63
Merge pull request #3935 from PhilipRosedale/master
...
option to suppress lobby text for now, defaults to true
2014-12-09 17:40:03 -08:00
Philip Rosedale
96c3a0edbd
option to suppress lobby text for now, defaults to true
2014-12-09 17:39:05 -08:00
Atlante45
b197558b87
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
2014-12-09 16:46:13 -08:00
Atlante45
0a4f74cf9c
Single reticle in the lobby
2014-12-09 16:29:45 -08:00
Ryan Huffman
ec62c6833c
Make editEntities a default script and remove editVoxels.js
2014-12-09 12:15:22 -08:00
Ryan Huffman
a63d0e7770
Rename newEditEntities.js to editEntities.js
2014-12-09 12:15:22 -08:00
Stephen Birarda
55ec455f77
Merge pull request #3928 from huffman/entity-tool-settings
...
Entity tool settings
2014-12-09 12:14:17 -08:00
ZappoMan
895e22fcdb
removed debug code
2014-12-09 12:12:04 -08:00
ZappoMan
79fc8a5a71
remove debug ryans rotate problem
2014-12-09 11:58:01 -08:00
Ryan Huffman
19ba2a1f84
Remove print statement
2014-12-09 08:56:29 -08:00
Ryan Huffman
2696f71be9
Update edit entities to disable on wasd or arrow keys
2014-12-09 08:54:28 -08:00
Ryan Huffman
e5aee44ceb
Add setting save/load to grid tool
2014-12-09 08:51:04 -08:00
ZappoMan
3c09ca71cb
move emit of collisions to after done moving entities, so that callbacks can delete entities
2014-12-08 18:09:49 -08:00
Clément Brisset
db751ca0c4
Merge pull request #3924 from ZappoMan/entityCollisions
...
make collision callbacks work as entity methods
2014-12-08 16:47:25 -08:00
ZappoMan
0d636314ba
fixed CR feedback
2014-12-08 16:20:39 -08:00
Brad Hefta-Gaub
39b1f73976
Merge pull request #3921 from Atlante45/tabs_to_spaces
...
Tabs to spaces
2014-12-08 15:55:05 -08:00
ZappoMan
7449821a9b
add ID to the properties dialog box
2014-12-08 15:06:50 -08:00
ZappoMan
efbe8ce757
Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions
2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06
make collision callbacks work
2014-12-08 14:15:03 -08:00
Ryan
7fffcd3b53
Swap out the lobby model for the one with the correct light value
2014-12-08 12:47:37 -08:00
Atlante45
716fca6ae7
tabs to spaces
2014-12-08 11:49:55 -08:00
Clément Brisset
681a1a3297
Merge pull request #3917 from ctrlaltdavid/20202
...
CR for Job #20202 - Add "backgroundVisible" property to text overlays
2014-12-08 11:43:52 -08:00
ZappoMan
27bc394bed
repair collision info mismatch
2014-12-08 10:52:53 -08:00
ZappoMan
aefeda37bd
more debugging
2014-12-08 09:41:58 -08:00
Philip Rosedale
732b40f68c
Merge pull request #3918 from ZappoMan/acEntityCrash
...
Ac entity crash
2014-12-08 09:16:40 -08:00
ZappoMan
0f5930a43d
add identifyEntity() to butterflies script
2014-12-08 06:50:28 -08:00
Philip Rosedale
60c2a89292
Merge pull request #3915 from ZappoMan/modelRayPick
...
Proper Model Ray Picking
2014-12-07 14:19:26 -08:00
Ryan Huffman
a53e1c69fd
Merge pull request #3914 from thoys/20163
...
CR for Job #20163 - Implement virtual keyboard for use in HMD
2014-12-07 10:22:34 -08:00
ZappoMan
8dd1a2815f
use precision picking in newEditEntities
2014-12-06 15:43:17 -08:00
ZappoMan
91fd574eb5
Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick
2014-12-06 15:28:54 -08:00
Thijs Wenker
351819708b
style fixes
2014-12-06 23:50:30 +01:00
ZappoMan
7ea85073f4
introduce precision picking in API form
2014-12-06 11:45:49 -08:00
David Rowe
dbb547507d
Merge branch 'master' into 20202
2014-12-06 11:14:45 -08:00
David Rowe
ca62e61579
Update scripts with text overlays to use new backgroundAlpha property
2014-12-06 11:11:52 -08:00
David Rowe
4ee99ef38a
Remove dead code that's causing problems
2014-12-06 11:03:28 -08:00
David Rowe
fd00ad95ca
Fix voxel size text display
2014-12-06 09:24:30 -08:00
Brad Hefta-Gaub
2bf93bd9f0
Merge pull request #3913 from huffman/entity-tool-property-fixes
...
Entity tool property fixes + add script property
2014-12-06 00:40:18 -08:00
Thijs Wenker
ccdb13c951
virtualkeyboard: moved files to hifi public bucket
2014-12-06 00:33:33 +01:00
Ryan Huffman
a89411fd5e
Add script URL to properties tool
2014-12-05 15:27:40 -08:00
Ryan Huffman
896a34212b
Fix sections not properly updating in properties tool
2014-12-05 15:27:24 -08:00
Andrzej Kapolka
01c209ef07
Merge pull request #3912 from PhilipRosedale/master
...
Add gamepad warp to headMove, remove step turning when head rotated
2014-12-05 15:27:03 -08:00
Philip Rosedale
2c8b1721cc
Add warp from right ('O') button on gamepad
2014-12-05 14:06:41 -08:00
ZappoMan
d5fbe5b6b4
Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick
2014-12-05 12:48:00 -08:00
Brad Hefta-Gaub
a3fbaab957
Merge pull request #3911 from huffman/entity-tool-window-polish
...
Entity Properties Tool Window Polish
2014-12-05 12:38:43 -08:00
Brad Hefta-Gaub
1de7db390e
Merge pull request #3908 from PhilipRosedale/master
...
Orbiting sound example, ability to set injector position, better butterflies
2014-12-05 12:37:42 -08:00
ZappoMan
a6b86da47a
basics of triangle picking working for models
2014-12-05 11:31:27 -08:00
David Rowe
f5a1c26492
Add backgroundAlpha property to 2D and 3D text overlays
2014-12-05 11:08:00 -08:00
Ryan Huffman
849397288e
Update properties tool to be a resizable table
2014-12-05 10:46:35 -08:00
Ryan Huffman
0ece6c0968
Update properties window to show properties for locked entities
2014-12-05 10:43:15 -08:00
Philip Rosedale
bc609016a9
remove debug
2014-12-05 08:59:41 -08:00
Philip Rosedale
c5247ca65b
Add ability to set injector properties during playing, and orbitingSound.js
2014-12-05 08:45:00 -08:00
Philip Rosedale
dbf64b2de7
Merge pull request #3898 from DaveDubUK/walk-JS-1.12
...
Version 1.12 of the walk.js script
2014-12-04 16:29:19 -08:00
Thijs Wenker
c0ba9e73c2
fixed font height bq
2014-12-05 01:07:49 +01:00
Philip Rosedale
47c2ea95f4
Merge branch 'master' of https://github.com/worklist/hifi
2014-12-04 16:07:28 -08:00
Thijs Wenker
a7185738e9
virtualkeyboard: scaling text in input box
2014-12-05 00:52:36 +01:00
Clément Brisset
26340353ac
Merge pull request #3897 from ZappoMan/rayPickWork
...
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
2014-12-04 15:43:17 -08:00
Ryan Huffman
ba3f051c8c
Disable the warp button in gamepad.js
2014-12-04 15:11:16 -08:00
Ryan Huffman
3bbee640fb
Make gamepad mirror button toggle
2014-12-04 14:48:03 -08:00
Ryan Huffman
500b8a49d1
Add button to gamepad.js to toggle mirror mode
2014-12-04 14:17:24 -08:00
Ryan Huffman
e3a34f6db0
Add multi-speed control to gamepad.js
2014-12-04 12:17:31 -08:00
Thijs Wenker
5e2d1c3364
more comfortable movement setting
2014-12-04 21:15:10 +01:00
Brad Hefta-Gaub
3a396b3256
Merge pull request #3900 from huffman/entity-tools-fix-rp-rotation
...
Fix entity tool rotation to rotate around registration point
2014-12-04 11:41:22 -08:00
Ryan Huffman
1ee45e8bd1
Fix entity tool rotation to rotate around registration point
2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub
cab1be25ed
Merge pull request #3899 from huffman/entity-tools-fix-registration-point
...
Entity tools fix registration point
2014-12-04 11:04:27 -08:00
Ryan Huffman
1f82831bcc
Fix call to getRelativeCenterPosition
2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e
Merge pull request #3896 from huffman/fix-entity-selection
...
Fix entity tool selection when inactive
2014-12-04 10:39:42 -08:00
Ryan Huffman
acd5495b2a
Add getRelativeCenterPosition
2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7
Remove print
2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494
Fix stretch tools to work correctly with registrationPoint
2014-12-04 10:19:51 -08:00
DaveDubUK
f223f51fa6
Version 1.12 of the walk.js script
2014-12-04 18:15:25 +00:00
Ryan Huffman
53f195eec4
Fix position of overlays when registrationPoint is not centered
2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0
Add registrationPoint to SelectionManager
2014-12-04 10:03:54 -08:00
Ryan Huffman
74acf9513b
Fix entity tool selection when inactive
2014-12-04 08:47:18 -08:00
Philip Rosedale
dd8deeea59
simpler butterflies script that doesn't put as much traffic on entity server
2014-12-03 22:39:11 -08:00
ZappoMan
cd92185c5b
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
...
Conflicts:
examples/newEditEntities.js
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
libraries/entities/src/EntityTree.h
2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
96c3bfceef
Merge pull request #3889 from huffman/entity-tools-polish-2
...
Entity tools polish - round 2
2014-12-03 14:31:27 -08:00
Ryan Huffman
d08337326c
Update selection box color to red
2014-12-03 12:59:51 -08:00
Stephen Birarda
f0b0c5fe0b
change warp button to button face right
2014-12-03 11:08:41 -08:00
ZappoMan
5f9c1c490b
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
2014-12-03 10:44:56 -08:00
Ryan Huffman
5c5c66b265
Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2
2014-12-03 08:40:38 -08:00
Ryan Huffman
4e78003520
Fix issue with selection boxes not being hidden
2014-12-02 18:03:00 -08:00
Ryan Huffman
f25d509363
Remove unused lastPlaneIntersection
2014-12-02 17:50:34 -08:00
Ryan Huffman
aa067bc153
Update UpDown translation to follow the mouse as other tools do
2014-12-02 17:49:25 -08:00
Ryan Huffman
c4ca7e1b18
Remove clearSelections from findClickedEntity - it shouldn't handle it
2014-12-02 16:01:40 -08:00
Ryan Huffman
30a7b60958
Update checkMove to only update rotation handles instead of all handles
2014-12-02 16:01:09 -08:00
Ryan Huffman
0fb0169ff2
Move baseOfEntityProjectionOverlay update to updateHandles()
2014-12-02 16:00:33 -08:00
Ryan Huffman
2f1ceb922a
Increase size of selection boxes
2014-12-02 15:59:56 -08:00
Ryan Huffman
2b5a4e4563
Add selection boxes in multi-selection mode
2014-12-02 15:56:43 -08:00
Ryan Huffman
77365ec282
Move entity selection to click event and add ability to deselect
2014-12-02 15:49:45 -08:00
ZappoMan
bb6e302d69
support toggle of light picking in newEditEntities.js
2014-12-02 15:23:05 -08:00
Ryan Huffman
167ab05de4
Default 'Allow Select Large/Small Models' to true
2014-12-02 15:19:51 -08:00
ZappoMan
a47a0377ef
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork
2014-12-02 14:57:30 -08:00
ZappoMan
63d1ac8375
implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle
2014-12-02 14:56:12 -08:00
Philip Rosedale
1ce201c04f
add same for rotation
2014-12-02 14:33:19 -08:00
Philip Rosedale
2f11501e5b
Fix constant movement with hydra by adding null zone for thrust
2014-12-02 14:28:46 -08:00
Ryan Huffman
89b3a4d987
Fix selection shadow not updating when grid moves
2014-12-02 12:17:10 -08:00
Ryan Huffman
9d9a7ead5b
Remove unnecessary overlay property updates
2014-12-01 16:39:36 -08:00
Ryan Huffman
a8eb49a822
Remove now-unused *Offset variables
2014-12-01 16:38:40 -08:00
Ryan Huffman
ce4d407378
Update normalizeDegrees to be exclusive on the -180 end
2014-12-01 16:12:18 -08:00
Ryan Huffman
06ab17987b
Fix position of rotation degrees display
...
The position of the display was not always correct depending on the
camera orientation relative to the selection.
2014-12-01 16:08:50 -08:00
Ryan Huffman
4f0683dc5e
Fix stretch tools not following mouse correctly
2014-12-01 15:07:03 -08:00
Ryan Huffman
da568c96ce
Add rotation degrees overlay
2014-12-01 12:24:51 -08:00
Ryan Huffman
2c524cd70c
Darken colors of selection/highlight boxes
2014-12-01 12:24:34 -08:00
Ryan Huffman
1950ce5a4b
Add option for white grid color
2014-12-01 12:24:24 -08:00
AndrewMeadows
1b5b4c0b44
Merge pull request #3872 from ZappoMan/cleanupMenus
...
remove Entities developer menu items from C++ menu, make them available through script
2014-12-01 09:29:56 -08:00
Philip Rosedale
709a40516d
Add auto-turn of body when head is beyond 45 degrees
2014-11-29 12:17:38 -08:00
ZappoMan
85ca03199e
remove Entities developer menu items from C++ menu, make them available through script
2014-11-26 17:53:41 -08:00
David Rowe
5871ecd85c
Stop incrementing counter after limit reached
2014-11-26 12:03:27 -08:00
Brad Hefta-Gaub
883fda241f
Merge pull request #3864 from huffman/entity-tools-front-draw
...
Update entity tools to draw grabbers in front
2014-11-25 12:55:16 -08:00
Ryan Huffman
75d560744b
Update rotation handles to drawInFront = true
2014-11-25 12:34:03 -08:00
Brad Hefta-Gaub
c4ea6bac1d
Merge pull request #3863 from huffman/overlay-front-draw
...
Overlay Front Draw
2014-11-25 12:27:21 -08:00
Ryan Huffman
b3ca6fda72
Update entity tool grabbers look and size
2014-11-25 12:04:11 -08:00
Ryan Huffman
b97870f32e
Update extra entity tool stretch handles to be optionally visible
2014-11-25 12:01:29 -08:00
Ryan Huffman
9020fee31a
Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw
2014-11-25 09:53:18 -08:00
Ryan Huffman
1b1482bab3
Adjust size of stretch overlays to be smaller
2014-11-24 21:00:04 -08:00
Andrew Meadows
8966ab32d8
add lifetime to gun bullets
2014-11-24 20:37:52 -08:00
Ryan Huffman
664de8215f
Merge pull request #3850 from Adrianl3d/master
...
Added notifications.js
2014-11-24 10:38:37 -08:00
Adrianl3d
ffe66cd5c5
Clean up code
...
Fix code to standards
2014-11-25 04:23:00 +10:00
ZappoMan
345735fa8c
tweaks
2014-11-23 20:50:39 -08:00
ZappoMan
a95b6dbabd
hacking on global functions
2014-11-23 20:36:33 -08:00
ZappoMan
3ee6d6a6db
work in making entity script mixable and inheritable
2014-11-23 20:12:52 -08:00
ZappoMan
80c1f5038c
Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks
2014-11-23 11:39:05 -08:00
ZappoMan
f23d8f6c20
text sizing tweaks
2014-11-23 11:21:05 -08:00
ZappoMan
437af06245
switch to 3d text for description
2014-11-23 11:16:33 -08:00
Thijs Wenker
e12f64bae4
virtual-keyboard:
...
- added keycodes
- resizes the example text entity based on text size
- adds the author of the text entity in the bottom right corner
2014-11-23 17:15:14 +01:00
ZappoMan
53bd8fd6d2
handle no description and blank panels better
2014-11-22 21:30:58 -08:00
ZappoMan
efe202b7e8
make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby
2014-11-22 21:25:43 -08:00
ZappoMan
310e31377d
handle line wrapping in description
2014-11-22 14:49:56 -08:00
ZappoMan
f014025b81
first cut at lobby tweaks
2014-11-22 14:28:06 -08:00
ZappoMan
93755e6506
fix bugs in unloading scripts when changing domains
2014-11-22 11:53:50 -08:00
Adrianl3d
2edd252576
Fix persist time
...
Set persist time to 10 secs
2014-11-22 21:47:14 +10:00
Philip Rosedale
983975e872
lets you grab an object and turn it near your face to better see it
2014-11-21 20:05:36 -06:00
Adrianl3d
6a66351e7f
Clean up code
...
Fix indentations, whitespace, and layout
2014-11-22 10:39:34 +10:00
Ryan Huffman
ab2fa16be3
Update edit entities moveUp arrow position
2014-11-21 12:06:46 -08:00
Philip Rosedale
85419a3e2d
limit max distance of movement, don't pull to 3P unless going back
2014-11-21 01:04:52 -06:00
Philip Rosedale
5d6d9ae0df
cleaner version
2014-11-20 22:53:49 -06:00
Philip Rosedale
069f1be89d
jump with number keys to preset places
2014-11-20 22:48:03 -06:00
Thijs Wenker
a60374e4c1
virtual-keyboard: added text-entity example
2014-11-21 02:59:05 +01:00
Philip Rosedale
9a9f6bc485
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-20 19:20:57 -06:00
Philip Rosedale
57d3bac805
Merge pull request #3844 from ZappoMan/sitEntityScript
...
First cut at sit entity script
2014-11-20 19:20:39 -06:00
Thijs Wenker
2b57f68857
virtual-keyboard:
...
- shift key functions
- keys show pressed while pressing them
- keyboard.onKeyPress and onKeyRelease are functional
2014-11-21 02:07:11 +01:00
Stephen Birarda
64d9dc4efa
fix for scaling of lobby and missing reticle
2014-11-20 17:05:37 -08:00
Philip Rosedale
ddcd39ea65
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-20 18:51:04 -06:00
Philip Rosedale
d8a74a4db4
add max distance at which you will auto-magically look at someone else
2014-11-20 18:34:06 -06:00
Stephen Birarda
7f795ec67c
repairs for new lobby shell
2014-11-20 16:20:32 -08:00
Stephen Birarda
4f879a06a6
fix flipped URLs for models in lobby
2014-11-20 16:11:08 -08:00
ZappoMan
3761f24619
fix stand up icon
2014-11-20 16:08:36 -08:00
Stephen Birarda
c15354d935
update lobby for new orb and panel wall
2014-11-20 15:44:05 -08:00
ZappoMan
ee6516970e
first cut at entity script for sitting
2014-11-20 15:37:00 -08:00
Philip Rosedale
cd2a6f0f9c
merge fix
2014-11-20 17:35:50 -06:00
Thijs Wenker
fefe9bdb87
virtual-keyboard: rescale-able
2014-11-20 22:40:49 +01:00
Stephen Birarda
0a6ffe3dbd
Merge pull request #3841 from birarda/master
...
fix oculus mode check for lobby
2014-11-20 10:55:57 -08:00
Stephen Birarda
81b46d6c2c
fix oculus mode check for lobby
2014-11-20 10:55:40 -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
Ryan Huffman
6a68281308
Remove EntityScriptingInterface::getEntityItemID
2014-11-20 09:39:41 -08:00
Stephen Birarda
f3b5102969
remove texture replace fix to avoid a crash
2014-11-20 09:38:41 -08:00
Ryan Huffman
6f0d5faa5b
Update tools to snap to grid on creation
2014-11-20 09:20:22 -08:00
Philip Rosedale
5101e469dc
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-19 23:54:31 -06: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
Ryan Huffman
4b5d67d519
Update entityList.js to check for invalid entityIDs
2014-11-19 15:33:32 -08:00
Stephen Birarda
afe4a4e432
don't show reticle if not wearing HMD, reset panel textures
2014-11-19 15:26:18 -08:00
Stephen Birarda
987b75d8f7
switch to next musak when finished
2014-11-19 14:52:57 -08:00
Thijs Wenker
4eb4330e84
virtualkeyboard now scales to the viewportdimensions
2014-11-19 23:08:50 +01: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
0242e0efcf
Fix layout of entity list window
2014-11-19 13:35:08 -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
Ryan Huffman
1706faf2da
Fix animationIsPlaying not showing correctly in properties tool window
2014-11-19 11:20:47 -08:00
Ryan Huffman
4d56c21442
Add snapping to vertical translation
2014-11-19 10:35:42 -08:00
Philip Rosedale
9afaf8f6d8
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-18 21:58:40 -08:00
Thijs Wenker
7dc35bb349
virtual-keyboard:
...
- positioned in bottom
- keyboard hover-able
2014-11-19 03:12:22 +01:00
Brad Hefta-Gaub
51a2bf8226
Merge pull request #3825 from Atlante45/fix_ac_deadlock
...
AC ambiance script / moved AC scripts to new directory
2014-11-18 17:47:33 -08:00
Atlante45
44190b6fde
AC ambiance script / moved AC scripts to new directory
2014-11-18 17:27:37 -08:00
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
ee19a2d5a7
Merge pull request #3820 from huffman/grid-updates
...
Grid tool updates + fixes
2014-11-18 14:57:08 -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
Adrianl3d
f1543a9d36
Added notifications.js
...
Creates overlay notifications from events and key strokes. improved
fading.
2014-11-19 04:36:57 +10: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
Philip Rosedale
79497586dd
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-18 10:15:32 -08:00
Ryan Huffman
c39bd362b7
Fix grid controls not updateable
2014-11-18 09:52:00 -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
Thijs Wenker
d52f410c03
virtualKeyboard: added cursor which responds to HMD
2014-11-18 03:11:47 +01:00
Thijs Wenker
21f209f5a4
Merge branch 'master' of https://github.com/worklist/hifi into 20163
2014-11-18 02:27:10 +01:00
Thijs Wenker
0119797454
virtual keyboard rendered
2014-11-18 02:26:11 +01:00
Philip Rosedale
ce6464eaf0
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-17 17:19:08 -08:00
ZappoMan
1ac9f2f563
first cut at movable entities script
2014-11-17 14:51:46 -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
Philip Rosedale
1836b5639e
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-17 11:59:27 -08:00
Philip Rosedale
226f9a93c5
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-17 07:49:10 -08:00
ZappoMan
5686ef6e94
Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity
2014-11-16 11:04:36 -08:00
Brad Hefta-Gaub
3ab5753ce0
Merge pull request #3803 from stojce/20170
...
CR for Job #20170 - Add checkbox to boolean item in NewEditEntities.js properties panel
2014-11-16 08:48:59 -08:00
ZappoMan
05fa3c89a7
Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity
2014-11-15 20:38:07 -08:00
Brad Hefta-Gaub
db3755f4a6
Merge pull request #3794 from thoys/20176
...
CR for Job #20176 - Ability to clone Overlay in Javascript
2014-11-15 08:27:36 -08:00
Stojce Slavkovski
cc487d76ca
Merge branch 'master' of https://github.com/highfidelity/hifi into 20170
...
Conflicts:
examples/libraries/entityPropertyDialogBox.js
2014-11-15 09:50:09 +01:00
ZappoMan
a37275e6b1
fix animation frame
2014-11-14 21:17:13 -08:00
Philip Rosedale
9e5ad96bfe
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-14 17:55:25 -08:00
Atlante45
4d7c5f2d4f
Protect board from pieces
2014-11-14 17:35:20 -08:00
Atlante45
b1d29cf888
user data cleanup
2014-11-14 17:28:05 -08:00
ZappoMan
0cb95fc82a
add support for text properties to new html propety tools
2014-11-14 17:20:05 -08:00
ZappoMan
3f18741b15
add new text entity tool to newEditEntities.js
2014-11-14 16:40:56 -08:00
Atlante45
87d472a5a9
2 space indent -> 4 space indent
2014-11-14 16:37:30 -08:00
ZappoMan
9657e7a469
add text entity editing to editModels and entityPropertyDialogBox
2014-11-14 16:28:47 -08:00
Atlante45
94f3f461ce
Cleanup script for chess boards
2014-11-14 15:21:34 -08:00
Atlante45
58796df843
scriptEntity url
2014-11-14 15:17:09 -08:00
Atlante45
a6f57cb7e2
Index error
2014-11-14 15:13:54 -08:00
Atlante45
b948ff2dc8
Move dead pieces
2014-11-14 15:13:13 -08:00
Thijs Wenker
1a9f7c6e21
Merge branch 'master' of https://github.com/worklist/hifi into 20176
2014-11-14 23:01:18 +01:00
Atlante45
0227bc742b
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
2014-11-14 13:30:04 -08:00
Atlante45
cc35b83d31
update pieces id
2014-11-14 12:19:26 -08:00
Atlante45
a1bd5623e1
refactor + solved network issues
2014-11-14 12:04:49 -08:00
Thijs Wenker
fa4555a7a2
Merge branch 'master' of https://github.com/worklist/hifi into 20176
...
Conflicts:
interface/src/ui/overlays/Grid3DOverlay.cpp
interface/src/ui/overlays/ImageOverlay.cpp
interface/src/ui/overlays/Line3DOverlay.cpp
interface/src/ui/overlays/LocalVoxelsOverlay.cpp
interface/src/ui/overlays/LocalVoxelsOverlay.h
interface/src/ui/overlays/Overlay.h
interface/src/ui/overlays/Overlay2D.cpp
interface/src/ui/overlays/Text3DOverlay.cpp
interface/src/ui/overlays/TextOverlay.cpp
interface/src/ui/overlays/TextOverlay.h
2014-11-14 20:09:27 +01:00
Philip Rosedale
752a255aee
Merge branch 'master' of https://github.com/worklist/hifi
2014-11-14 10:57:11 -08:00
Ryan Huffman
28eebd3fa5
Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties
2014-11-14 10:53:18 -08:00
David Rowe
20fdd6d811
Disable model overlay properties example
...
It causes intermittent crashes in
NetworkGeometry::setTextureWithNameToURL()
2014-11-14 10:31:30 -08:00
Atlante45
4afcf9b240
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
2014-11-14 08:29:22 -08:00
Brad Hefta-Gaub
db2b5fc28d
Merge pull request #3791 from ctrlaltdavid/20128
...
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
2014-11-13 20:44:43 -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
Ryan Huffman
3658d65028
Remove grid tool from menu
2014-11-13 20:02:19 -08:00
Ryan Huffman
a6f027e33a
Fix entity edit grid not hiding when disabling tools
2014-11-13 18:31:32 -08:00
Atlante45
4c35f8e325
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
2014-11-13 18:06:30 -08:00
Ryan Huffman
6b2a497810
Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes
2014-11-13 17:48:17 -08:00
Ryan Huffman
55612cc596
Add title to WebWindowClass
2014-11-13 17:46:20 -08:00
Atlante45
ce73f75e7d
Merge branch 'entities_userdata' into chessgame
2014-11-13 17:45:55 -08:00
Ryan Huffman
49563dbff7
Add entityProperties tool window
2014-11-13 17:41:51 -08:00
Ryan Huffman
4254d38cdd
Update buttons to grid tool
2014-11-13 17:40:21 -08:00
Philip Rosedale
1ccd47fd1d
Fix drumstick script
2014-11-13 17:27:16 -08:00
Chris Collins
c55f76d7ef
Apply alpha to text from 0 - .9
...
Apply alpha to text from 0 - .9
2014-11-13 17:27:05 -08:00
Thijs Wenker
e964741e30
added OverlayPreloader and made a bunch of clones
2014-11-14 00:01:51 +01:00
Stephen Birarda
cfa2912877
use new SoundCache across scripts
2014-11-13 15:01:45 -08:00
Stephen Birarda
de5881818b
update playSound to new sound interface
2014-11-13 14:54: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
AndrewMeadows
b797c7b38c
Merge pull request #3782 from ctrlaltdavid/20140
...
CR for Job #20140 - Add Overlays.getTextWidth
2014-11-13 13:52:53 -08:00
Thijs Wenker
388332966d
Added cloning methods to Grid3DOverlay
...
Added example script for cloning overlays (TODO: SpriteBillboard fix cloning of in example)
2014-11-13 22:22:46 +01:00
Atlante45
a0afcdfe79
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
2014-11-13 11:39:15 -08:00
Atlante45
ac34db14aa
Send pieces ID
2014-11-13 11:35:14 -08:00
Atlante45
ce0cb9fdc7
Better move / start of auto move dead piece
2014-11-13 11:34:38 -08:00
Philip Rosedale
9cfc95bc6a
Merge pull request #3786 from ZappoMan/animationUnification
...
Animation unification
2014-11-13 10:23:36 -08:00
Atlante45
2498fd11a3
Preload sounds / use hash injector options
2014-11-13 10:22:45 -08:00
Atlante45
bc4514649e
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
2014-11-13 09:35:39 -08:00
Stephen Birarda
42a73e280e
remove the concert camera scripts from examples
2014-11-13 09:29:37 -08:00
ZappoMan
55c177594b
only set animationIsPlaying if it changed
2014-11-13 08:37:54 -08:00
ZappoMan
ea0022501b
only set animation properties if they actually changed
2014-11-13 08:13:30 -08:00
David Rowe
9e19641a1d
Add property getting for all 3D overlays
2014-11-12 21:05:44 -08:00
ZappoMan
4077f6c2ab
Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification
2014-11-12 20:39:39 -08:00
ZappoMan
8a2e3d5045
add animationSettings property to model entities
2014-11-12 17:41:55 -08:00
Atlante45
16e243aec5
typo
2014-11-12 17:19:16 -08:00
Atlante45
bada1d8e38
Cleaner code + metadata
2014-11-12 17:13:29 -08:00
Atlante45
7193fcc89d
Metadata for pieces
2014-11-12 17:12:27 -08:00
David Rowe
725d56d41f
Add property getting for all 2D overlays
2014-11-12 16:50:13 -08:00
Brad Hefta-Gaub
99dd20f828
Merge pull request #3780 from ctrlaltdavid/20182
...
CR for Job #20182 - Add ability to set alpha on text overlays
2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub
70c463695a
Merge pull request #3779 from PhilipRosedale/master
...
Remove buckyBalls and faceshift lean-to-drive
2014-11-12 16:26:50 -08:00
Atlante45
6f8b702334
New grid
2014-11-12 15:34:39 -08:00
Atlante45
76d45953fd
switch to mesh board
2014-11-12 15:34:14 -08:00
David Rowe
8c3bedae9d
Add position vector and color object script value examples
...
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
2014-11-12 14:33:52 -08:00
Atlante45
d25af3b4c9
Actual piece meshes
2014-11-12 14:15:18 -08:00
Atlante45
b4585163db
Global board position / piece boundaries
2014-11-12 14:14:37 -08:00
David Rowe
4fa5447c85
Add overlay getProperty() for text overlay "text" property
2014-11-12 12:13:57 -08:00
Atlante45
685734bdcc
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
2014-11-12 09:04:48 -08:00
Philip Rosedale
6af2b7aadf
remove buckyballs and face shift lean driving (should be a script if desired)
2014-11-12 07:33:59 -08:00
Stephen Birarda
b7b371ba61
resolve conflicts on merge with upstream master
2014-11-11 20:53:24 -08:00
David Rowe
8ac3aba2bd
Make text overlays apply alpha to text as well as background
2014-11-11 17:54:02 -08:00
Stephen Birarda
9aa950e657
fix audio injector cleanup for local only injectors
2014-11-11 17:34:03 -08:00
David Rowe
f0f12b0479
Auto-size load URL and file menu items in editModels and newEditEntities
...
And fix a couple of typos
2014-11-11 17:32:37 -08:00
Stephen Birarda
7f79f0946d
play a random musak song in lobby when it is shown
2014-11-11 17:10:25 -08:00
Atlante45
f80068798f
playChess script with autonomous pieces
2014-11-11 17:09:08 -08:00
Atlante45
e4975c0e2b
chessPiece script with sound
2014-11-11 17:08:35 -08:00
Stephen Birarda
0433586293
switch lobby noise back to drone
2014-11-11 16:59:15 -08:00
Stephen Birarda
cb5d5dd3a8
handle looping via AudioInjectorLocalBuffer
2014-11-11 16:57:25 -08:00
Stephen Birarda
a5a02b5f8a
add AudioInjectorLocalBuffer for more control
2014-11-11 16:34:00 -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
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
ZappoMan
2bc7896dee
first cut at preload script behavior
2014-11-11 13:46:48 -08:00
Ryan Huffman
db9a5f2282
Add back XZ constraining to entity edit tools
2014-11-11 11:43:27 -08:00
Stephen Birarda
1f452c8baa
replace AudioInjectionOptions with hash in playSoundOnEnterOrLeave
2014-11-11 11:17:45 -08:00
Stephen Birarda
d81609f045
use hash in place of AudioInjectionOptions in other js files
2014-11-11 11:16:45 -08:00
Stephen Birarda
89ae8f53ba
use new AudioInjectionOptions format in botProceduralWayPoints
2014-11-11 11:05:35 -08:00
Stephen Birarda
bfc25767ed
repairs to bot_procedrual for hash injector options format
2014-11-11 10:57:07 -08:00
Stephen Birarda
853c0197a1
repairs to birdSongs for new hash injector format
2014-11-11 10:55:45 -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
d4b74e6ecf
update birdSongs to new injector hash format
2014-11-11 10:30:16 -08:00
Stephen Birarda
12e15eab6a
update avatarCollision to new hash injector format
2014-11-11 10:29:29 -08:00
Stephen Birarda
c684a1cf00
update audioBall to new hash injector format
2014-11-11 10:28:33 -08:00
Stephen Birarda
05174ffdf3
update airGuitar.js to new AudioInjectionOptions format
2014-11-11 10:26:53 -08:00
Atlante45
e58664d418
Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame
2014-11-11 10:20:12 -08:00
Ryan Huffman
d537c5efdb
Add grid tool menu option
2014-11-11 09:56:02 -08:00