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 |
|
tonyomendoza
|
ac7887a145
|
merged changes
|
2022-12-22 23:12:20 -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 |
|
OceanSlim
|
e903ca0050
|
Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git
|
2022-11-28 22:29:32 -05:00 |
|
OceanSlim
|
eff90e20d0
|
Added seperated mesh, texture, materials, prefabs for Various Medical and Crafting Items, Organized Test scene better
|
2022-11-28 22:28:50 -05:00 |
|
tonyomendoza
|
c0e1a6c2ff
|
Fixed body armor's tag
|
2022-11-17 18:16:20 -08:00 |
|
tonyomendoza
|
63d27b5b0a
|
Created an example for pouch.
|
2022-11-17 17:50:45 -08:00 |
|
tonyomendoza
|
4a7b254f18
|
Attached scripts to backpack and implemented other pouches.
|
2022-11-17 05:19:28 -08:00 |
|
tonyomendoza
|
9c294acd00
|
Saved scene
|
2022-11-15 15:12:01 -08:00 |
|
tonyomendoza
|
1054674350
|
Integrated Simple Inventory asset with new changes
|
2022-11-15 14:58:54 -08:00 |
|
OceanSlim
|
f5b3b8c71f
|
Added seperated mesh, texture, materials, prefabs for more AR Platform Parts and some attachments
|
2022-11-10 21:15:48 -05:00 |
|
OceanSlim
|
8a1471e26a
|
Added Seperated Textures, Maaterials, & Prefabs for ALL AK47 parts
|
2022-11-08 23:07:28 -05:00 |
|
OceanSlim
|
f2d02e0319
|
Added Seperated Textures, Materials, Meshs & Prefabs for ALL AR15 Platform Rifle; Added seperated Meshs for AK Platform
|
2022-11-08 21:57:45 -05:00 |
|
tonyomendoza
|
5e245b69bd
|
Added weapons
|
2022-11-06 22:44:12 -08:00 |
|
OceanSlim
|
e08c454eba
|
Added Texture packs, Added NEO FPS
|
2022-11-06 20:28:33 -05:00 |
|
OceanSlim
|
91a1e67420
|
Added some fun color Pouch Examples to Items
|
2022-11-05 22:45:38 -04:00 |
|
OceanSlim
|
c8cefb4f9a
|
Created Prefebs for ALL Pouches inside the Items/Prefabs... Folder, Also added ALL Texture,Material,Mesh for Pouches in Items Folder
|
2022-11-05 22:28:29 -04:00 |
|
OceanSlim
|
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
|
2022-10-30 00:12:57 -04:00 |
|
OceanSlim
|
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
|
2022-10-29 15:56:00 -04:00 |
|
OceanSlim
|
7afa59c4b9
|
Added All Pouch models under Items>Body>Equipment>Rig Pouches, Blender files added to master blender items repo in items repo
|
2022-10-24 20:21:39 -04:00 |
|
OceanSlim
|
7500fe40e4
|
Added Body Armors, Army Backpacks, and Modular Military Character Asset Packs in Root Repository
|
2022-10-21 21:40:15 -04:00 |
|
OceanSlim
|
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
|
2022-10-19 09:51:46 -04:00 |
|
OceanSlim
|
0f068a5de8
|
Added Game Files to Repository
|
2022-10-07 22:26:09 -04:00 |
|