Commit Graph

658 Commits

Author SHA1 Message Date
kilbith
fab1a56f32 Better UV-maps for wall lamp 2015-05-03 12:22:49 -04:00
kilbith
358d606e0e Better UV-maps for lanterns 2015-05-02 15:59:05 +02:00
Vanessa Ezekowitz
a5094f481a consense preview display and skin-set code into loops 2015-05-01 12:13:10 -04:00
kilbith
b3a7a3bb73 Enhanced wardrobe formspec 2015-05-01 11:28:06 -04:00
kilbith
fa9d73201c Fix params (again) 2015-05-01 00:12:21 +02:00
kilbith
add43c9529 More cleanup/tweaking 2015-04-30 09:53:44 -04:00
kilbith
3eb9d192d0 Params fix 2015-04-30 00:24:47 +02:00
kilbith
4dee35893a Cleaning and tweaking node params 2015-04-29 16:58:33 +02:00
kilbith
9a92d09421 Disable shower flowing for everyone 2015-04-29 09:18:38 +02:00
Vanessa Ezekowitz
07ced77591 add a second type of gold for future use 2015-04-28 16:56:44 -04:00
Vanessa Ezekowitz
927a9f4155 add ironing board 2015-04-28 15:29:49 -04:00
Vanessa Ezekowitz
994849de7e Make shower tray turn off the showerhead above it when removed. 2015-04-28 14:44:48 -04:00
Vanessa Ezekowitz
1e3c27e984 fix sounds not shutting off (and crash) when they should 2015-04-28 14:22:51 -04:00
Vanessa Ezekowitz
c074e47bcd fix bug in showerhead spawners
(if two or more running at the same time, only the last could be turned off)
2015-04-28 14:13:43 -04:00
Vanessa Ezekowitz
960dd57f7b fix sel/coll box on lamp 2015-04-28 12:31:03 -04:00
kilbith
a574bb8591 Add tabletop-style oil lamp 2015-04-28 11:58:47 -04:00
Vanessa Ezekowitz
79559e41a6 revise wrought iron door
(gave it a custom model so that the ironwork doesn't look double-sided)
2015-04-28 11:46:51 -04:00
jp
eec2ffcc56 Add Shower Head water flow 2015-04-28 16:46:27 +02:00
Vanessa Ezekowitz
ccae9ac714 another obsolete texture 2015-04-28 01:34:51 -04:00
Vanessa Ezekowitz
9af478327f delete obsolete texture 2015-04-28 01:34:07 -04:00
Vanessa Ezekowitz
77d36352fc split showerhead into two materials 2015-04-28 01:32:24 -04:00
Vanessa Ezekowitz
84d27b9b5b deleted obsolete texture 2015-04-28 01:15:44 -04:00
Vanessa Ezekowitz
f800c4830d split analog clock into multiple materials
also tweak the shape of the front a bit
2015-04-28 01:12:37 -04:00
Vanessa Ezekowitz
084c82f4ce split 4-bottle model into separate materials
(obsoletes the "4/multi" model)
2015-04-28 00:26:54 -04:00
Vanessa Ezekowitz
aaf25a97e4 split globe model into multiple materials
(allows use of some generic materials)
renamed earth image
2015-04-28 00:12:46 -04:00
Vanessa Ezekowitz
a35b57d713 rename most wood, metal, etc textures
to bring them all together into one "category" instead of being scattered across the directory
also combine a couple dupes.
2015-04-27 23:48:02 -04:00
Vanessa Ezekowitz
f8fc0bbad6 All new brass and wrought iron inventory images (and a few in-world
images), using the new textures.
2015-04-27 20:52:54 -04:00
Vanessa Ezekowitz
a0bf61cfa7 do the same for wrought iron 2015-04-27 19:00:35 -04:00
Vanessa Ezekowitz
a346bf5803 rework brass texture(s) and usage thereof 2015-04-27 18:35:14 -04:00
Vanessa Ezekowitz
0323ba021b add brass-themed version of bathroom taps
remame inv/wield image for steel one
2015-04-27 17:09:50 -04:00
Vanessa Ezekowitz
57d6fb423c add wield image, make faucet non-walkable 2015-04-27 16:53:22 -04:00
Vanessa Ezekowitz
b6c6ea8395 new inventory image for same 2015-04-27 16:45:35 -04:00
Vanessa Ezekowitz
50b48c3265 use mesh node for former "3dforniture" bathroom taps/faucet 2015-04-27 16:42:20 -04:00
Vanessa Ezekowitz
94de9e2d95 tweak banister description 2015-04-27 13:13:10 -04:00
Vanessa Ezekowitz
9149b5e572 add inventory images for banisters 2015-04-27 03:23:15 -04:00
Vanessa Ezekowitz
c8633be1dc add banisters, placed on side of blocks
when placing, code will try to determine if the bannister should be
left- or right-sided.  Defaults to left-sided; hold shift while placing
to force right-sided.
2015-04-27 03:09:37 -04:00
Vanessa Ezekowitz
7f7ba92bc8 use mesh node for cd/dvd cabinet 2015-04-26 23:23:45 -04:00
Vanessa Ezekowitz
72e58b0158 use mesh node for chimney 2015-04-26 22:52:11 -04:00
Vanessa Ezekowitz
31bc60f055 use mesh node for filing cabinet 2015-04-26 22:25:18 -04:00
Vanessa Ezekowitz
a75c55cfc3 join desk model's objects into one 2015-04-26 22:07:22 -04:00
Vanessa Ezekowitz
020754d13a redraw wine-rack, simplify the bottle meshes used therein
(cuts the number of tris down from >7k to 4.6k)
better UV maps/materials use
2015-04-26 21:57:56 -04:00
Vanessa Ezekowitz
a6d05f451b rework window shutter UV map, simplified the textures 2015-04-26 19:11:26 -04:00
Vanessa Ezekowitz
4ac7b55d2f add generic gold tile, use it for trophy
tweak trophy UV map to use more of it.
2015-04-26 18:51:22 -04:00
Vanessa Ezekowitz
5013be4c09 better UV mapping on toilet paper and paper towels
added better imagery
moved toilet paper to bathroom_sanitation.lua
2015-04-26 18:02:47 -04:00
Vanessa Ezekowitz
d645b5ade5 rework UV map + texture for kitchen sink 2015-04-26 16:41:55 -04:00
Vanessa Ezekowitz
14a5f4c411 tweak speakers' UV maps a bit 2015-04-26 16:24:05 -04:00
Vanessa Ezekowitz
a820c7ffb2 better UV maps for speakers, tweaks to related textures 2015-04-26 15:32:13 -04:00
jeanpatrick.guerrero@gmail.com
95c89f7cfd Randomly receive a phone call 2015-04-26 13:36:21 -04:00
jp
ff6073664d Beds : use default sleeping function and adjust s/c_box 2015-04-26 10:37:50 +02:00
Vanessa Ezekowitz
f1428f7be7 *really* fix glass/wood oak door aliases 2015-04-25 10:42:19 -04:00
Vanessa Ezekowitz
bb24ffb3ee fix broken aliases for wood/glass oak colored door 2015-04-25 10:18:46 -04:00
Vanessa Ezekowitz
aadbe21841 remove right-opening doors from creative inv 2015-04-25 10:15:43 -04:00
Vanessa Ezekowitz
9ccb6b5188 use mesh nodes for all doors
and for Japanese walls

makes it somewhat easier to add new door types
far fewer textures as well.
2015-04-25 03:13:47 -04:00
Vanessa Ezekowitz
b90c03cd8e added recipes to craft king bed from two twins 2015-04-22 04:54:40 -04:00
Vanessa Ezekowitz
67d4da05f6 make king size placement work right-first as well as left-first 2015-04-22 04:50:49 -04:00
Vanessa Ezekowitz
029611417e use inventory image for ceiling lamp 2015-04-22 04:41:15 -04:00
Vanessa Ezekowitz
8597b39122 take "off" ceiling lamp out of creative inv 2015-04-22 04:37:18 -04:00
Vanessa Ezekowitz
12cc9da08c allow shift-dig a king size bed to get the two twin beds back 2015-04-22 04:34:51 -04:00
Vanessa Ezekowitz
4b411d0466 add brass and wrought-iron candlesticks 2015-04-22 01:31:07 -04:00
Vanessa Ezekowitz
5cb73ffa7e Add king-sized bed model
create it by placing two twins of the same color side by side, left first

also moved the bed extension functions into handlers/expansion.lua,
renamed them, and made a few other minor tweaks to that file accordingly.
2015-04-22 00:43:22 -04:00
Vanessa Ezekowitz
8b924be206 add hanging-from-chain ceiling lamp 2015-04-21 21:33:06 -04:00
Vanessa Ezekowitz
09c560cfe5 reduce the depth of the bevel on the edges of the bed 2015-04-21 18:29:04 -04:00
Vanessa Ezekowitz
dab2e9a5f2 better UV maps for picture frames
higher-quality imagery
2015-04-21 17:58:50 -04:00
Vanessa Ezekowitz
814d43f541 do similar for marble 2015-04-18 17:15:22 -04:00
Vanessa Ezekowitz
5de0fc7538 use mesh nodes for former-3dforniture toilets 2015-04-18 04:25:00 -04:00
jp
877e6f3607 Better invo images for candles 2015-04-17 12:47:21 -04:00
Vanessa Ezekowitz
e60562d58b use mesh node for former 3dforniture bathroom sink 2015-04-17 12:45:14 -04:00
Vanessa Ezekowitz
e71bbdc0ef better mesh/UV mapping for openframe bookshelf 2015-04-17 09:28:41 -04:00
Vanessa Ezekowitz
c2575df10c fix collision box on oil lamp 2015-04-17 06:11:05 -04:00
Vanessa Ezekowitz
52ef3e9099 use mesh node for oil lamp
also turn the light level up one step
2015-04-17 02:47:55 -04:00
Vanessa Ezekowitz
c6dd69769e use mesh node for coffee maker 2015-04-16 23:39:18 -04:00
Vanessa Ezekowitz
8e5197af58 use mesh node for calendar 2015-04-16 05:23:08 -04:00
Vanessa Ezekowitz
dcde7c9d6a the complex selection box doesn't look good
went back to a single select box covering the entire model
kept the equivalent collision box
2015-04-15 19:15:12 -04:00
Vanessa Ezekowitz
b2815ea683 new inv img for coatrack 2015-04-15 18:59:44 -04:00
Vanessa Ezekowitz
414364d0ca better selectbox for coatrack 2015-04-15 18:58:33 -04:00
Vanessa Ezekowitz
9767b5d5f8 use mesh node for coat rack/tree 2015-04-15 18:41:22 -04:00
Vanessa Ezekowitz
20b8a8f875 use the existing copy of old default wood
called "generic wood".
(gets rid of the redundant copy I added as "old wood")
2015-04-15 18:16:25 -04:00
Vanessa Ezekowitz
12c40f75a2 just use one texture entry for simple bench 2015-04-15 16:36:10 -04:00
Vanessa Ezekowitz
2755a39403 fix bad ref to bench img 2015-04-15 15:48:31 -04:00
Vanessa Ezekowitz
f5fd1b173d new inventory images for large benches 2015-04-15 15:33:53 -04:00
Vanessa Ezekowitz
fa2498d8fd use mesh node for large style-2 bench 2015-04-15 15:28:52 -04:00
jp
69bc9c374c Switch Garden Bench 1 to mesh 2015-04-15 12:40:47 -04:00
Vanessa Ezekowitz
905366ed38 add inventory image for sport bench 2015-04-15 03:04:29 -04:00
Vanessa Ezekowitz
800fff3a02 use mesh node for sport bench 2015-04-15 03:01:48 -04:00
Vanessa Ezekowitz
d6a86d736a use mesh nodes for kitchen chairs
also fix their selectboxes
2015-04-15 01:52:30 -04:00
Vanessa Ezekowitz
3506ede1f5 use mesh node for radiator 2015-04-14 22:44:37 -04:00
Vanessa Ezekowitz
57fe4a3152 tweak trophy model 2015-04-14 17:32:24 -04:00
Vanessa Ezekowitz
5882c95774 fix selection box on trophy 2015-04-14 17:14:02 -04:00
Vanessa Ezekowitz
69f7fea406 use mesh node for trophy, modified recipe to fit the look of the new model 2015-04-14 16:53:45 -04:00
Vanessa Ezekowitz
ca4b20505a rework meshes for table and standing lamps, better use of materials
use default wool for the lamp shades

also, use ^[colorize to brighten the lampshades and lightbulbs according
to the lamp's light/brightness setting, instead of baking it into the
textures.
2015-04-14 15:34:17 -04:00
Vanessa Ezekowitz
f87c5271b1 use smooth shading on green trash cans 2015-04-14 14:12:38 -04:00
Vanessa Ezekowitz
142519e188 fix edges of wall sconce back (should be transparent) 2015-04-14 14:00:18 -04:00
Vanessa Ezekowitz
95a7699f20 use smooth shading on candles 2015-04-14 13:44:33 -04:00
Vanessa Ezekowitz
79b5c94f6c add wall sconce 2015-04-14 13:42:22 -04:00
Vanessa Ezekowitz
8e1dd5f268 use mesh nodes for candles 2015-04-14 11:58:05 -04:00
Vanessa Ezekowitz
71c9d2218b fix normals on deckchair seat area 2015-04-14 10:58:29 -04:00
Vanessa Ezekowitz
0e317a3460 make deckchair white, add variant for blue stripes 2015-04-14 10:50:15 -04:00
jp
ba1167871f Switch Deck Chair to mesh 2015-04-14 10:45:07 -04:00
Vanessa Ezekowitz
64c8deb868 improved model + UV mapping + texture handling for flowerpot 2015-04-06 16:38:12 -04:00
kilbith
a0b0211427 Add glass door on Grandfather Clock 2015-04-06 16:55:56 +02:00
kilbith
bcaa25adf4 Add Wall Lamp 2015-04-04 19:51:48 +02:00
kilbith
f54c6d3645 Adjust hanging lantern position 2015-04-03 00:43:25 +02:00
kilbith
ca5d9b0d50 Disable sit for benches 2015-04-01 00:42:07 -04:00
kilbith
b01d3b2b4f Disable sitting functions (broken) 2015-04-01 00:42:07 -04:00
Vanessa Ezekowitz
677106529b Change books' description to indicate that they're writable 2015-03-31 11:43:15 -04:00
Vanessa Ezekowitz
7c9a172510 actually use the inventory image for towel rod 2015-03-31 11:42:33 -04:00
Vanessa Ezekowitz
6ce3b5acb4 adjust ground lantern Y position 2015-03-31 11:41:37 -04:00
Vanessa Ezekowitz
f39908f9fb adjust picture frame Y position 2015-03-31 11:40:57 -04:00
Vanessa Ezekowitz
15766e2537 new inventory images for books 2015-03-31 11:39:22 -04:00
Vanessa Ezekowitz
4a7d89f948 new inventory images for mailbox, copper pans, towel rod 2015-03-31 11:37:34 -04:00
Vanessa Ezekowitz
18020fccd0 fix extra "ghost" model in towel rod
also get rid of redundant .mtl files
2015-03-31 11:30:09 -04:00
Vanessa Ezekowitz
885e838b57 use mesh node for towel on rod 2015-03-31 02:12:42 -04:00
Vanessa Ezekowitz
9bc7f5c5ba use mesh nodes for former-"3dforniture" armchairs 2015-03-31 01:04:27 -04:00
Vanessa Ezekowitz
74951e6b5e use mesh nodes for copper pans 2015-03-30 21:52:26 -04:00
Vanessa Ezekowitz
e662bb36b9 use mesh node for grandfather clock 2015-03-30 21:06:07 -04:00
Vanessa Ezekowitz
38318ef82b new telephone inv img 2015-03-30 17:45:54 -04:00
Vanessa Ezekowitz
ca911dbc71 use mesh node for phone 2015-03-30 17:37:23 -04:00
Vanessa Ezekowitz
b28e3eea40 new inventory image for former-"3dforniture" chains 2015-03-30 15:06:07 -04:00
Vanessa Ezekowitz
f565fb666a use mesh node for former-"3dforniture" torch 2015-03-30 14:59:39 -04:00
Vanessa Ezekowitz
a33b296b09 use mesh node for tool cabinet 2015-03-30 03:42:33 -04:00
Vanessa Ezekowitz
e105fad1d4 use mesh nodes for beds 2015-03-29 23:26:59 -04:00
Vanessa Ezekowitz
2ed516a9f6 replace wardrobe with mesh node 2015-03-29 20:59:47 -04:00
Vanessa Ezekowitz
f8a071aa4b use mesh node for forniture chains, model by kilbith 2015-03-29 20:12:58 -04:00
kilbith
58f64d265f Add green Trash Can 2015-03-29 16:45:08 +02:00
kilbith
f580f26124 Add Ceiling Lantern 2015-03-29 10:42:27 -04:00
kilbith
6f33c9ff0c Afterward tweaking 2015-03-29 13:13:17 +02:00
Vanessa Ezekowitz
0f0942d08c use mesh node for barbecue 2015-03-29 02:53:23 -04:00
Vanessa Ezekowitz
a8a052bde3 use mesh nodes for windowblinds 2015-03-29 01:48:10 -04:00
Vanessa Ezekowitz
4ffc39e91f use mesh node for kitchen faucet 2015-03-29 00:09:49 -04:00
Vanessa Ezekowitz
28cf1e4276 add bathroom sundries set
model by jp, textures and tweaks by me
2015-03-28 22:42:53 -04:00
kilbith
73aa4b2614 Switch Shower Head and Skateboard to mesh
with changes by VanessaE
2015-03-28 16:11:08 -04:00
Vanessa Ezekowitz
ad74a7257e punch the large speaker to take its cover off or put it on 2015-03-28 00:03:49 -04:00
Vanessa Ezekowitz
e64f69ec8c fix broken small-speaker selectbox 2015-03-28 00:01:15 -04:00
Vanessa Ezekowitz
65aa834821 add "open front" version of large speaker 2015-03-28 00:00:23 -04:00
Vanessa Ezekowitz
e377f2af6d use mesh nodes for speakers 2015-03-27 22:55:41 -04:00
kilbith
6385013037 Update piano textures and recipe 2015-03-26 13:46:38 +01:00
Vanessa Ezekowitz
1f040f131a fix missing locked fridge aliases 2015-03-24 19:28:42 -04:00
Vanessa Ezekowitz
1796cf8bba swap out old _base, _bottom, _left, etc nodenames in crafts
i.e. for all of the two-part nodes that have recently been converted
into single-part meshes and given new node names (with aliases).
2015-03-23 03:42:23 -04:00
Vanessa Ezekowitz
a89456e925 change recipe for pool table to use hardwood blocks and slabs 2015-03-23 03:20:26 -04:00
Vanessa Ezekowitz
2c320c7927 git inventory to tool cabinet 2015-03-23 02:31:24 -04:00
Vanessa Ezekowitz
64451a6abf add recipe for tool cabinet 2015-03-23 02:29:09 -04:00
Vanessa Ezekowitz
8b806bf082 if technic isn't installed, define its granite node (as a building
material only) and make it from 5 tar + 4 marble (both from
building_blocks).

If moreblocks is installed (and technic isn't), this node is routed
through the stairsplus component, and a recipe is added that uses
moreblocks' own tar node also.
2015-03-23 02:09:39 -04:00
Vanessa Ezekowitz
311b1ea4c5 add craft recipe for globe 2015-03-23 01:52:44 -04:00
Vanessa Ezekowitz
06a67cc49d give desk inventory (24 slots) 2015-03-23 01:44:27 -04:00
Vanessa Ezekowitz
2e3901d6cd use mesh node for pool table 2015-03-23 01:25:13 -04:00
Vanessa Ezekowitz
fe10b8ae83 fix wrong well base alias 2015-03-22 13:42:42 -04:00
Vanessa Ezekowitz
cdc9f21c3c rename piano left -> piano, add alias 2015-03-22 07:17:13 -04:00
Vanessa Ezekowitz
7274c7ab1c fix missing desk inv image 2015-03-22 01:38:42 -04:00
Vanessa Ezekowitz
b5f41930ab use mesh node for piano 2015-03-22 01:36:56 -04:00
Vanessa Ezekowitz
171ef498a2 use mesh node for desk 2015-03-21 22:51:51 -04:00