Commit Graph

224 Commits (25e9a4bf37a3cfa8ed76d9ad81db6e5988cd7c11)

Author SHA1 Message Date
benrob0329 2d1aadf351 Warehouse: Seperate Light From Light Ray, Fix Up Models A Bit 2020-02-02 19:39:36 -05:00
benrob0329 10cd9da884 Fix Music 2020-02-01 23:55:56 -05:00
Benrob0329 01a4c50eae Move mods/util/overrides/table.lua tests to mods/util/tests.lua 2020-02-01 19:48:48 -05:00
Benrob0329 6e44b93cd1 Fix Mapgen Regression 2020-02-01 19:31:23 -05:00
Benrob0329 d5778ca58e Small Fixes, mostly testing out an editor 2020-02-01 03:32:53 -05:00
benrob0329 c6d360109e Run Formatter 2020-01-31 01:06:29 -05:00
benrob0329 36b5c6b856 Remove Uneeded Function 2020-01-31 01:04:57 -05:00
benrob0329 619f8ebac9 Move Source Media Files Into "src" Directory 2020-01-31 01:03:58 -05:00
benrob0329 15266ca522 Recompress Music FIles 2020-01-31 01:01:39 -05:00
benrob0329 ea81f2afb1 Showroom: Combine Schematic Functions 2020-01-31 00:48:07 -05:00
benrob0329 aeec20e592 Showroom: Add Inner Walls 2020-01-31 00:16:44 -05:00
benrob0329 150a497359 Mapgen: Add Inner-Edge Detection
Showroom: Add Inner-Edge Opening Logic
2020-01-30 23:12:10 -05:00
benrob0329 fb26f15e27 Improve Showroom Walls, Round 1 2020-01-30 21:35:08 -05:00
benrob0329 aa45537794 Tweak Showroom, Fix Mapgen Regression 2020-01-30 20:33:38 -05:00
benrob0329 ff0c343be7 Fix Call to bound_perlin() 2020-01-30 18:38:41 -05:00
benrob0329 422553cf18 Add Showroom Walls 2020-01-30 18:16:06 -05:00
benrob0329 2306a14c2a Add Showroom Furniture 2020-01-29 20:19:13 -05:00
benrob0329 144f21862c Add util.bound_perlin() and apply to code 2020-01-28 23:21:47 -05:00
benrob0329 ebaa5c4b9a Add Hemnes Nightstand 2020-01-25 01:21:02 -05:00
benrob0329 28cc3042a9 Add Malm Bed 2020-01-25 00:49:54 -05:00
benrob0329 700f08e420 Add Svenbertil Chair 2020-01-25 00:03:38 -05:00
benrob0329 45332ffd3a Fix some small model issues, re-export Lisabo UV 2020-01-24 00:37:20 -05:00
benrob0329 992aaeeeb3 Add Lisabo Table 2020-01-24 00:31:02 -05:00
benrob0329 64a535c662 Add Listerby Table 2020-01-23 21:59:57 -05:00
benrob0329 41757e03f4 Tweaks, Update .lua-format 2020-01-21 17:53:04 -05:00
benrob0329 7b70895ea5 Refactor table.lua
Reduce Code Duplication
Make table.equals work with nested tables
Add/Improve assert() for complex functions
Add table.match to improve table.search
2020-01-17 16:33:08 -05:00
benrob0329 206c3df3d4 Clean up, run formatter. 2020-01-15 19:19:17 -05:00
Benrob0329 8b415f83bd Apply suggestion to mods/ikea/api/register.lua 2020-01-13 19:20:52 +00:00
benrob0329 fe57a86379 Fix boxes, tweak variable names 2020-01-12 23:48:32 -05:00
benrob0329 c1b4c36a78 Add Landskrona Sofa 2020-01-12 21:28:59 -05:00
benrob0329 5058a74b3a Redo Furniture Registration API 2020-01-12 20:53:19 -05:00
benrob0329 201bfff70c Add table.search 2020-01-12 20:52:07 -05:00
benrob0329 dd4985ed5c Make modpath + dofile combo consistently-ish written 2019-12-12 23:52:29 -05:00
benrob0329 6317b60dc7 Reduce API spread, disallow editing of globals outside designated areas 2019-12-12 23:36:17 -05:00
benrob0329 2a438ee9ae Remove furniture.lua, move stuff to relavent files. 2019-12-12 22:23:04 -05:00
benrob0329 9ca8753900 old_time -> was_open 2019-12-12 22:16:05 -05:00
benrob0329 fb190987ef Move all backend and API code into "ikea" mod, flatten namespaces. 2019-12-12 20:20:48 -05:00
benrob0329 3daf414e77 De-globalize uneeded stuff 2019-12-12 18:23:27 -05:00
benrob0329 b29f7c0f99 Remove uneeded functionization 2019-12-12 17:44:15 -05:00
benrob0329 767079e76a Add util mod, move and rename some functions 2019-12-12 13:39:40 -05:00
benrob0329 73d6ab4fe0 Fix Open Boxes Turning Invisible When Under A Light 2019-12-12 12:30:41 -05:00
benrob0329 00e27fc13a Reformat, take one. 2019-12-11 22:24:36 -05:00
benrob0329 cc9d18ec66 Small fixes to furniture meta 2019-12-11 17:05:08 -05:00
benrob0329 a5576ff8a1 More luacheck errors 2019-12-11 16:41:41 -05:00
benrob0329 2db0460b0f Fix Warehoue Rack Schematics 2019-12-11 16:25:08 -05:00
benrob0329 6fbbc8d0cc Make registration functions more consistent 2019-12-11 15:59:12 -05:00
benrob0329 fc262fcfab Spaces -> Tabs 2019-12-11 15:49:20 -05:00
benrob0329 2b541b16f2 Make luacheck (mostly) shut up 2019-12-10 19:22:24 -05:00
benrob0329 5ebf3df8a5 Fix Warehouse Department Corners 2019-11-18 20:39:35 -05:00
benrob0329 5103960d6f Polish Out Warehouse Schematic Logic 2019-11-18 20:24:38 -05:00
benrob0329 55a8d40833 Fix Double Border On Department Edges 2019-11-18 20:24:07 -05:00
benrob0329 de6a4fc713 Bring The Warehouse Biome Back Up To Speed
Add Showroom Floor For Testing
Fix Related-ish Issues
2019-11-18 18:05:17 -05:00
benrob0329 95165056f8 Schematic Helper Functions 2019-11-17 21:17:43 -05:00
benrob0329 7bc654f564 Clean Up Mapgen Code 2019-11-16 19:58:20 -05:00
benrob0329 871fa91d68 Initial Fully Lua-Ified Mapgen Code 2019-11-15 22:22:11 -05:00
benrob0329 8acb61b355 Add Nodes For Showroom Floor 2019-11-14 23:43:27 -05:00
benrob0329 54d9c7f9f7 Change Open/Close Times To Reflect IKEA Stores 2019-11-14 19:44:44 -05:00
benrob0329 9d7d682b30 Add Ceiling With WIP Texture
Tweak colors and light-levels
Fix warehouse lights having white-edge
2019-11-11 01:22:18 -05:00
benrob0329 97c672aa0f Fix Off Version Of Lights Still Having Beam 2019-11-11 01:20:20 -05:00
benrob0329 011f0ead31 Redo Warehouse Light Models and Textures 2019-11-10 22:16:06 -05:00
benrob0329 3eff75a1f7 Fix Rack Model UV Mapping 2019-11-04 22:45:23 -05:00
benrob0329 07b977fe32 Clerify place_rack_contents 2019-11-02 00:05:15 -04:00
benrob0329 55472557d9 Make Box and Furniture Metadata Work 2019-11-01 23:36:35 -04:00
benrob0329 dd17a26065 Move vedbo selection/collision boxes into variable 2019-10-31 21:30:52 -04:00
benrob0329 8e4eb03f08 Combine rack contents code into 4 function calls 2019-10-31 21:27:19 -04:00
benrob0329 10893afa30 Merge branches 'furniture_redo' and 'furniture_redo' of https://gitlab.com/benrob0329/ikea into furniture_redo 2019-10-31 20:44:09 -04:00
benrob0329 fda99f67dc Split table.merge Into Two Functions 2019-10-31 20:43:50 -04:00
benrob0329 24e62f01cb Fix Some VsCode Warnings 2019-10-31 20:31:39 -04:00
Benrob0329 58c4a3ff18 Apply suggestion to mods/ikea_mapgen/init.lua 2019-10-30 02:51:23 +00:00
benrob0329 a54753ffb2 Lua Mapgen-ify Rack Contents
Rewrite furniture_api
Add warehouse:rack contents to lua mapgen
2019-10-28 21:41:48 -04:00
benrob0329 c3e0e9a466 Move Function "ikea.merge" To "table.merge" 2019-09-03 18:20:09 -04:00
benrob0329 c07642f10e Lower Sound Volume 2019-08-30 01:57:35 -04:00
benrob0329 3f8ef3f5c4 mapgen: Re-Align Warehouse Aisle Lights 2019-08-30 01:48:57 -04:00
benrob0329 15b0e084f7 player: Fix "static" Group Definition 2019-08-30 01:40:31 -04:00
benrob0329 a4563697c9 ikea_furniture: Fix Opened Box Duplication 2019-08-30 01:34:06 -04:00
GreenXenith 197ca75771 Use carryable 2019-08-29 19:41:11 -07:00
GreenXenith 5246b59cd8 Merge branch 'staff' of https://gitlab.com/benrob0329/ikea into staff 2019-08-29 18:20:52 -07:00
GreenXenith ff4bba5f32 Fix/move helpers and globals, reorganize 2019-08-29 18:20:18 -07:00
benrob0329 267f6de74e player: Add Fleshy To Hand's damage_groups 2019-08-29 16:56:37 -04:00
GreenXenith b9febc9c47 Fix comment 2019-08-28 07:44:20 -07:00
benrob0329 4f16c11a2a Merge branch 'master' of https://gitlab.com/benrob0329/ikea into staff 2019-08-28 00:19:48 -04:00
GreenXenith 6465ef4396 Add SCP-3008-2 (Staff) 2019-08-27 21:06:08 -07:00
benrob0329 8a722dbec8 Warehouse Aisles Spawn Every 4 Mapblock For Staff 2019-08-27 22:51:17 -04:00
benrob0329 426b9a67d5 Fix Warehouse Racks 2019-08-27 22:34:01 -04:00
benrob0329 3d6fcf1470 mapgen: Fix Warehouse Rack Filler 2019-08-27 21:25:00 -04:00
benrob0329 ad8e953bc4 mapgen: Deepen Warehouse Shelves To 2 Nodes 2019-08-27 21:12:13 -04:00
benrob0329 03786416df mapgen: Optimize Warehouse Biome 2019-08-27 20:55:01 -04:00
Thibault Lemaire 247e971654 mapgen: Place aisles every twelve blocks 2019-08-27 15:45:44 -04:00
Benrob0329 36dafe95cb Rewrite Mapgen In Lua (Mostly), Add Row Signs In The Warehouse 2019-08-27 15:40:03 -04:00
benrob0329 d2f3998256 Update Blend File 2019-08-27 15:40:03 -04:00
benrob0329 848e01ef9c Add Rack Contents 2019-08-27 15:40:03 -04:00
benrob0329 15cfcc044f Change "group:light" to "group:ikea_light" 2019-08-27 15:40:03 -04:00
benrob0329 cdb3195e54 Change "chairs" mod to "ikea_chairs" 2019-08-27 15:40:03 -04:00
benrob0329 7087936e98 Change "warehouse" mod to "ikea_warehouse" 2019-08-27 15:40:03 -04:00
benrob0329 0e09c15f87 Move "mapgen" mod to "ikea_mapgen" 2019-08-27 15:40:03 -04:00
benrob0329 dae4992665 Move "light_api" mod to "ikea_light" 2019-08-27 15:40:03 -04:00
benrob0329 f7950d5c30 Change "furniture_api" mod to "ikea_furniture" 2019-08-27 15:40:03 -04:00
benrob0329 d18863a2c0 Change "day_night" mod to "ikea_time"
Also fixed the volume chatcommand
2019-08-27 15:40:03 -04:00
benrob0329 4e55df7238 Add "ikea" global table for IKEA-specific APIs 2019-08-27 15:40:03 -04:00
benrob0329 3bb7073c58 Move Music Hanldes To Table 2019-06-27 12:45:17 -04:00
benrob0329 e33b0ea192 Add Background Music 2019-06-27 11:39:57 -04:00
benrob0329 8053457a82 Comment light_api code 2019-06-21 19:06:25 -04:00
benrob0329 7ae31964e6 Only set player's view when the store opens or closes 2019-06-21 18:58:33 -04:00
Benrob0329 dc5bf6010c Comment day_night Code 2019-06-21 22:44:11 +00:00
benrob0329 7687b9ce1d Convert Sound To Mono For Positional Effect 2019-06-20 21:33:54 -04:00
benrob0329 c71c323eab Make light toggle be staggered 2019-06-20 21:22:23 -04:00
benrob0329 0ef7abaa63 Move Skybox Code With Day/Night Code, Change Skybox Color With Time 2019-06-20 21:14:31 -04:00
benrob0329 f6c19dc083 Add light_api, Toggle Lights At Night 2019-06-20 21:03:53 -04:00
benrob0329 f67a10971e Play Power Down Sound When It Becomes Night
Source: https://freesound.org/people/benjaminharveydesign/sounds/366092/
2019-06-20 18:26:44 -04:00
benrob0329 ec7c3d65b4 Add Initial Day/Night Cycle 2019-06-20 18:01:06 -04:00
Benrob0329 396914f094 Add Vedbo Chair 2019-06-14 19:40:03 +00:00
Benrob0329 51321dbd84 Add Collision Box To Racks
Unfortunately because of an engine bug you can fall through the top.
2019-06-13 22:26:40 +00:00
benrob0329 73b40b678f Fix Rack Collision By Adding Filler Node, Genreate Schematics 2019-06-12 20:50:08 -04:00
benrob0329 026965252d Add Collision Box To Racks
Unfortunately because of an engine bug you can fall through the top.
2019-06-12 00:29:09 -04:00
Benrob0329 0411c32e9c Add initial furniture_api code 2019-06-12 03:55:33 +00:00
benrob0329 7cc03e2382 Fix Rack Normals, Re-enable backface-culling 2019-06-11 16:41:31 -04:00
benrob0329 5af7ca93fb Add Lights, Tweak Skybox Color 2019-05-22 21:57:15 -04:00
benrob0329 9daf8c5ce2 Make Warehouse Concrete A Global Texture 2019-05-21 23:57:26 -04:00
benrob0329 560e469a1a Racks Now Spawn In Messy Rows With Lighting Bugs 2019-05-21 23:35:51 -04:00
benrob0329 3f5f262d55 Add "player" mod, make creative work for warehouse
This Mod Adds The "hand" item and heart texture
2019-05-21 19:50:23 -04:00
benrob0329 d377fbaa22 Racks now spawn in row-like patterns, although a larger schematic may be needed to make them neater 2019-05-20 23:52:35 -04:00
benrob0329 33ef7a965d Fix mapgen (thanks paramat!) 2019-05-20 21:06:33 -04:00
benrob0329 6c408cee8b Currently Broken, but making progress. 2019-05-20 19:25:44 -04:00
Benrob0329 405031f5a2 Initial Commit 2019-01-29 12:05:56 -05:00