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
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
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
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
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
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
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
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
