Skip to content

Dev dem update #179

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
cherylnielsen wants to merge 100 commits into
base: development
Choose a base branch
from
Open

Dev dem update #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
d6c6a03
initial upgrade commit. Able to login to lobby, getting runtime errors
umangmathur92 Mar 3, 2018
9a2e7de
changes automatically made by unity's inbuilt upgrader on loading the…
umangmathur92 Mar 3, 2018
90d064f
removed plugin for JetBrain's Rider IDE. Newer version of the plugin …
umangmathur92 Mar 3, 2018
6cd623b
removed unity-game-client.userprefs from version control
umangmathur92 Mar 3, 2018
eb8f341
removed unnecessary files
umangmathur92 Mar 3, 2018
5e850eb
removed Editor.meta
umangmathur92 Mar 3, 2018
69a8480
Merge pull request #1 from umangmathur92/unityUpgradeBranch
umangmathur92 Mar 7, 2018
b324574
Added Card Description while Hover
chiKaRau Mar 23, 2018
547b753
saved Game.unity
chiKaRau Mar 23, 2018
6b9be06
Merge pull request #2 from umangmathur92/dev-cow-cardhover
DamicoS Mar 26, 2018
f51fc90
Initial bug fixes
DamicoS Mar 28, 2018
fe016f9
Start of a DEM food web
cherylnielsen Apr 1, 2018
f569f2a
Changed server info to Azure
DamicoS Apr 2, 2018
21d118a
added ecosystem
chiKaRau Apr 3, 2018
62c7f01
changed remote back to smurf
chiKaRau Apr 3, 2018
50b52d9
Merge pull request #3 from umangmathur92/dev-cow-ecosystem
DamicoS Apr 3, 2018
a1da283
Removed rex login info
DamicoS Apr 3, 2018
264d74c
return to first branch
cherylnielsen Apr 5, 2018
b9e2836
Added assets from Tutorial 1 FPS game with AI
cherylnielsen Apr 5, 2018
f104171
looking at code
cherylnielsen Apr 5, 2018
de8f8a1
changed tutorial 3 asset materials to trees and sized larger
cherylnielsen Apr 6, 2018
a77994f
Changed to localhost
DamicoS Apr 9, 2018
8bad2eb
Merge branch 'development' into dev-damico
DamicoS Apr 9, 2018
7cc118a
Added materials and prefabs for player species
cherylnielsen Apr 10, 2018
505bbd2
Enemy and player prefabs for species
cherylnielsen Apr 10, 2018
683887e
added reactive dying behavior to enemy and player species
cherylnielsen Apr 10, 2018
1eda641
added changes to species and tree of life based on attacks
cherylnielsen Apr 11, 2018
227a9b9
Simplified coding for species and started coding enemy behavior
cherylnielsen Apr 11, 2018
1473ac3
changes to enemy code
cherylnielsen Apr 11, 2018
b52eb7b
Fixed non-kinematic rigidbody non-convex mesh collider error in lobby
dahoang Apr 12, 2018
89d3b1f
radical changes to behaviors for animals,enemy,TreeOfLife
cherylnielsen Apr 12, 2018
0b5d78f
working on enemy motion and actions
cherylnielsen Apr 12, 2018
ccb963f
Merge pull request #4 from umangmathur92/lobby-error-fix
DamicoS Apr 12, 2018
817ffa7
Merge branch 'development' into dev-damico
DamicoS Apr 12, 2018
a6bdc91
added comments
cherylnielsen Apr 12, 2018
749d3a1
half complete sound effect
chiKaRau Apr 12, 2018
ef4efd5
added plants to scean
cherylnielsen Apr 12, 2018
d5b7981
start of new navmesh navigation branch
cherylnielsen Apr 12, 2018
d2d41cf
2/3 finishing effect
chiKaRau Apr 19, 2018
2ba8af3
a
chiKaRau Apr 23, 2018
7d1cdff
Merge branch 'development' into dev-cow-effect
chiKaRau Apr 23, 2018
1cac2e1
summon effect demo completed
chiKaRau Apr 24, 2018
db7d122
Pushing changes made to COS and some resources used by COS for purpos…
XanderQue Apr 24, 2018
7f60689
Removed running rhino objects, speeding up launch
DamicoS Apr 24, 2018
fab6af2
Merge pull request #5 from umangmathur92/dev-damico
DamicoS Apr 24, 2018
2f13f47
Merge pull request #6 from umangmathur92/dev-cos-TileSystem
DamicoS Apr 26, 2018
ebe1aa6
Added NavMesh for enemy AI with tree of life as goal
cherylnielsen Apr 26, 2018
d12b795
Merge pull request #7 from umangmathur92/dev-dem-AI-navigation
DamicoS Apr 26, 2018
d7698b2
add sound
chiKaRau Apr 26, 2018
d2ed030
Alterations to behaviors of multiple Enemy AI spawning and dying
cherylnielsen Apr 26, 2018
e4b5bba
Merge pull request #8 from umangmathur92/dev-dem-AI-navmesh
DamicoS Apr 26, 2018
50cb0dc
Fixed errors that where produced after last push, for cos game
XanderQue Apr 26, 2018
cf6e98b
Merge branch 'development' into dev-cos-TileSystem
XanderQue Apr 26, 2018
8876290
Merge pull request #9 from umangmathur92/dev-cos-TileSystem
DamicoS Apr 27, 2018
e8e61f0
fixed
chiKaRau Apr 28, 2018
7a34b74
working on credits network protocol between minigames and lobby
balambouya Apr 29, 2018
6a48a07
changed 9260
chiKaRau Apr 29, 2018
9961a12
adding missing entry in protocol table
balambouya Apr 29, 2018
39dd5eb
more adjustments to updating credits protocols
balambouya Apr 29, 2018
ed5018b
Merge pull request #11 from umangmathur92/dev-cow-effect
DamicoS Apr 29, 2018
8bfcc9c
new branch
chiKaRau Apr 29, 2018
20001fb
changed back fieldpos to 10
chiKaRau Apr 29, 2018
8cef4af
added rain effect
chiKaRau Apr 29, 2018
365903a
added blizzard effect
chiKaRau Apr 29, 2018
f05e590
debugging protocol
balambouya May 1, 2018
84e09e3
added image and snow effect and rain effect
chiKaRau May 2, 2018
a7df7ab
Merge pull request #12 from umangmathur92/dev-cow-bgmeffect
DamicoS May 2, 2018
42f08bb
took care of redundant adding of listeners when players were instanti…
balambouya May 3, 2018
080b1b0
Added png back to gitignore
DamicoS May 3, 2018
6de58d8
Merge branch 'development' into dev-lby-lbyCoWcurrencyIntegration
balambouya May 8, 2018
2bf1a07
Merge pull request #14 from umangmathur92/dev-lby-lbyCoWcurrencyInteg…
DamicoS May 8, 2018
1dad11f
first commit, inegration of updateCredits network protocol for DEM mi…
balambouya May 10, 2018
f400b5d
Merge branch 'development' into dev-lby-lbyDEMcurrencyIntegration
balambouya May 10, 2018
7eb269a
Merge pull request #15 from umangmathur92/dev-lby-lbyDEMcurrencyInteg…
DamicoS May 10, 2018
a9d908a
deleted old Dem-new-CN
cherylnielsen May 12, 2018
bd50d75
added Dem-new-2018
cherylnielsen May 12, 2018
35c6bd5
added back in png images lost with gitnore error
cherylnielsen May 13, 2018
54a64d1
fix to gitnore took out too many lines
cherylnielsen May 13, 2018
7373bff
deleted and created new attack file
cherylnielsen May 13, 2018
86be2f7
delete files maybe bad
cherylnielsen May 13, 2018
38331d0
re added files removed for rewrite
cherylnielsen May 13, 2018
354850e
removed runtime error from code
cherylnielsen May 13, 2018
5077b20
removed animator components wt errors in 3D prefabs
cherylnielsen May 13, 2018
5a9a05f
removed error component
cherylnielsen May 13, 2018
6d7a608
removing attack file
cherylnielsen May 13, 2018
219f277
removing compile error files
cherylnielsen May 14, 2018
af5f11a
adding use of 3D animal factory
cherylnielsen May 14, 2018
8bdd12e
working on enemy attack for 3d animals
cherylnielsen May 14, 2018
6c8c6c9
3d enemy animals moving correctly to tree of life
cherylnielsen May 14, 2018
2e95106
the 3d animals now attacking tree of life correctly
cherylnielsen May 14, 2018
1e60b32
fixes to enemy navigation start of player navigation
cherylnielsen May 14, 2018
603076c
player animals randomly placed and following enemies
cherylnielsen May 14, 2018
90bef20
player animals now attacking enemy AI animals
cherylnielsen May 14, 2018
ed11c92
added speed to player animals for better animation look
cherylnielsen May 14, 2018
83e892b
broke and fixed player animal attacks
cherylnielsen May 15, 2018
9428214
Added version 1 of enemy AI attacking other animals & plants
cherylnielsen May 15, 2018
f44109c
version 2 player vs enemy & enemy vs player & treeOfLife
cherylnielsen May 15, 2018
a334fe8
success enemy and player species behaviors complete
cherylnielsen May 15, 2018
78764e3
Button UI, Not pushing raycasting shop scripts yet. not functional
joleong1 May 15, 2018
d512a49
More progress for Shop, drag and drop almost available
joleong1 May 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.vs/

/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
Expand All @@ -8,7 +10,6 @@
# DH added
*.pdb
*.txt
*.png

# Autogenerated VS/MD solution and project files
ExportedObj/
Expand Down
Binary file modified Assets/CWAssets/CWGame.unity
View file
Open in desktop
Binary file not shown.
Binary file modified Assets/CWAssets/Images/Materials/attacker_overlay.mat
View file
Open in desktop
Binary file not shown.
Binary file added Assets/CWAssets/Images/Materials/hex_stroke.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Images/Materials/hex_stroke.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/CWAssets/Materials/hex_stroke_5.mat
View file
Open in desktop
Binary file not shown.
Binary file added Assets/CWAssets/Resources/Images/Battle/Death.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 20 additions & 10 deletions ...ources/Prefabs/Battle/cardfront0.png.meta → ...ts/Resources/Images/Battle/Death.png.meta
100755 → 100644
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Death1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
77 changes: 77 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Death1.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/Death.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/fire.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/freez.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/freezedrop.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/grass_aura.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/mana1.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/mana2.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke1.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke2.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke3.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/owned_stroke4.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/raindrop.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Resources/Images/Battle/Materials/tree3.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading