Commit Graph

74 Commits

Author SHA1 Message Date
0ceanSlim
939b21ecd2 AAAModularSoldierPack moved out of repo to my local temp folder 2023-10-15 21:42:47 -04:00
0ceanSlim
052cdbadd6 transferred most of scratch sheet to README 2023-09-02 14:47:53 -04:00
0ceanSlim
0f1ea26d5b added readme, started organizing thoughts on markdown 2023-09-02 00:06:43 -04:00
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
8d46b15c3d Further prototyping for inspection window. added an example for item preview 2023-03-17 04:18:16 -07:00
tonyomendoza
eee855551a Loot container prototyping 2023-03-16 15:44:34 -07:00
tonyomendoza
8f26e24337 Initial work on Inspector 2023-03-15 04:43:15 -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
45397922df Fixed a pickup bug and a pivot bug 2023-02-15 00:17:26 -08:00
tonyomendoza
dbcd1a11e0 Another rotation update 2023-02-14 15:44:55 -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
OceanSlim
8ee555dc27 fix merge 2023-01-30 00:15:27 -05: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
tonyomendoza
595c5c4b22 [200~ 2023-01-29 19:54:27 -08:00
tonyomendoza
05fcd17618 continuing fixes for dropping items 2023-01-29 18:35:04 -08: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
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
034fa92352 Fixing item names in photoshoot 2023-01-23 14:03:37 -08: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
9fc24ad88a Fixed photoshoot script 2023-01-22 04:10:22 -08: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