ZappoMan
5686ef6e94
Merge branch 'master' of https://github.com/highfidelity/hifi into textEntity
2014-11-16 11:04: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
9657e7a469
add text entity editing to editModels and entityPropertyDialogBox
2014-11-14 16:28:47 -08:00
Ryan Huffman
a6f027e33a
Fix entity edit grid not hiding when disabling tools
2014-11-13 18:31:32 -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
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
Stephen Birarda
cfa2912877
use new SoundCache across scripts
2014-11-13 15:01:45 -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
ZappoMan
8a2e3d5045
add animationSettings property to model entities
2014-11-12 17:41:55 -08:00
Ryan Huffman
db9a5f2282
Add back XZ constraining to entity edit tools
2014-11-11 11:43:27 -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
Ryan Huffman
d537c5efdb
Add grid tool menu option
2014-11-11 09:56:02 -08:00
Ryan Huffman
b04fd89e4f
Update grid tool html location
2014-11-11 09:55:30 -08:00
AndrewMeadows
22dbebbe09
Merge pull request #3760 from DaveDubUK/20142
...
CR for Job #20142 - Walk Cycle Polish Description
2014-11-11 09:10:32 -08:00
DaveDubUK
3f1897d6b2
Minor formatting change
2014-11-11 13:21:37 +00:00
DaveDubUK
05b361affc
Formatting changes
2014-11-11 07:34:18 +00:00
DaveDubUK
ef325db052
Formatting changes to walk.js 1.1
...
Minor formatting changes for HiFi coding standard compliance
2014-11-08 11:47:57 +00:00
ZappoMan
742e6487c7
rename textureNames to originalTextures
2014-11-07 10:05:43 -08:00
ZappoMan
fdc5aa1da5
include urls with texture names, make sure to wait till default textures loaded before setting new textures
2014-11-07 09:54:13 -08:00
ZappoMan
c48d79ad8b
add gettable feature which lists texture names
2014-11-07 09:05:47 -08:00
Ryan Huffman
feaf5678bb
Add grid tools to entity edit tools
2014-11-06 15:00:39 -08:00
Stojce Slavkovski
06da1bd566
add checkbox support in scripting interface
2014-11-06 20:41:08 +01:00
DaveDubUK
7a1f7bd418
Update to walk.js v 1.1
...
Revised code structure (see /libraries for new files), walk animation
completely overhauled (now using geometric wave generators, Fourier
synthesis and Butterworth LP filtering for selected motion curve
construction), redesigned sidestepping animations, tweaked flying
animations, decreased maximum walk speed in Interface to more natural
human value, improved Hydra support, added support for Leap motion,
animation file sizes optimised, cleared out code used to work around now
fixed bugs, lots of minor tweaks and improvements. walk.js is now under
100,000 characters, but I had to use tabs instead of 4 spaces to get it
below the threshold.
2014-11-05 20:11:11 +00:00
Philip Rosedale
6b8476a87f
Merge pull request #3734 from birarda/lobby
...
bubble up a PickRay with action event, camera cleanup
2014-11-04 12:03:29 -08:00
Stephen Birarda
303e8f6da9
more js changes for changes to camera interface
2014-11-04 10:41:36 -08:00
Ryan Huffman
fc977e21e6
Remove print statements
2014-11-04 09:14:14 -08:00
Ryan Huffman
a3fa1e4ce8
Merge branch 'master' of github.com:highfidelity/hifi into inspect-tool
2014-11-04 08:32:58 -08:00
Ryan Huffman
185b9ac545
Add Inspect tool to newEditEntities
2014-11-04 08:32:21 -08:00
Ryan Huffman
640c2c5fbf
Add optional orientation easing to entity camera
2014-11-04 08:30:10 -08:00
ZappoMan
49a389618e
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents
2014-11-03 10:54:19 -08:00
ZappoMan
a5088eece6
first cut at running scripts from entities
2014-10-31 14:03:30 -07:00
Ryan Huffman
7ccacbd8ac
Remove old entity selection code and fix rotation bug
2014-10-30 14:57:23 -07:00
Ryan Huffman
55fdbfec1f
Disable edit camera tools
2014-10-30 14:43:35 -07:00
AndrewMeadows
4cf77d1c6c
Merge pull request #3702 from ZappoMan/lockAndMaterialProperties
...
Lock and textures properties
2014-10-30 11:35:38 -07:00
Ryan Huffman
87a17f869f
Update edit camera controls to hide cursor
2014-10-30 11:25:39 -07:00
ZappoMan
95c5b417c9
texture support in model entities
2014-10-30 11:04:19 -07:00
ZappoMan
c650cabb5d
support for locked property, some plumbing for textures property
2014-10-30 10:05:20 -07:00
Brad Hefta-Gaub
caecf473ff
Merge pull request #3678 from huffman/entity-tool-fixes
...
Entity tool updates and fixes
2014-10-28 15:24:21 -07:00
Ryan Huffman
bdfdeecc46
Fix bug with entity selection shadow
2014-10-28 13:45:31 -07:00
Ryan Huffman
af103b22ff
Remove extra print statements and whitespace
2014-10-28 13:42:40 -07:00
Ryan Huffman
76c3e9f483
Add support for undoing duplication and deletion commands
2014-10-28 13:42:02 -07:00
Ryan Huffman
68f51d2484
Add entity tool support for unkown entity ids
2014-10-28 13:39:41 -07:00
Ryan Huffman
8f53e1731b
Add selectionManager.setSelections and hasSelection
2014-10-28 12:40:44 -07:00
ZappoMan
c3cd733c2f
tweaks to edits for lights
2014-10-28 12:40:17 -07:00
Ryan Huffman
e21bf78d04
Remove cancel tool functionality
2014-10-28 11:21:26 -07:00
ZappoMan
7d2ef7923b
Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2
2014-10-28 10:50:02 -07:00
Ryan Huffman
21b6a93fef
Add entity tool for movement using arrow keys
2014-10-28 10:12:17 -07:00
