Skip to content

Feature/encouragement fix#76

Open
mariajsalgadoq wants to merge 64 commits into
pipfile-experimentfrom
feature/encouragement-fix
Open

Feature/encouragement fix#76
mariajsalgadoq wants to merge 64 commits into
pipfile-experimentfrom
feature/encouragement-fix

Conversation

@mariajsalgadoq
Copy link
Copy Markdown

@mariajsalgadoq mariajsalgadoq commented Nov 5, 2025

check again! It shouldnt have any major changes for the last PR

JunHaoChen16 and others added 30 commits November 2, 2025 11:49
@JunHaoChen16
complete basic project setup
c74a5c3
@JunHaoChen16
update ci.yml
4651edb
@JunHaoChen16
Fix CI Python version mismatch
aa2c019
@JunHaoChen16
Fix CI Python version mismatch #2
6615e11
@JunHaoChen16
Fix CI Python version mismatch #3
526ca9d
@JunHaoChen16
Fix CI Python version mismatch #4
0232030
@JunHaoChen16
added basic datamanagement function
4d73409
@JunHaoChen16
update pytest file for dataManagement file
6096930
@JunHaoChen16
Merge pull request #2 from swe-students-fall2025/feature_dataManagement
85ed34a 
added basic datamanagement function
@JunHaoChen16
added core logic of leveling and store time data
8b160c8
@JunHaoChen16
Merge pull request #3 from swe-students-fall2025/feature_petModule_co…
899a627 
…reLogic

added core logic of leveling and store time data
@JunHaoChen16
export functions in init.py
d78bb98
@JunHaoChen16
export functions in init.py and update newest version
b787f7c
@JunHaoChen16
Merge pull request #4 from swe-students-fall2025/feature_petModule_co…
dc4cff3 
…reLogic

update and export functions
@JunHaoChen16
Add StudyPet interaction system and core updates
dc69edd
@JunHaoChen16
Merge pull request #5 from swe-students-fall2025/feature_petModule_in…
f217779 
…teraction

Add StudyPet interaction system and core updates
@catherineyu2014
add additional cases for pet's actions
09f0d11
@catherineyu2014
Merge pull request #6 from swe-students-fall2025/unit_tests
e56e78d 
add additional cases for pet's actions
@catherineyu2014
added unit tests for main
bc44beb
@catherineyu2014
Merge pull request #7 from swe-students-fall2025/unit_tests
5e4fdc1 
added unit tests for main
@LeoFYH
readme update
80cdd86
@LeoFYH
Merge branch 'swe-students-fall2025:pipfile-experiment' into pipfile-…
b2d2627 
…experiment
@Zeba-Shafi
Merge pull request #8 from LeoFYH/pipfile-experiment
7fa3dd7 
readme
@Zeba-Shafi
Readme edits
82482f0
@Zeba-Shafi
Readme edits
d24cdd9
@LeoFYH
renamePet parameter supported
56b4bb9
@LeoFYH
feedPet parameter supported
7038f5e
@LeoFYH
Merge pull request #9 from LeoFYH/pipfile-experiment
6d503da 
feedpet&rename parameter supported
@LeoFYH
Revert "Merge pull request #9 from LeoFYH/pipfile-experiment"
dfbf7f7 
This reverts commit 6d503da, reversing
:wqchanges made to d24cdd9.

:wq# Your branch is up to date with 'origin/pipfile-experiment'.
@Zeba-Shafi
Merge pull request #10 from LeoFYH/pipfile-experiment
5fa7aa1 
Revert "Merge pull request #9 from LeoFYH/pipfile-experiment"
LeoFYH and others added 29 commits November 3, 2025 23:48
@LeoFYH
rename&feed
4e94bef
@Zeba-Shafi
Merge pull request #13 from swe-students-fall2025/feedpet-and-rename(…
6abfbab 
…parameter)

rename&feed
@Zeba-Shafi
added money for task completion
325597f
@LeoFYH
Merge pull request #14 from swe-students-fall2025/feature/task-manage…
973e3d2 
…ment

added money for task completion
@Zeba-Shafi
intial edits
62c6000
@Zeba-Shafi
edits
80301b4
@Zeba-Shafi
checked tests
1fc7c2c
@Zeba-Shafi
edit assertion in test
82f4a79
@Zeba-Shafi
edit test
0b68ee8
@Zeba-Shafi
edit tests
2140f56
@Zeba-Shafi
Merge pull request #15 from swe-students-fall2025/feature/pet-to-ball…
e4cbbeb 
…-python

Feature/pet to ball python
@Zeba-Shafi
added additions to readme + build instructions
a140c39
@Zeba-Shafi
added example.py
0acf257
@Zeba-Shafi
Merge pull request #16 from swe-students-fall2025/readme-refactor-bui…
b1b98da 
…ld-workflow

added additions to readme + build instructions
@catherineyu2014
updated dictonary key errors
f897ee7
@LeoFYH
Merge pull request #17 from swe-students-fall2025/example_fix
a0d6fd7 
updated dictonary key errors
Feat: Add get_encouragement function to pet
a176a84
Fix: Export get_encouragement from pet module
2f14e7c
Fix: Correctly export all functions from pet module
1b4b558
Fix: Export functions and add snake phrases
d88f424
@Zeba-Shafi
Merge pull request #18 from swe-students-fall2025/feature/encouragement
4f8c5da 
Feat: Add get_encouragement function to pet
Fix: Correct imports, add docs, and update snake phrases
391a217
@Zeba-Shafi
Revert "Feat: Add get_encouragement function to pet"
51112ea
@Zeba-Shafi
Merge pull request #19 from swe-students-fall2025/revert-18-feature/e…
5278b81 
…ncouragement

Revert "Feat: Add get_encouragement function to pet"
@catherineyu2014
Update PyPI link to test version
c0768d6
@Zeba-Shafi
Merge pull request #20 from swe-students-fall2025/feature/encouragement
db1199b 
Fix: Correct imports, add docs, and update snake phrases
@Zeba-Shafi
Merge pull request #21 from swe-students-fall2025/update-pypi
e03445e 
Update PyPI link to test version
Feat: Add get_encouragement with all fixes, docs, and snake phrases
c0a78a6
@Zeba-Shafi
Merge branch 'pipfile-experiment' into feature/encouragement-fix
d1f2813
@Zeba-Shafi Zeba-Shafi deleted the feature/encouragement-fix branch November 5, 2025 14:43
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.

5 participants

@mariajsalgadoq @JunHaoChen16 @catherineyu2014 @LeoFYH @Zeba-Shafi