Commit Graph

71 Commits

Author SHA1 Message Date
OceanSlim
8b901504ab small changes 2023-03-17 22:36:33 -04:00
OceanSlim
f16c738928 small changes 2023-02-27 21:48:32 -05:00
tonyomendoza
45397922df Fixed a pickup bug and a pivot bug 2023-02-15 00:17:26 -08:00
tonyomendoza
dd73eb820f Rotation fix for stack count and title for item prefabs 2023-02-14 03:55:20 -08:00
tonyomendoza
f1453a6f99 Fixed bug with Storage Window: click through 2023-02-13 14:15:10 -08:00
OceanSlim
4c8a95dadc Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git 2023-02-10 16:25:33 -05:00
OceanSlim
c14d55985e Added Titles to all current Item UIs, Added Armor Plates, Added Armor Resource Prefab 2023-02-10 16:23:23 -05:00
tonyomendoza
c8c99dc93c Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git
updating from master, merging
2023-02-09 03:54:17 -08:00
tonyomendoza
88f8ede129 Quick Move feature improved 2023-02-09 03:53:30 -08:00
OceanSlim
7077b8a6e1 Added all new backpacks 2023-02-07 22:11:30 -05:00
tonyomendoza
42eab26a67 Fixed Tactical rig pouch issues + body armor slot 2023-02-07 05:11:46 -08:00
tonyomendoza
cf203a4d8f Inventory fix and fixed item stacking bug 2023-02-03 17:42:50 -08:00
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
c248c35dfd continuing bug fixes for Inventory.cs, before directory fix 2023-01-30 18:14:38 -08:00
tonyomendoza
8c20d5c8bf continuing bug fixes for Inventory.cs, before directory fix 2023-01-30 18:12:08 -08:00
tonyomendoza
ee5865c4f9 resolving merge conflict' 2023-01-29 21:20:35 -08:00
OceanSlim
d2c4390ace fixed convex setting on all items and adjusted my test scene with itemsi in the map. Adjusted Border. Added a stacktext ui and added the prefab to all stacked items for easier management of stack ui changes. 2023-01-30 00:06:47 -05:00
OceanSlim
3e0ac77ed4 Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git 2023-01-29 21:09:04 -05: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
483bd34e2e More fixing for pick-up 2023-01-29 12:36:11 -08:00
tonyomendoza
6e13c5dd08 Drop item onto storage container 2023-01-26 18:16:31 -08:00
tonyomendoza
8a6fdd6156 resolving merge conflict 2023-01-25 16:12:22 -08:00
tonyomendoza
31369eff0b resolving merge conflict 2023-01-25 16:11:29 -08:00
OceanSlim
4f4efc8cd0 fix scene 2023-01-25 19:01:19 -05:00
tonyomendoza
d275151c41 re-adding scene 2023-01-25 15:33:45 -08:00
OceanSlim
c5309cbfc7 fix scene 2023-01-25 18:19:57 -05:00
OceanSlim
d4075eccc4 resolving merge 2023-01-25 17:06:01 -05: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
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
OceanSlim
8e19274ec3 various fixes to new items added a few more new items 2023-01-21 22:48:18 -05: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
OceanSlim
66c43bfa71 added new Item Icon Script Scene 2023-01-15 21:41:12 -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
OceanSlim
6f2ea44cba Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git 2023-01-12 12:11:50 -05:00
OceanSlim
d5615a74f1 added armor plates to items and fixed a few other things 2023-01-12 12:10:54 -05:00
tonyomendoza
e596cb5983 Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git 2023-01-08 00:54:39 -08:00
tonyomendoza
6e0a0b64ef Attempting to resolve merge conflicts 2023-01-08 00:54:25 -08:00
OceanSlim
bd3f992782 changed transform of pouches in photoshoot to take a better screenshot of the item, changed output to correct directory, added pngs for all med pouch sizes in the grids folder 2023-01-06 22:21:40 -05:00
tonyomendoza
669cb7fb44 preventing a conflict 2023-01-04 18:11:52 -08:00
OceanSlim
29943ecff3 Reorganized root directory, trimmed unnecesary files and folders 2023-01-04 21:10:21 -05:00
tonyomendoza
d7947c11ac Resolving merge 2022-12-22 23:56:14 -08:00