Skip to content

Add ability to collect resources #38

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

Merged
merged 63 commits into from
Mar 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
66b22d1
Garbage commit
nucleartide Mar 23, 2023
f61f385
Update SOP
nucleartide Mar 23, 2023
68677a5
Update template
nucleartide Mar 23, 2023
61585b4
Update PR template
nucleartide Mar 23, 2023
431214f
Update template
nucleartide Mar 23, 2023
65578d8
Update PlayerInputActions with Collect action
nucleartide Mar 23, 2023
80bfe85
Add `GetCollect` to game input manager
nucleartide Mar 23, 2023
45a580f
Rename script
nucleartide Mar 23, 2023
c05e4f5
Add simple state pattern
nucleartide Mar 23, 2023
511473b
Comment out compile error for now
nucleartide Mar 23, 2023
b5f3c5b
Add more todos
nucleartide Mar 23, 2023
bc25281
Fill in Resource implementation
nucleartide Mar 23, 2023
50c2716
Destroy resource when depleted
nucleartide Mar 23, 2023
901d35d
Hook up E input
nucleartide Mar 23, 2023
4a89a2f
Add todo
nucleartide Mar 23, 2023
17aaff8
Face resource being collected
nucleartide Mar 24, 2023
559d794
Add todos for tomorrow
nucleartide Mar 24, 2023
007fec9
Rotate faster toward current target
nucleartide Mar 24, 2023
d9560db
Prevent movement when mining/collecting
nucleartide Mar 24, 2023
8380f5b
Get rid of todo
nucleartide Mar 24, 2023
963510e
Release E to stop collecting
nucleartide Mar 24, 2023
a1aca2a
Implement more behavior
nucleartide Mar 24, 2023
6241ea5
Update PR template
nucleartide Mar 26, 2023
24ae9c2
Fix horizontal speed update
nucleartide Mar 26, 2023
4a6c80c
Add note
nucleartide Mar 26, 2023
61abcc3
Update astronaut animation state machine
nucleartide Mar 27, 2023
1cddeb3
Omg
nucleartide Mar 27, 2023
3589f87
Show mining animation
nucleartide Mar 27, 2023
0f8232f
Add custom inspector for state machines
nucleartide Mar 27, 2023
c2a1110
Update
nucleartide Mar 27, 2023
69e9384
Add todo
nucleartide Mar 27, 2023
2f1ad8a
Update todo
nucleartide Mar 27, 2023
437bb42
Add boilerplate for supporting multiple collect animations
nucleartide Mar 28, 2023
a28d4ab
Hook up chopping animation
nucleartide Mar 28, 2023
ccd0dbd
Correct axe orientation
nucleartide Mar 28, 2023
51d9556
Update Mecanim state machine
nucleartide Mar 28, 2023
2c4e8bd
Add water bottle to PlayerTool script
nucleartide Mar 28, 2023
71a458c
Document animation workflow
nucleartide Mar 28, 2023
8f8b75e
Update PR template
nucleartide Mar 28, 2023
98cad02
Add Incompetech Manor soundtrack
nucleartide Mar 28, 2023
270dd6c
Add stopping point
nucleartide Mar 28, 2023
21c252f
Hide outlines and E when player is collecting
nucleartide Mar 29, 2023
48d095f
Some PR cleanup
nucleartide Mar 29, 2023
1a8d40a
Some test file renaming
nucleartide Mar 29, 2023
7466210
Clean up StateMachineBehaviour
nucleartide Mar 29, 2023
963c8d9
Comments
nucleartide Mar 29, 2023
757f383
Moving files around
nucleartide Mar 29, 2023
fdbc414
Clean up enum and enum value framework
nucleartide Mar 29, 2023
0d249b7
Add comment
nucleartide Mar 29, 2023
4dccc3a
Update comment
nucleartide Mar 29, 2023
1e1b0b5
Update comments
nucleartide Mar 29, 2023
c2afa3a
Refactor overly complicated mapping
nucleartide Mar 29, 2023
2dfc9b0
Clean up template
nucleartide Mar 30, 2023
0441f29
Clean up Debug.Log statements
nucleartide Mar 30, 2023
3ef6eac
Move StateMachineBehaviourEditor into right folder
nucleartide Mar 30, 2023
fd3dbc6
Make scene a list of prefabs
nucleartide Mar 30, 2023
5f4be42
Add ThirdPartyModel script
nucleartide Mar 30, 2023
7f13e83
More project structure cleanup
nucleartide Mar 30, 2023
f13021a
Move packages into Plugins/
nucleartide Mar 30, 2023
85180eb
Update PR templates
nucleartide Mar 30, 2023
61ead01
Update process
nucleartide Mar 30, 2023
4c69f0c
Update template
nucleartide Mar 30, 2023
d9c888c
Update readme
nucleartide Mar 30, 2023
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
13 changes: 13 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/add_a_player_animation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## How to add a new player animation

Roughly...

- [ ] procuring animations (find on asset store)
- [ ] update mecanim state machine
- [ ] create new StateBehaviour and add to Player
- [ ] update player state machine
- [ ] update resource config
- [ ] make a new PlayerState enum
- [ ] assign to resource config
- [ ] update player animator's list of animation enums
- [ ] update player tool script to add tool
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
...
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
## Job Story
## The Job Story

> **Player**: When <code>X</code>, I want to <code>Y</code>, so that <code>Z</code>.
<details>
<summary>
<strong>Player</strong>: When <code>X</code>, I want to <code>Y</code>, so that <code>Z</code>.
</summary>

### Notion

Expand All @@ -10,11 +13,24 @@

> *(link goes here)*

### Deliberate Practice

> Write down one skill that you'd like to improve in this pull request.
>
> **Examples**: Knowledge of a package. A sub-skill, such as creating particle effects. Putting in more hours (effort). Working more efficiently. Time estimation.

> *I want to...*

### Development Checklist

> Run through the following steps to complete your work.

* [ ] **First draft**. Implement a working first pass at the problem. Try to think modularly, and think of which prefab piece you will modify versus the entire scene.
* [ ] **Product requirements and game design**. Flesh these out in the corresponding Notion block. Make sure to consider:
* [ ] **Model**. What is the user story? (See above.)
* [ ] **Action**. How does the player perform actions? What inputs are needed?
* [ ] **Rules**. The underlying mechanics.
* [ ] **Feedback**. The sensory feedback presented to the player.
* [ ] **First draft**. Implement a working first pass at the problem. Try to think in modules: modify prefabs instead of the entire scene.
* [ ] **Final draft**. Once done, perform a general review of `Files changed` and revise anything that needs to be cleaned up.

### Quality Assurance Checklist
Expand All @@ -26,6 +42,8 @@
* [ ] **Debuggable**. Do you have debug views for the prefabs/systems that you are creating?
* [ ] **Learnable**. Consider how the player will learn what you implement in this pull request. Are the affordances appropriately communicated with signifiers?

</details>

## Screen Recording

> Record a quick 5 to 10 second clip of your feature in action.
Expand All @@ -42,7 +60,7 @@

> Explain what you did, how you did it, and why you did it. Discuss any lessons that might be useful to others.
>
> (Note to self: it's easiest to do a stream-of-consciousness write-up of what you did.)
> (Note to self: it's easiest to do a stream-of-consciousness write-up of what you did. Remember to write for the *Game Codebase Tour* audience!)

...

Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,13 @@ sysinfo.txt
# Crashlytics generated file
crashlytics-build.properties

# Third-party stuff that is too big to commit to version control.
# Third-party stuff that is too big to commit to version control,
# or shouldn't be exposed publicly because of license clauses.
Assets/Plugins/ADG_Textures/
Assets/Plugins/Ciathyza/
Assets/Plugins/Kevin Iglesias/
Assets/Plugins/Kevin Iglesias More/
Assets/Plugins/polyperfect/
Assets/Plugins/ADG_Textures/

# Mac stuff.
.DS_Store
Expand Down
Loading