Patrice Vignola 46968948fb Merge branch 'master' of https://github.com/ConjureETS/DeathBook ...

Conflicts:
	Assets/Scripts/Models/Status.cs

2015-08-16 23:42:47 -04:00

..

Models

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 23:42:47 -04:00

ObserverPattern

- More rotation related changes

2015-08-15 23:11:45 -04:00

RatioProgression

- Added the awareness levels and restricted the focus to double clicks on

2015-08-16 03:15:08 -04:00

SimpleJSON

- Added the names generator and improved the person details UI

2015-08-16 16:01:02 -04:00

Link.cs

Implemented color changes for friendship links

2015-08-16 00:43:36 -04:00

Link.cs.meta

- More rotation related changes

2015-08-15 23:11:45 -04:00

loadLevel.cs

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 23:42:47 -04:00

loadLevel.cs.meta

splash script

2015-08-16 12:29:23 -04:00

Models.meta

Skeleton for model classes.

2015-08-11 03:18:31 -04:00

NetworkingSphere.cs

- Added the game timer in the AM/PM format

2015-08-16 22:53:43 -04:00

NetworkingSphere.cs.meta

- Merged the friendship/levelgenerator stuff in the gameplay scene

2015-08-13 14:10:50 -04:00

ObserverPattern.meta

- Started the selection behavior when we click on a person node

2015-08-13 22:02:44 -04:00

PersonDetailsPanel.cs

- Added the names generator and improved the person details UI

2015-08-16 16:01:02 -04:00

PersonDetailsPanel.cs.meta

- Started the UI

2015-08-13 17:20:20 -04:00

PersonNode.cs

Added statuses.

2015-08-16 23:06:37 -04:00

PersonNode.cs.meta

- Merged the person nodes scripts into one Script and added the camera

2015-08-14 00:10:17 -04:00

RatioProgression.meta

- Added the awareness levels and restricted the focus to double clicks on

2015-08-16 03:15:08 -04:00

RecentPostsPanel.cs

- Added the recent posts

2015-08-16 23:38:23 -04:00

RecentPostsPanel.cs.meta

- Added the recent posts

2015-08-16 23:38:23 -04:00

SimpleJSON.meta

- Added the names generator and improved the person details UI

2015-08-16 16:01:02 -04:00

Timer.cs

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

2015-08-16 23:42:47 -04:00

Timer.cs.meta

- Added the game timer in the AM/PM format

2015-08-16 22:53:43 -04:00

TutorialScript.cs

- Fixed the tutorial

2015-08-16 22:09:18 -04:00

TutorialScript.cs.meta

starting the tutorial scene

2015-08-16 16:31:04 -04:00

UIFriendPicture.cs

tutorial completed

2015-08-16 19:12:46 -04:00

UIFriendPicture.cs.meta

- More rotation related changes

2015-08-15 23:11:45 -04:00

WatchArea.cs

- Added the logo and fixed the global awareness bar

2015-08-16 19:01:15 -04:00

WatchArea.cs.meta

- Added the global awareness bar

2015-08-16 16:55:58 -04:00