OceanSlim/projectEli
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • ee5865c4f9 resolving merge conflict' tonyomendoza 2023-01-29 21:20:35 -0800
  • 8ee555dc27 fix merge OceanSlim 2023-01-30 00:15:27 -0500
  • 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. OceanSlim 2023-01-30 00:06:47 -0500
  • 595c5c4b22 [200~ tonyomendoza 2023-01-29 19:54:27 -0800
  • 05fcd17618 continuing fixes for dropping items tonyomendoza 2023-01-29 18:35:04 -0800
  • 3e0ac77ed4 Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git OceanSlim 2023-01-29 21:09:04 -0500
  • 71c03bf530 adjusted pickup locations and ranges for most items in the game at the moment. OceanSlim 2023-01-29 21:08:41 -0500
  • 483bd34e2e More fixing for pick-up tonyomendoza 2023-01-29 12:36:11 -0800
  • 6e13c5dd08 Drop item onto storage container tonyomendoza 2023-01-26 18:16:31 -0800
  • 8a6fdd6156 resolving merge conflict tonyomendoza 2023-01-25 16:12:22 -0800
  • 31369eff0b resolving merge conflict tonyomendoza 2023-01-25 16:11:29 -0800
  • 4f4efc8cd0 fix scene OceanSlim 2023-01-25 19:01:19 -0500
  • d275151c41 re-adding scene tonyomendoza 2023-01-25 15:33:45 -0800
  • c5309cbfc7 fix scene OceanSlim 2023-01-25 18:19:57 -0500
  • d4075eccc4 resolving merge OceanSlim 2023-01-25 17:06:01 -0500
  • ba23a62cbd Attempting to resolve merge conflicts tonyomendoza 2023-01-24 23:14:55 -0800
  • 481bd7339b Pick up and drop down fix + pause fix tonyomendoza 2023-01-24 23:14:16 -0800
  • efb7d634f7 added items forr all rigs and plate carriers in the game. OceanSlim 2023-01-24 22:12:57 -0500
  • 034fa92352 Fixing item names in photoshoot tonyomendoza 2023-01-23 14:03:37 -0800
  • a743dc4df6 Fixing item names in photoshoot tonyomendoza 2023-01-23 14:02:38 -0800
  • 02ecb57a41 Fixing item names in photoshoot tonyomendoza 2023-01-23 14:00:18 -0800
  • 8a11cd93ef added borders and adjusted border ui in all items, added gunpowder and fixed all items added recently OceanSlim 2023-01-23 11:39:18 -0500
  • 9fc24ad88a Fixed photoshoot script tonyomendoza 2023-01-22 04:10:22 -0800
  • 9980dd0497 resolving merg conflict tonyomendoza 2023-01-21 21:17:30 -0800
  • 8e19274ec3 various fixes to new items added a few more new items OceanSlim 2023-01-21 22:48:18 -0500
  • e4b9fcdf1f Added Border prefab for ItemUI prefabs tonyomendoza 2023-01-21 16:42:59 -0800
  • 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. OceanSlim 2023-01-21 01:02:58 -0500
  • 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 OceanSlim 2023-01-19 20:45:41 -0500
  • 467e6e2b15 Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git OceanSlim 2023-01-18 22:25:56 -0500
  • d4bd296c7d Various fixes from meeting OceanSlim 2023-01-18 22:24:33 -0500
  • 7fe9381d4c Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git tonyomendoza 2023-01-18 01:47:00 -0800
  • 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 OceanSlim 2023-01-17 23:08:26 -0500
  • f1387fd7a9 fixing merge tonyomendoza 2023-01-15 19:25:02 -0800
  • 04eaf861f7 fixing merge tonyomendoza 2023-01-15 19:23:08 -0800
  • 66c43bfa71 added new Item Icon Script Scene OceanSlim 2023-01-15 21:41:12 -0500
  • a05e080ecb Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git tonyomendoza 2023-01-15 03:40:13 -0800
  • 9de7b71cf4 player loot box and other bug fixes tonyomendoza 2023-01-15 03:39:47 -0800
  • fdc6a8405a adjusted a few settings and played around with the photoshoot scene a little OceanSlim 2023-01-14 11:47:24 -0500
  • 6f2ea44cba Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git OceanSlim 2023-01-12 12:11:50 -0500
  • d5615a74f1 added armor plates to items and fixed a few other things OceanSlim 2023-01-12 12:10:54 -0500
  • e596cb5983 Merge branch 'master' of http://happytavern.co/Bonobo.Git.Server/test.git tonyomendoza 2023-01-08 00:54:39 -0800
  • 6e0a0b64ef Attempting to resolve merge conflicts tonyomendoza 2023-01-08 00:54:25 -0800
  • 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 OceanSlim 2023-01-06 22:21:40 -0500
  • 669cb7fb44 preventing a conflict tonyomendoza 2023-01-04 18:11:52 -0800
  • 29943ecff3 Reorganized root directory, trimmed unnecesary files and folders OceanSlim 2023-01-04 21:10:21 -0500
  • d7947c11ac Resolving merge tonyomendoza 2022-12-22 23:56:14 -0800
  • ac7887a145 merged changes tonyomendoza 2022-12-22 23:12:20 -0800
  • 575dd8e3e2 Neo FPS Update tonyomendoza 2022-12-22 19:50:16 -0800
  • 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 OceanSlim 2022-12-22 20:48:11 -0500
  • 213ac1455e Added Mesh, Materials, Textures and Prefabs for all 7.62 Ammo and Ammo Crafting OceanSlim 2022-12-19 15:15:08 -0500
  • 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 OceanSlim 2022-12-17 17:21:31 -0500
  • ac938c0ed5 commiting to switch branch tonyomendoza 2022-12-17 02:45:11 -0800
  • 87e762c312 Added more items while Tony was working on script OceanSlim 2022-12-11 23:29:12 -0500
  • eba3a7e1ed Bug fixes, screenshot feature, and other feature improvements tonyomendoza 2022-12-10 19:03:30 -0800
  • e903ca0050 Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git OceanSlim 2022-11-28 22:29:32 -0500
  • eff90e20d0 Added seperated mesh, texture, materials, prefabs for Various Medical and Crafting Items, Organized Test scene better OceanSlim 2022-11-28 22:28:50 -0500
  • c0e1a6c2ff Fixed body armor's tag tonyomendoza 2022-11-17 18:16:20 -0800
  • 63d27b5b0a Created an example for pouch. tonyomendoza 2022-11-17 17:50:45 -0800
  • 4a7b254f18 Attached scripts to backpack and implemented other pouches. tonyomendoza 2022-11-17 05:19:28 -0800
  • 9c294acd00 Saved scene tonyomendoza 2022-11-15 15:12:01 -0800
  • 1054674350 Integrated Simple Inventory asset with new changes tonyomendoza 2022-11-15 14:58:54 -0800
  • f5b3b8c71f Added seperated mesh, texture, materials, prefabs for more AR Platform Parts and some attachments OceanSlim 2022-11-10 21:15:48 -0500
  • 8a1471e26a Added Seperated Textures, Maaterials, & Prefabs for ALL AK47 parts OceanSlim 2022-11-08 23:07:28 -0500
  • f2d02e0319 Added Seperated Textures, Materials, Meshs & Prefabs for ALL AR15 Platform Rifle; Added seperated Meshs for AK Platform OceanSlim 2022-11-08 21:57:45 -0500
  • 5e245b69bd Added weapons tonyomendoza 2022-11-06 22:44:12 -0800
  • e08c454eba Added Texture packs, Added NEO FPS OceanSlim 2022-11-06 20:28:33 -0500
  • 91a1e67420 Added some fun color Pouch Examples to Items OceanSlim 2022-11-05 22:45:38 -0400
  • c8cefb4f9a Created Prefebs for ALL Pouches inside the Items/Prefabs... Folder, Also added ALL Texture,Material,Mesh for Pouches in Items Folder OceanSlim 2022-11-05 22:28:29 -0400
  • 07f357ec6f Created Items Folder in Root Directory; Created Prefabs, Mesh, Material & Textures Folders in Items Folder; Moved and Renamed all Prefabs, Meshes, Materials & Textures for ALL Current Backpacks, Plate Carriers, Tactical Rigs & Body Armors; Re-configured some Materials and Textures for various Items OceanSlim 2022-10-30 00:12:57 -0400
  • 386d5e851a Further Organized project files, moved Backpack and Armor Assets into appropriate Folders, Deleted Unused files, Added, Texture Mesh and Materials Folder to Root Directory of Assets OceanSlim 2022-10-29 15:56:00 -0400
  • 7afa59c4b9 Added All Pouch models under Items>Body>Equipment>Rig Pouches, Blender files added to master blender items repo in items repo OceanSlim 2022-10-24 20:21:39 -0400
  • 7500fe40e4 Added Body Armors, Army Backpacks, and Modular Military Character Asset Packs in Root Repository OceanSlim 2022-10-21 21:40:15 -0400
  • ba2e53b3e6 Updated game files with all previously deleted asset packages, Added Inventory Asset Package developed by Tony, Added some basic 3D Models and material for some items OceanSlim 2022-10-19 09:51:46 -0400
  • 0f068a5de8 Added Game Files to Repository OceanSlim 2022-10-07 22:26:09 -0400
  • dc4b36563a another change tonyomendoza 2022-10-07 18:41:08 -0700
  • 77100066b4 Update Read Me OceanSlim 2022-10-07 21:37:58 -0400
  • 2d7d5b7872 another initial commit tonyomendoza 2022-10-07 18:29:45 -0700
  • 12b745f8d6 initial commit tonyomendoza 2022-10-07 18:28:34 -0700