Skip to content
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

Dev dem update #179

Open
wants to merge 100 commits into
base: development
Choose a base branch
from
Open

Dev dem update #179

wants to merge 100 commits into from

Conversation

cherylnielsen
Copy link

this may solve the image problems but leave new problem of gitnore ignoring .pdb database files and text files.

umangmathur92 and others added 30 commits March 2, 2018 21:02
@umangmathur92
initial upgrade commit. Able to login to lobby, getting runtime errors
d6c6a03
@umangmathur92
changes automatically made by unity's inbuilt upgrader on loading the…
9a2e7de 
… unity project
@umangmathur92
removed plugin for JetBrain's Rider IDE. Newer version of the plugin …
90d064f 
…can be added later if any team member wants to use that IDE
@umangmathur92
removed unity-game-client.userprefs from version control
6cd623b
@umangmathur92
removed unnecessary files
eb8f341
@umangmathur92
removed Editor.meta
5e850eb
@umangmathur92
Merge pull request #1 from umangmathur92/unityUpgradeBranch
69a8480 
Unity upgrade branch
@chiKaRau
Added Card Description while Hover
b324574
@chiKaRau
saved Game.unity
547b753
@DamicoS
Merge pull request #2 from umangmathur92/dev-cow-cardhover
6b9be06 
Dev cow cardhover
@DamicoS
Initial bug fixes
f51fc90
@cherylnielsen
Start of a DEM food web
fe016f9
@DamicoS
Changed server info to Azure
f569f2a
@chiKaRau
added ecosystem
21d118a
@chiKaRau
changed remote back to smurf
62c7f01
@DamicoS
Merge pull request #3 from umangmathur92/dev-cow-ecosystem
50b52d9 
Dev cow ecosystem
@DamicoS
Removed rex login info
a1da283
@cherylnielsen
return to first branch
264d74c
@cherylnielsen
Added assets from Tutorial 1 FPS game with AI
b9e2836
@cherylnielsen
looking at code
f104171
@cherylnielsen
changed tutorial 3 asset materials to trees and sized larger
de8f8a1
@DamicoS
Changed to localhost
a77994f
@DamicoS
Merge branch 'development' into dev-damico
8bad2eb
@cherylnielsen
Added materials and prefabs for player species
7cc118a
@cherylnielsen
Enemy and player prefabs for species
505bbd2
@cherylnielsen
added reactive dying behavior to enemy and player species
683887e
@cherylnielsen
added changes to species and tree of life based on attacks
1eda641
@cherylnielsen
Simplified coding for species and started coding enemy behavior
227a9b9
@cherylnielsen
changes to enemy code
1473ac3
@dahoang
Fixed non-kinematic rigidbody non-convex mesh collider error in lobby
b52eb7b
DamicoS and others added 30 commits May 8, 2018 04:05
@DamicoS
Merge pull request #14 from umangmathur92/dev-lby-lbyCoWcurrencyInteg…
2bf1a07 
…ration

Integrating credit rewards with CoW.
@balambouya
first commit, inegration of updateCredits network protocol for DEM mi…
1dad11f 
…nigame
@balambouya
Merge branch 'development' into dev-lby-lbyDEMcurrencyIntegration
f400b5d
@DamicoS
Merge pull request #15 from umangmathur92/dev-lby-lbyDEMcurrencyInteg…
7eb269a 
…ration

Dev lby lby de mcurrency integration
@cherylnielsen
deleted old Dem-new-CN
a9d908a
@cherylnielsen
added Dem-new-2018
bd50d75
@cherylnielsen
added back in png images lost with gitnore error
35c6bd5
@cherylnielsen
fix to gitnore took out too many lines
54a64d1
@cherylnielsen
deleted and created new attack file
7373bff
@cherylnielsen
delete files maybe bad
86be2f7
@cherylnielsen
re added files removed for rewrite
38331d0
@cherylnielsen
removed runtime error from code
354850e
@cherylnielsen
removed animator components wt errors in 3D prefabs
5077b20
@cherylnielsen
removed error component
5a9a05f
@cherylnielsen
removing attack file
6d7a608
@cherylnielsen
removing compile error files
219f277
@cherylnielsen
adding use of 3D animal factory
af5f11a
@cherylnielsen
working on enemy attack for 3d animals
8bdd12e
@cherylnielsen
3d enemy animals moving correctly to tree of life
6c8c6c9
@cherylnielsen
the 3d animals now attacking tree of life correctly
2e95106
@cherylnielsen
fixes to enemy navigation start of player navigation
1e60b32
@cherylnielsen
player animals randomly placed and following enemies
603076c
@cherylnielsen
player animals now attacking enemy AI animals
90bef20
@cherylnielsen
added speed to player animals for better animation look
ed11c92
@cherylnielsen
broke and fixed player animal attacks
83e892b
@cherylnielsen
Added version 1 of enemy AI attacking other animals & plants
9428214
@cherylnielsen
version 2 player vs enemy & enemy vs player & treeOfLife
f44109c
@cherylnielsen
success enemy and player species behaviors complete
a334fe8
@joleong1
Button UI, Not pushing raycasting shop scripts yet. not functional
78764e3
@joleong1
More progress for Shop, drag and drop almost available
d512a49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@cherylnielsen @umangmathur92 @chiKaRau @DamicoS @dahoang @XanderQue @balambouya @joleong1