Skip to content

Lobby graph GUI updates #182

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.

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
wants to merge 205 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
205 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
15ac1f9
tile click leads to ecosystem scene, graph button added to ecosystem …
ccylau Apr 22, 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
d0abbd8
Cleaned up clash of species assets and prefabs removed older terrains…
XanderQue Apr 28, 2018
c94922d
Merge branch 'dev-cos-TileSystem' of https://github.com/umangmathur92…
XanderQue Apr 28, 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
e88d1cf
Modifying ClashBattle controller and removing redundant code
dahoang 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
c9a694c
Adding new files not present in last commit
XanderQue Apr 29, 2018
dde5270
Merge branch 'dev-cos-TileSystem' of https://github.com/umangmathur92…
dahoang Apr 29, 2018
e227aad
Merge branch 'pathfinding_integration' into merge-branch
dahoang Apr 29, 2018
8cef4af
added rain effect
chiKaRau Apr 29, 2018
365903a
added blizzard effect
chiKaRau Apr 29, 2018
ba36ca2
AI barebones implementation and resolved conflict merges with dev-cos…
dahoang Apr 30, 2018
0734e3f
Continuing integration - readded type priorities
dahoang May 1, 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
924f6e3
fixed so AI works in battles and waits until after battle starts
dahoang May 3, 2018
42f08bb
took care of redundant adding of listeners when players were instanti…
balambouya May 3, 2018
5bbd123
changed description open/close method
chiKaRau May 3, 2018
080b1b0
Added png back to gitignore
DamicoS May 3, 2018
1771f71
Added Rock wall to defense menu
XanderQue May 3, 2018
6a0ae4e
Rock_Wall image
XanderQue May 4, 2018
3cf45ea
Map png
XanderQue May 4, 2018
9ab551f
Merge branch 'master' into dev-cos-AI
dahoang May 5, 2018
2825a26
Merge branch 'dev-cos-TileSystem' of https://github.com/umangmathur92…
dahoang May 5, 2018
beef98e
Merge pull request #13 from umangmathur92/dev-cos-AI
XanderQue May 5, 2018
6a74020
Removed rrex autologin
XanderQue May 5, 2018
9fd48d2
added pop out ecosystem (not finish)
chiKaRau May 8, 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
2e08f5c
added popout foodweb predator prey
chiKaRau May 9, 2018
8ab8adb
changed localhost to azure
chiKaRau May 9, 2018
782766c
Added predefined map bushes had Plant tag, walls have Wall tag and tr…
XanderQue May 10, 2018
a1b1c8e
Clash of species foodweb initial commit
umangmathur92 May 10, 2018
51618c5
made food web button clickable, adjusted UI measurements to accomodat…
umangmathur92 May 10, 2018
7140463
food web working
umangmathur92 May 10, 2018
6220e80
changed back local
chiKaRau May 10, 2018
790605f
Merge branch 'development' into dev-cow-ecosystem2
chiKaRau May 10, 2018
d15341a
fixed tree graphics bug
chiKaRau May 10, 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
7ffb4c8
checking
chiKaRau May 10, 2018
32671df
alterations for demo'ing in presentation
dahoang May 10, 2018
426dce6
ecosystem food and species done
chiKaRau May 10, 2018
ee7f846
Merge branch 'development' into dev-cow-ecosystem2
chiKaRau May 10, 2018
09f6686
defense setup had become broken due to trying to implement walls
XanderQue May 10, 2018
98f1ae9
resolved multiple conflicts in .meta files
umangmathur92 May 10, 2018
173c92b
food web working on clash attack page as well
umangmathur92 May 10, 2018
9f1ce23
fixed species ecosystem
chiKaRau May 11, 2018
3705356
fixed decay material bug
chiKaRau May 11, 2018
859785c
Merge pull request #16 from umangmathur92/dev-cow-ecosystem2
DamicoS May 11, 2018
a9d908a
deleted old Dem-new-CN
cherylnielsen May 12, 2018
bd50d75
added Dem-new-2018
cherylnielsen May 12, 2018
10c1304
fixing UI
chiKaRau May 12, 2018
d525ae3
Merge pull request #17 from umangmathur92/dev-dem-update
DamicoS May 12, 2018
7a5c5ae
added mini-game MODE_FOODWEB
chiKaRau May 12, 2018
8d05eb3
added MODE_FOODWEB DESCRIPTION
chiKaRau May 12, 2018
6519509
Removed .png
DamicoS May 12, 2018
af011e8
fixed ecosystem
chiKaRau May 13, 2018
290de69
Merge branch 'dev-cow-UIfix2' of https://github.com/umangmathur92/uni…
chiKaRau May 13, 2018
7ea16a1
fixed error
chiKaRau May 13, 2018
5339a94
added Dragable
chiKaRau May 13, 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
e7f1657
Merge pull request #19 from umangmathur92/dev-dem-update
cherylnielsen May 13, 2018
3ec4ade
Replaced errors messages in Attack.cs
DamicoS May 13, 2018
900c43c
disable non-foodweb pbtn
chiKaRau May 13, 2018
3c8e56d
added fire audio
chiKaRau May 13, 2018
9397e31
Merge branch 'dev-cos-TileSystem' of https://github.com/umangmathur92…
dahoang May 13, 2018
5f3c879
added fire bg effect
chiKaRau May 13, 2018
2c9e3b7
readded type priority, is playable
dahoang May 13, 2018
94299d1
Merge branch 'development' of https://github.com/umangmathur92/unity-…
chiKaRau 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
b3a97d5
resolving attack file
cherylnielsen May 13, 2018
6d7a608
removing attack file
cherylnielsen May 13, 2018
1c855f6
Merge pull request #22 from umangmathur92/dev-dem-update
cherylnielsen May 13, 2018
fe1f61f
Merge branch 'development' of https://github.com/umangmathur92/unity-…
chiKaRau May 13, 2018
ebec0e8
minor fix in start function
dahoang May 14, 2018
30c3537
Merge branch 'master' into dev-cos-TileSystem
dahoang May 14, 2018
219f277
removing compile error files
cherylnielsen May 14, 2018
7fd76f1
adjust fire bgeffect
chiKaRau May 14, 2018
a23dd8c
adjust fire bgeffect
chiKaRau May 14, 2018
af5f11a
adding use of 3D animal factory
cherylnielsen May 14, 2018
2722bba
added StartTurn Audio
chiKaRau 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
9a93dc0
added pic
chiKaRau May 14, 2018
c208525
added png
chiKaRau May 14, 2018
1bc2ebd
Merge pull request #23 from umangmathur92/dev-dem-update
DamicoS May 14, 2018
e3c464e
Added all the scenes back into the build settings, removed rex's logi…
DamicoS May 15, 2018
83e892b
broke and fixed player animal attacks
cherylnielsen May 15, 2018
81987ee
Merge branch 'development' of https://github.com/umangmathur92/unity-…
chiKaRau May 15, 2018
666ed2f
Merge branch 'development' into dev-cow-UIfix3
chiKaRau May 15, 2018
85bf8f9
merged development and fixed some bug
chiKaRau May 15, 2018
9428214
Added version 1 of enemy AI attacking other animals & plants
cherylnielsen May 15, 2018
7f909b6
Merge pull request #24 from umangmathur92/dev-cow-UIfix3
DamicoS 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
4f5c3df
added constants for use in UpdateCreditsProtocol
balambouya May 18, 2018
bb46ae5
Merge pull request #26 from umangmathur92/dev-lby-lbyCoWcurrencyInteg…
DamicoS May 19, 2018
3c5f67a
nothing broken
joleong1 May 19, 2018
b4a93e8
This commit caused errors with PlayerAnimalBehavior,
joleong1 May 19, 2018
51fda96
fix for game play
cherylnielsen May 19, 2018
751b035
enhanced player attackes on enemies
cherylnielsen May 19, 2018
894589a
added additional comments for CoS scripts
dahoang May 20, 2018
0178251
merging development in to CoS
dahoang May 20, 2018
977bf9a
Merging master in to CoS
dahoang May 20, 2018
c1547dd
defense set up fix
dahoang May 20, 2018
6695a2f
Credit system is within the pausemenu.
joleong1 May 20, 2018
021dc31
Merge pull request #27 from umangmathur92/dev-cos-TileSystem
DamicoS May 20, 2018
a0c8a6f
Giving credit where it's due
joleong1 May 20, 2018
54124d3
giving credit
joleong1 May 20, 2018
0a2d553
removed file not needed
cherylnielsen May 20, 2018
268c81a
removing unused files and added code comments
cherylnielsen May 20, 2018
5ca05c9
fixxed errors with attacking plants
cherylnielsen May 20, 2018
ae9f29d
Adding meta files, build settings
DamicoS May 20, 2018
2d9983b
Stashing sqlite3.dll.meta
DamicoS May 20, 2018
4365d59
Added DontEatMe-ReadMe file
cherylnielsen May 20, 2018
5d7a152
Merge branch 'dev-dem-update2' of https://github.com/umangmathur92/un…
DamicoS May 20, 2018
6b90ca1
Updated tagmanager
DamicoS May 20, 2018
439a47e
Merge old into new
DamicoS May 20, 2018
e1072d2
Cleaned up build settings
DamicoS May 20, 2018
b88b007
Merge pull request #29 from umangmathur92/dev-dem-update2
DamicoS May 20, 2018
9619921
readme file
cherylnielsen May 21, 2018
6049f48
Changed button to load new Don't Eat Me
DamicoS May 21, 2018
5a00e8e
graph interface changes, including grid lines and removing plot points
ccylau May 21, 2018
b75221c
Add files via upload
joleong1 May 21, 2018
880f050
adding readme file for DEM
joleong1 May 21, 2018
ca3307f
change graph window size, reintroduced mouseover effect on plot lines…
ccylau May 21, 2018
a69f7ac
Merge pull request #31 from umangmathur92/dev-dem-update2
DamicoS May 26, 2018
ac4f291
Merge branch 'development' into lobby-graph
DamicoS May 26, 2018
11217ee
Saving meta files
DamicoS May 26, 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
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
Empty file.
Binary file not shown.
Binary file modified Assets/CWAssets/CWGame.unity
Binary file not shown.
Binary file modified Assets/CWAssets/Images/Materials/attacker_overlay.mat
Binary file not shown.
Binary file added Assets/CWAssets/Images/Materials/hex_stroke.mat
Binary file not shown.
10 changes: 10 additions & 0 deletions Assets/CWAssets/Images/Materials/hex_stroke.mat.meta

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
Binary file not shown.
Binary file added Assets/CWAssets/Resources/Images/Battle/Death.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

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

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

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

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

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

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

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

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

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

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

Binary file not shown.

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

Binary file not shown.

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

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

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

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

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

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

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

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/carnivore.png.meta

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

Loading