Commit Graph

62 Commits

Author SHA1 Message Date
0ceanSlim
10d74602ba moved some folders and files 2023-10-15 21:59:35 -04:00
0ceanSlim
939b21ecd2 AAAModularSoldierPack moved out of repo to my local temp folder 2023-10-15 21:42:47 -04:00
0ceanSlim
37f8252ae4 removed some empty folders 2023-10-15 21:30:11 -04:00
0ceanSlim
f3ce31946a reworked weapons/parts dir in items assets 2023-10-15 21:01:08 -04:00
0ceanSlim
9f659c6fd4 adding all item prefabs to new scene 2023-10-15 19:21:35 -04:00
0ceanSlim
0f1ea26d5b added readme, started organizing thoughts on markdown 2023-09-02 00:06:43 -04:00
tonyomendoza
3746d39045 Fixed merge bugs and stackables bug 2023-03-13 05:05:53 -07:00
OceanSlim
f16c738928 small changes 2023-02-27 21:48:32 -05:00
tonyomendoza
f1453a6f99 Fixed bug with Storage Window: click through 2023-02-13 14:15:10 -08: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
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
9c198f9cb7 directory organization 2023-01-30 21:49:24 -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
OceanSlim
efb7d634f7 added items forr all rigs and plate carriers in the game. 2023-01-24 22:12:57 -05:00
tonyomendoza
a743dc4df6 Fixing item names in photoshoot 2023-01-23 14:02:38 -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
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
467e6e2b15 Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git 2023-01-18 22:25:56 -05:00
OceanSlim
d4bd296c7d Various fixes from meeting 2023-01-18 22:24:33 -05:00
tonyomendoza
7fe9381d4c Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git 2023-01-18 01:47:00 -08: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
f1387fd7a9 fixing merge 2023-01-15 19:25:02 -08:00
tonyomendoza
04eaf861f7 fixing merge 2023-01-15 19:23:08 -08: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
d5615a74f1 added armor plates to items and fixed a few other things 2023-01-12 12:10:54 -05: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
tonyomendoza
575dd8e3e2 Neo FPS Update 2022-12-22 19:50:16 -08:00
OceanSlim
6ec4747260 Added Mesh, Materials, Textures and Prefabs for 4 Different types of Military Helmets, Renamed and organized some categories to further match the full items sheet. Some Items fixes 2022-12-22 20:48:11 -05:00
OceanSlim
213ac1455e Added Mesh, Materials, Textures and Prefabs for all 7.62 Ammo and Ammo Crafting 2022-12-19 15:15:08 -05:00
OceanSlim
8d9fdd2abd Added AAAModularSoldierPack in Root, Added Assets for the Item Prefabs for All 5.56 Ammo Types, Changed Body category to Gear, other various fixes 2022-12-17 17:21:31 -05:00
tonyomendoza
ac938c0ed5 commiting to switch branch 2022-12-17 02:45:11 -08:00
OceanSlim
87e762c312 Added more items while Tony was working on script 2022-12-11 23:29:12 -05:00
tonyomendoza
eba3a7e1ed Bug fixes, screenshot feature, and other feature improvements 2022-12-10 19:03:30 -08:00