Skip to content

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

Open
MrDice wants to merge 69 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
2119bfb
chore: updated unity version to 2022.2.0a15-dots
Jul 25, 2022
c50c6d5
feat: set up ported project combat bees for group 2
Jul 25, 2022
30cf24f
feat: implemented spawner and movement system
Jul 25, 2022
b4ab9a1
feat: introduced separate tags for blue and yellow bees
Jul 25, 2022
991ce0c
fix invalid op exception on launch
JayHegg Jul 26, 2022
668c913
Instantiate entities with EntityManager
kikisaints Jul 26, 2022
32880a3
fix: fixed error caused by burst compiler
Jul 26, 2022
40f17ee
feat: added prefab for playing field
Jul 26, 2022
ee7619f
feat: spawn two teams at separate locations
Jul 26, 2022
3ece422
feat: added simple spawning mechanism for food resources
Jul 26, 2022
8b9904d
Merged bee movement changes with spawner changes
kikisaints Jul 26, 2022
9e95eb4
feat: replaced default random with mathematics random
Jul 26, 2022
01967b0
fix: added the fixed materials and shaders
Jul 26, 2022
e12c1f4
fix: fixed shaders
Jul 26, 2022
3e8e734
feat: setting up field container and camera in scene
Jul 26, 2022
2dcaaa7
bee movement converted to ISystem
kikisaints Jul 26, 2022
d576b20
Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…
kikisaints Jul 26, 2022
8abd1bf
Bees locate random resources
kikisaints Jul 26, 2022
ed6e251
feat: added food state
Jul 26, 2022
8e18e38
Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…
Jul 26, 2022
c873dff
started on food picking up
kikisaints Jul 26, 2022
15261eb
Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…
kikisaints Jul 26, 2022
e1515a7
Bees complete a full state machine loop
kikisaints Jul 26, 2022
10c35da
feat: added first version of drop food system
Jul 26, 2022
b186a1a
Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…
Jul 26, 2022
58373ef
Bees carry resources to their bases
kikisaints Jul 26, 2022
9b3969e
Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…
Jul 26, 2022
533eb41
fix: fixed bugs in drop food system
Jul 27, 2022
7d66246
Remove unsafe index lookup on food resource
JayHegg Jul 27, 2022
e836843
fix: fixed drop rate for drop food system
Jul 27, 2022
868ede4
Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…
Jul 27, 2022
5ddad7d
feat: added movement to drop food system
Jul 27, 2022
e9d9bdd
Bees can attack each other and die
kikisaints Jul 27, 2022
7426dff
Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…
kikisaints Jul 27, 2022
cf52a27
refactor: moved foreach loop out of update position function
Jul 27, 2022
d2f0e46
Merge remote-tracking branch 'origin/dots-training-2022-07-na-group2'…
Jul 27, 2022
0294748
refactor: implement switch for update function in drop food system
Jul 27, 2022
8404166
feat: added function to mark food settled in hive
Jul 27, 2022
bf7918a
Bee's ocillate in scale based on dir
kikisaints Jul 27, 2022
01fd544
Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…
kikisaints Jul 27, 2022
5954606
removed unused variable, merged changes
kikisaints Jul 27, 2022
e49e4dc
fixed bug
kikisaints Jul 27, 2022
a622395
Fix bees pickup up dropped food items
JayHegg Jul 27, 2022
ed96ad8
Bees idle now
kikisaints Jul 27, 2022
0c96719
Bee's now spawn blood upon kill
kikisaints Jul 27, 2022
f3fc3f2
Mouse input and food dropping on click
kikisaints Jul 27, 2022
4e55c17
feat: added spawn for new bees when food is dropped in hive
Jul 27, 2022
a997c38
Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…
Jul 27, 2022
eb3cd97
feat: added blood system
Jul 27, 2022
5001e4a
feat: added randomization for newly spawned bees
Jul 28, 2022
e188375
bug fix, bee attack chance %
kikisaints Jul 28, 2022
5145b7c
Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…
kikisaints Jul 28, 2022
e9d0995
added values back to GUID in the config
kikisaints Jul 28, 2022
3fbe4d6
Scene resets on H key press
kikisaints Jul 28, 2022
9ff1f26
feat: turn of food drop if rate is 0
Jul 28, 2022
00496d5
feat: added structs for particle system
Jul 28, 2022
6dd94d7
Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…
Jul 28, 2022
a8d4768
feat: use random number seed from config for spawning food initially
Jul 28, 2022
8f5aec1
refactor: renamed particle system
Jul 28, 2022
f8935c1
Mouse input and debug UI added
kikisaints Jul 28, 2022
f68d01f
Merge branch 'dots-training-2022-07-na-group2' of https://github.com/…
kikisaints Jul 28, 2022
ea7f732
feat: added operation to dry pooling blood and destroy it
Jul 28, 2022
5d264ac
Merge branch 'dots-training-2022-07-na-group2' of github.com:Unity-Te…
Jul 28, 2022
9aa5e43
feat: adjusted settings for blood
Jul 28, 2022
afaaabe
only bees know when they are at their target
kikisaints Jul 28, 2022
af628e5
job-ified the movement sys, started stress tests
kikisaints Jul 28, 2022
6c03499
fixed enabling burst compile on the drop food system
kikisaints Jul 29, 2022
1d7c155
uncommented burst compile on update
kikisaints Jul 29, 2022
7061289
bees spawn back where the food is dropped
kikisaints Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions Original/CombatBees/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
12 changes: 6 additions & 6 deletions Original/CombatBees/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.analytics": "3.3.5",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.2",
"com.unity.ide.vscode": "1.2.1",
"com.unity.test-framework": "1.1.14",
"com.unity.textmeshpro": "3.0.0-preview.1",
"com.unity.analytics": "3.8.1",
"com.unity.ide.rider": "3.0.14",
"com.unity.ide.visualstudio": "2.0.15",
"com.unity.ide.vscode": "1.2.5",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
Loading