dddushesss
|
3bbdd7e5f4
|
Merge branch 'main' of https://github.com/BG-Games/S_Jump-and-grub
|
2022-01-05 18:33:34 +03:00 |
|
dddushesss
|
aa3187745b
|
metas
|
2022-01-05 18:14:43 +03:00 |
|
dddushesss
|
e630b2f332
|
Merge branch 'Prod'
# Conflicts:
# Assets/Prefab/AimCanvas.prefab
# Assets/Prefab/BarCAnvas.prefab
# Assets/Resources/1/Character/Prefab/Asvald.prefab
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_box_blur.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_blur 1.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_blur.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_glow.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_circle_line_blue.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_glow.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_glow_small.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_rotate_line.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_rotate_line_small.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_blue.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_green.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_purple.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_red.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_white.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_special_particle_yellow.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_blue.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_green.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_light.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_purple.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_red.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_white.png
# Assets/Resources/1/_NewSprites/Fx_Paticle/Particle/Texture/fx_star_yellow.png
# Assets/Resources/1/_NewSprites/Logo.png
# Assets/Resources/1/_NewSprites/icon.png
# Assets/Resources/Data/ItemData.asset
# Assets/Scripts/Controller/GameInit.cs
# Assets/Scripts/Items/ItemFabric.cs
# Assets/Scripts/Units/Unit.cs
# Assets/Scripts/Units/Views/UnitView.cs
# Assets/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf
# Assets/TextMesh Pro/Fonts/LiberationSans.ttf
# Assets/TextMesh Pro/Sprites/EmojiOne.png
|
2022-01-05 18:05:43 +03:00 |
|
dddushesss
|
fd79cecfdd
|
some changes
|
2022-01-05 17:42:55 +03:00 |
|
dddushesss
|
854b093f45
|
cleaned main
|
2022-01-05 16:02:18 +03:00 |
|
dddushesss
|
6a41c388cb
|
refactor and fixes
|
2021-12-29 03:02:55 +03:00 |
|
dddushesss
|
16852906d3
|
changed menu, added weapon choose,added music controller, settings save
|
2021-12-28 17:17:47 +03:00 |
|
dddushesss
|
1b3d4fb8bd
|
changed shooting mechanic, aiming on 360
|
2021-12-22 17:01:17 +03:00 |
|
dddushesss
|
ac7e2a0b52
|
menu fix
|
2021-12-18 02:51:59 +03:00 |
|
dddushesss
|
fbd54e36ec
|
edited light, changed material on cell prefab
|
2021-12-17 22:30:16 +03:00 |
|
dddushesss
|
0692435c2a
|
Added main menu
|
2021-12-17 17:14:58 +03:00 |
|
dddushesss
|
2453c7082f
|
added resources
|
2021-12-15 16:29:44 +03:00 |
|
dddushesss
|
740205bc3d
|
Grid generation, painting hex on click, MVC Arcitecture, OnPaintHex listener, added readme
|
2021-12-14 16:06:37 +03:00 |
|
AlexMamontow
|
1ab721a681
|
Some fixes
|
2021-08-21 14:14:03 +03:00 |
|
AlexMamontow
|
177f01fd38
|
Basics of bonus collection and using.
|
2021-08-19 23:07:26 +03:00 |
|
AlexMamontow
|
3bacc3c516
|
Improved AI. Added attack energy, implemented attack mechanic.
|
2021-08-19 01:10:04 +03:00 |
|
AlexMamontow
|
9f0458ce3d
|
Attack VFX, fixed some AI bugs
|
2021-08-17 18:50:32 +03:00 |
|
AlexMamontow
|
7faeb7ef42
|
Imported VFX
|
2021-08-16 21:08:31 +03:00 |
|
AlexMamontow
|
0a5f964099
|
Fixed bugs, fixed AI
|
2021-08-11 19:19:36 +03:00 |
|
AlexMamontow
|
6dfd44119d
|
.
|
2021-08-09 00:49:16 +03:00 |
|
AlexMamontow
|
3ce46a72f1
|
Finished AI , fixed bugs
|
2021-08-08 22:39:13 +03:00 |
|
AlexMamontow
|
3210fc245e
|
Added pathfinding and basics of bot movement
|
2021-08-07 17:23:31 +03:00 |
|
AlexMamontow
|
8483d0ef43
|
Added project
|
2021-08-02 16:22:16 +03:00 |
|