Pull request for sample_npc.h, sample_npc.c, genstruct.c, and default_room #639

Open

navila-luna wants to merge 47 commits into

devfrom

openworld/samples-npcs

Commits on May 24, 2020

including npcs in spec room struct and functions
Nicole
committed

Commits on May 25, 2020

made edits to have npc_t struct considered
Nicole
committed

Commits on Jun 1, 2020

lets see
Nicole Avila
committed
saving sample_npc.c
Nicole Avila
committed
Merge remote-tracking branch 'origin/dev' into openworld/samples-npcs
dwahme
committed
slight edits in autogeneration to include npcs
Nicole Avila
committed

Commits on Jun 3, 2020

added npcs in test, need to add room descriptions
Nicole Avila
committed

Commits on Jun 5, 2020

fixed errors in test_structs.c
Nicole Avila
committed
Fixed errors in test_struct
Nicole Avila
committed

Commits on Jun 6, 2020

pushing
Nicole Avila
committed
Merge branch 'dev' of https://github.com/uchicago-cs/chiventure into openworld/samples-npcs
Nicole Avila
committed
fixed merge issues by simply deletin all and replacing it with Bryans working and pr ready tests.
Nicole Avila
committed
look at autogenerate.c for my thought/confusion process
Nicole Avila
committed
revamping npc structure and attempting integration into autogenerate

root
authored and
root
committed
successfully integrated default_npc into autogenerate. need to write tests
Carolina Elizabeth Calderon
committed
fixed merge conflict

root
authored and
root
committed
resolved merge conflicts

root
authored and
root
committed

Commits on Jun 7, 2020

still need to fix test_autogenerate errors
Nicole Avila
committed
Added tests and made default npcs hash-based
Carolina Elizabeth Calderon
committed
Merge pull request #766 from uchicago-cs/openworld/autogenerate-bugs
carolinaecalderon
authored
Fixed final tests
Carolina Elizabeth Calderon
committed
Merge branch 'openworld/samples-npcs' of https://github.com/uchicago-cs/chiventure into openworld/samples-npcs
Carolina Elizabeth Calderon
committed
Editing comments
navila-luna
authored
rm since default_npcs is the updated duplicate
navila-luna
authored
deleting the duplicate of samples-npcs file
Nicole Avila
committed
Merge branch 'openworld/samples-npcs' of https://github.com/uchicago-cs/chiventure into openworld/samples-npcs
Nicole Avila
committed
made some changes, will come back to more space comments
Nicole Avila
committed
went through all suggestions
Nicole Avila
committed
minor changes
Nicole Avila
committed
will fix comment issues in sample npc
Nicole Avila
committed
changes to spaces
navila-luna
authored
added on to comment tests and fixed spelling issue in .c file
Nicole Avila
committed
fixed merge issue
Nicole Avila
committed
made changes in npc functions, need one more fix
Nicole Avila
committed

Commits on Jun 8, 2020