Ryan Huffman
10f8e54903
Update style of properties windows
2015-01-14 15:50:42 -08: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
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
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
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
Philip Rosedale
a04ce68fba
Merge pull request #4063 from ZappoMan/restoreLookAt
...
restore camera lookAt and keepLookingAt features
2015-01-07 16:31:07 -08: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
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
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
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
Ryan Huffman
cf04c3313a
Update inWorldTestTone.js to play in front of avatar
2015-01-02 11:43:41 -08:00
Ryan Huffman
50bbeae30b
Disable camera tool temporarily
2014-12-31 15:40:11 -08:00
Ryan Huffman
a8de290482
Update grid alpha
2014-12-31 11:12:02 -08:00