Commit graph

28 commits

Author SHA1 Message Date
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
Ryan Huffman
dbb978e278 Update style and layout of entity properties window 2015-01-15 10:22:39 -08:00
Ryan Huffman
10f8e54903 Update style of properties windows 2015-01-14 15:50:42 -08:00
Andrew Meadows
f90b128ac3 use density instead of mass in scripts/UI 2015-01-14 15:48:05 -08:00
Ryan Huffman
96f75df831 Add missing model properties to entity property window 2015-01-13 10:09:05 -08:00
Ryan Huffman
8d8352946b Add rescale button to edit properties window 2015-01-09 10:01:58 -08:00
Ryan Huffman
fbdc509428 Increase size of url input boxes 2015-01-07 12:15:14 -08:00
Ryan Huffman
a0cb40597b Remove gridControls.html 2014-12-30 11:31:47 -08:00
Ryan Huffman
a9223f5887 Remove text from label 2014-12-12 15:45:31 -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
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
e5aee44ceb Add setting save/load to grid tool 2014-12-09 08:51:04 -08: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
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
Ryan Huffman
1950ce5a4b Add option for white grid color 2014-12-01 12:24:24 -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
Ryan Huffman
1706faf2da Fix animationIsPlaying not showing correctly in properties tool window 2014-11-19 11:20:47 -08:00
Ryan Huffman
10008cb41f Fix snapToGrid checkbox not working 2014-11-18 10:27:26 -08:00
Ryan Huffman
c39bd362b7 Fix grid controls not updateable 2014-11-18 09:52:00 -08:00
ZappoMan
a37275e6b1 fix animation frame 2014-11-14 21:17:13 -08:00
ZappoMan
0cb95fc82a add support for text properties to new html propety tools 2014-11-14 17:20:05 -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
Ryan Huffman
b04fd89e4f Update grid tool html location 2014-11-11 09:55:30 -08:00