dots-training-2022-07-na-group2 #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open

MrDice wants to merge 69 commits into master from dots-training-2022-07-na-group2

MrDice commented Jul 26, 2022

No description provided.

Christian Deiss and others added 25 commits

July 25, 2022 09:23


          chore: updated unity version to 2022.2.0a15-dots

2119bfb


          feat: set up ported project combat bees for group 2

c50c6d5


          feat: implemented spawner and movement system

30cf24f


          feat: introduced separate tags for blue and yellow bees

b4ab9a1


          fix invalid op exception on launch

991ce0c


          Instantiate entities with EntityManager

668c913


          fix: fixed error caused by burst compiler

32880a3


          feat: added prefab for playing field

40f17ee

Added prefab for playing field. Material is currently not rendering correctly.


          feat: spawn two teams at separate locations

ee7619f


          feat: added simple spawning mechanism for food resources

3ece422


          Merged bee movement changes with spawner changes

8b9904d

Bees move to location and ocillate with the new spawning behavior.


          feat: replaced default random with mathematics random

9e95eb4


          fix: added the fixed materials and shaders

01967b0


          fix: fixed shaders

e12c1f4


          feat: setting up field container and camera in scene

3e8e734


          bee movement converted to ISystem

2dcaaa7

Started on a light state machine


          Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…

d576b20

…Unity-Technologies/DOTS-training-samples into dots-training-2022-07-na-group2


          Bees locate random resources

8abd1bf


          feat: added food state

ed6e251


          Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…

8e18e38

…chnologies/DOTS-training-samples into dots-training-2022-07-na-group2


          started on food picking up

c873dff


          Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…

15261eb

…Unity-Technologies/DOTS-training-samples into dots-training-2022-07-na-group2


          Bees complete a full state machine loop

e1515a7


          feat: added first version of drop food system

10c35da


          Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…

b186a1a

…chnologies/DOTS-training-samples into dots-training-2022-07-na-group2

# Conflicts:
#	Ported/CombatBeez/Assets/Scripts/Components/Bee.cs

MrDice force-pushed the dots-training-2022-07-na-group2 branch from b186a1a to e1515a7 Compare

July 26, 2022 22:52

kikisaints and others added 4 commits

July 26, 2022 15:53


          Bees carry resources to their bases

58373ef

yay


          Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…

9b3969e

…chnologies/DOTS-training-samples into dots-training-2022-07-na-group2


          fix: fixed bugs in drop food system

533eb41


          Remove unsafe index lookup on food resource

7d66246

kikisaints and others added 30 commits

July 27, 2022 10:52


          Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…

01fd544

…Unity-Technologies/DOTS-training-samples into dots-training-2022-07-na-group2


          removed unused variable, merged changes


          fixed bug

e49e4dc


          Fix bees pickup up dropped food items

a622395

Even when in range, need to do the check that the food resource is in the right state


          Bees idle now

ed96ad8


          Bee's now spawn blood upon kill

0c96719


          Mouse input and food dropping on click

f3fc3f2


          feat: added spawn for new bees when food is dropped in hive

4e55c17


          Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…

a997c38

…chnologies/DOTS-training-samples into dots-training-2022-07-na-group2


          feat: added blood system

eb3cd97


          feat: added randomization for newly spawned bees

5001e4a


          bug fix, bee attack chance %

e188375

Bees are also constrained to the playing field and idle better once no more resources or bees are available to distract them.


          Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…

5145b7c

…Unity-Technologies/DOTS-training-samples into dots-training-2022-07-na-group2


          added values back to GUID in the config

e9d0995


          Scene resets on H key press

3fbe4d6


          feat: turn of food drop if rate is 0

9ff1f26


          feat: added structs for particle system

00496d5


          Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…

6dd94d7

…chnologies/DOTS-training-samples into dots-training-2022-07-na-group2


          feat: use random number seed from config for spawning food initially

a8d4768


          refactor: renamed particle system

8f5aec1


          Mouse input and debug UI added

f8935c1


          Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…

f68d01f

…Unity-Technologies/DOTS-training-samples into dots-training-2022-07-na-group2


          feat: added operation to dry pooling blood and destroy it

ea7f732


          Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…

5d264ac

…chnologies/DOTS-training-samples into dots-training-2022-07-na-group2


          feat: adjusted settings for blood

9aa5e43


          only bees know when they are at their target

afaaabe


          job-ified the movement sys, started stress tests

af628e5


          fixed enabling burst compile on the drop food system

6c03499


          uncommented burst compile on update

1d7c155


          bees spawn back where the food is dropped

Forgot to assign translation back to the bee position

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet