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
|
8a6fdd6156
|
resolving merge conflict
|
2023-01-25 16:12:22 -08:00 |
|
tonyomendoza
|
31369eff0b
|
resolving merge conflict
|
2023-01-25 16:11:29 -08:00 |
|
OceanSlim
|
4f4efc8cd0
|
fix scene
|
2023-01-25 19:01:19 -05:00 |
|
tonyomendoza
|
d275151c41
|
re-adding scene
|
2023-01-25 15:33:45 -08:00 |
|
OceanSlim
|
c5309cbfc7
|
fix scene
|
2023-01-25 18:19:57 -05:00 |
|
OceanSlim
|
d4075eccc4
|
resolving merge
|
2023-01-25 17:06:01 -05: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
|
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
|
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 |
|
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
|
fdc6a8405a
|
adjusted a few settings and played around with the photoshoot scene a little
|
2023-01-14 11:47:24 -05:00 |
|
OceanSlim
|
6f2ea44cba
|
Merge branch 'master' of http://localhost/Bonobo.Git.server/Test.git
|
2023-01-12 12:11:50 -05:00 |
|
OceanSlim
|
d5615a74f1
|
added armor plates to items and fixed a few other things
|
2023-01-12 12:10:54 -05:00 |
|
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 |
|