Commit Graph

20 Commits

Author SHA1 Message Date
tonyomendoza
0c0f5c7196 merge conflict resolution 2023-03-20 18:44:57 -07:00
OceanSlim
ccd9ea7403 merge conflict 2023-03-20 21:39:51 -04:00
OceanSlim
8b901504ab small changes 2023-03-17 22:36:33 -04:00
tonyomendoza
2cbb17aa85 Fixed placement issue for player stats 2023-03-17 13:28:02 -07:00
tonyomendoza
f2ccb40938 Responsive window resizing and storage container fix 2023-03-14 04:59:41 -07:00
tonyomendoza
3746d39045 Fixed merge bugs and stackables bug 2023-03-13 05:05:53 -07:00
tonyomendoza
1d0ed5e2cb Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git 2023-03-13 03:30:36 -07:00
tonyomendoza
462de9c1cd Added PouchCapacity, reworked nested items feature 2023-03-13 03:25:15 -07:00
tonyomendoza
d6b6fffe9a Title prefab and slot pouch count fix 2023-03-08 05:21:25 -08:00
OceanSlim
f16c738928 small changes 2023-02-27 21:48:32 -05:00
tonyomendoza
88f8ede129 Quick Move feature improved 2023-02-09 03:53:30 -08: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
tonyomendoza
8c20d5c8bf continuing bug fixes for Inventory.cs, before directory fix 2023-01-30 18:12:08 -08:00
tonyomendoza
6e13c5dd08 Drop item onto storage container 2023-01-26 18:16:31 -08:00
tonyomendoza
481bd7339b Pick up and drop down fix + pause fix 2023-01-24 23:14:16 -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
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
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
29943ecff3 Reorganized root directory, trimmed unnecesary files and folders 2023-01-04 21:10:21 -05:00