Commit Graph

25 Commits

Author SHA1 Message Date
OceanSlim
3c0efeb34b Added Display Names to all items 2023-02-01 21:58:50 -05:00
OceanSlim
09c341f793 Added Multiple Medicine Items and created Prefabs for the Items and their UIs 2023-02-01 16:16:31 -05:00
OceanSlim
5840a317b0 backup 2023-01-30 21:24:07 -05:00
tonyomendoza
8c20d5c8bf continuing bug fixes for Inventory.cs, before directory fix 2023-01-30 18:12:08 -08:00
tonyomendoza
595c5c4b22 [200~ 2023-01-29 19:54:27 -08:00
OceanSlim
71c03bf530 adjusted pickup locations and ranges for most items in the game at the moment. 2023-01-29 21:08:41 -05:00
tonyomendoza
6e13c5dd08 Drop item onto storage container 2023-01-26 18:16:31 -08:00
tonyomendoza
d275151c41 re-adding scene 2023-01-25 15:33:45 -08:00
tonyomendoza
ba23a62cbd Attempting to resolve merge conflicts 2023-01-24 23:14:55 -08:00
tonyomendoza
481bd7339b Pick up and drop down fix + pause fix 2023-01-24 23:14:16 -08:00
OceanSlim
efb7d634f7 added items forr all rigs and plate carriers in the game. 2023-01-24 22:12:57 -05:00
tonyomendoza
02ecb57a41 Fixing item names in photoshoot 2023-01-23 14:00:18 -08:00
OceanSlim
8a11cd93ef added borders and adjusted border ui in all items, added gunpowder and fixed all items added recently 2023-01-23 11:39:18 -05:00
tonyomendoza
9980dd0497 resolving merg conflict 2023-01-21 21:17:30 -08:00
OceanSlim
8e19274ec3 various fixes to new items added a few more new items 2023-01-21 22:48:18 -05:00
tonyomendoza
e4b9fcdf1f Added Border prefab for ItemUI prefabs 2023-01-21 16:42:59 -08:00
OceanSlim
9fc1aa08ce implemented a vast number of item uis . About 70% of all current models in the items folder now have UIs with MOST information filled in. 2023-01-21 01:02:58 -05:00
OceanSlim
780fc2559a fixed ignore item size for equipment, added item UIs for all current ammo and ammo crafting, fixed tactical rig prefabs, add more empty grid prefab sizes 2023-01-19 20:45:41 -05:00
OceanSlim
d4bd296c7d Various fixes from meeting 2023-01-18 22:24:33 -05:00
OceanSlim
424578e1a2 Started assembeling item prefabs with pick up scripts and item ui in the items prefabs folder. Starting setting up item ui for various items.Various fixes 2023-01-17 23:08:26 -05:00
tonyomendoza
a05e080ecb Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git 2023-01-15 03:40:13 -08:00
tonyomendoza
9de7b71cf4 player loot box and other bug fixes 2023-01-15 03:39:47 -08:00
OceanSlim
fdc6a8405a adjusted a few settings and played around with the photoshoot scene a little 2023-01-14 11:47:24 -05:00
tonyomendoza
6e0a0b64ef Attempting to resolve merge conflicts 2023-01-08 00:54:25 -08:00
OceanSlim
29943ecff3 Reorganized root directory, trimmed unnecesary files and folders 2023-01-04 21:10:21 -05:00