Commit Graph

28 Commits

Author SHA1 Message Date
Gabriel Ksawery Skowron-Rodriguez
d6f6631de8 clicking on tile wip
+ Added PlayerClickSystem
++ raycasts and tries to hit the grid
+TilemapManager
++ some access level changes to get stuff out of it
++ GetTIleFromWorldCoords()
+++ to get the tile that was clicked
--- TO DO: FIGURE OUT HOW TO MAKE IT POSISBLE TO CLICK ON A TILE WITH NO SOLDIER
2022-05-16 15:22:02 +02:00
Gabriel Ksawery Skowron-Rodriguez
2c248b7de0 Merge remote-tracking branch 'origin/merloj-tilemap' into SpartaqS-OrderIssuing 2022-05-16 14:33:05 +02:00
Maciekxdabu
acf737cbad merloj: base tilemap done 2022-05-16 14:32:01 +02:00
Krzysztof Stefan Rudnicki
b2f57b9e92 Merge branch 'kuchy-soldiers' into 'Development'
Merge Soldiers

See merge request gskowron/eopsy-lab-567-project!3
2022-05-16 14:26:32 +02:00
Krzysztof Stefan Rudnicki
c9ab4e1f93 Merge branch 'Development' into 'kuchy-soldiers'
# Conflicts:
#   The project/Assets/Scenes/SpartaqS.unity
2022-05-16 12:26:26 +00:00
Gabriel Ksawery Skowron-Rodriguez
523b73bcb3 Merge branch 'SpartaqS-Squad' into Development 2022-05-16 14:23:46 +02:00
ba336cd776 chore 2022-05-16 14:23:32 +02:00
Gabriel Ksawery Skowron-Rodriguez
50882e48db Added basic Squad logic
+ Squad
++ aggregates soldiers
++ orders are passed to soldiers (one order per tick)
+- for now debug functions to simulate player inputting of a movement order
2022-05-16 14:21:52 +02:00
2a0b75fd81 feat: Find soldiers 2022-05-16 14:16:41 +02:00
fe0d6a6b7f add soldier script 2022-05-16 14:16:41 +02:00
Gabriel Ksawery Skowron-Rodriguez
100f074ec1 Merge branch 'kuchy-soldiers' into SpartaqS-Squad 2022-05-16 13:42:44 +02:00
e21fe8a213 add soldier script 2022-05-16 13:39:57 +02:00
Gabriel Ksawery Skowron-Rodriguez
df91ef27c8 Merge branch 'kuchy-soldiers' into SpartaqS-Squad 2022-05-16 13:38:10 +02:00
Gabriel Ksawery Skowron-Rodriguez
98112df4a5 added TickSystem and an example tick receiver
+ basic TickSystem fully working:
++ add it to a scene for ticks to happen

+ ExampleTickReceiver reference monobehaviour
++ so everyone knows how to connect to the system
2022-05-16 13:34:11 +02:00
0879eb56b4 chore: add branch 2022-05-16 12:47:02 +02:00
68990c01fa feat: add project concept spartaqs changes 2022-05-12 12:23:30 +02:00
Krzysztof Stefan Rudnicki
867a6b110b Add @SpartaqS changes 2022-05-12 12:22:00 +02:00
aa74a8dc68 fix: rephrase soldier tick 2022-05-10 12:23:57 +02:00
e8737b0c72 fix: rephrase soldier tick 2022-05-10 12:23:40 +02:00
3624a205c7 feat: Rename report file 2022-05-10 07:39:36 +02:00
16745b1198 fix: concept file
Explicitly write about tiles, explicitly write that we  first do expansion one and then expansion two, spelling mistake in 2.4.1
2022-05-10 07:39:12 +02:00
Krzysztof Stefan Rudnicki
8e6f85d304 Merge branch 'main' into 'Development'
Add project concept

See merge request gskowron/eopsy-lab-567-project!2
2022-05-09 16:51:13 +02:00
Krzysztof Stefan Rudnicki
4bfa75851c Merge branch 'rudnicki-project-concept' into 'main'
feat: add project concept

See merge request gskowron/eopsy-lab-567-project!1
2022-05-09 16:49:42 +02:00
0cdf65201f feat: add project concept 2022-05-09 16:48:44 +02:00
Maciekxdabu
08ad9b62df Added scenes for each 2022-05-09 14:32:38 +02:00
Maciekxdabu
9c952ee9a4 Initial project
- moved gitignore into project folder
- created initial 3D Unity Project
2022-05-09 13:16:56 +02:00
Maciekxdabu
70dda8995a Added gitignore 2022-05-09 13:01:13 +02:00
Gabriel Ksawery Skowron-Rodriguez
53835ed47a Initial commit 2022-05-09 12:45:05 +02:00