Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Hired Escorts reimplemented as Hireable Vagabonds with mini-personalities #2152

Open
wants to merge 67 commits into
base: main
Choose a base branch
from
Open

Hired Escorts reimplemented as Hireable Vagabonds with mini-personalities #2152

wants to merge 67 commits into from

Commits on Jun 30, 2022

  1. Add files via upload

    @ThrosturX
    ThrosturX committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    e03d599 View commit details
    Browse the repository at this point in the history

  2. Update scavenger_event.lua

    @ThrosturX
    ThrosturX committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    9bbf3c0 View commit details
    Browse the repository at this point in the history

  3. Update faction.xml

    @ThrosturX
    ThrosturX committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    ff7be69 View commit details
    Browse the repository at this point in the history

  4. Add files via upload

    @ThrosturX
    ThrosturX committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    9af6b90 View commit details
    Browse the repository at this point in the history

  5. Add files via upload

    @ThrosturX
    ThrosturX committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    34e7e08 View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @ThrosturX
    ThrosturX committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    bda543a View commit details
    Browse the repository at this point in the history

  7. Add files via upload

    @ThrosturX
    ThrosturX committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    46cd412 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Update scavenger_event.lua 

    more chatter and some other extra stuff
    @ThrosturX
    ThrosturX committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    e6aefbb View commit details
    Browse the repository at this point in the history

  2. Add files via upload 

    "interesting" but somewhat generic pilot names
    @ThrosturX
    ThrosturX committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    4cc214b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    ada96e4 View commit details
    Browse the repository at this point in the history

  4. Update wrapper.lua

    @ThrosturX
    ThrosturX committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    eaa6548 View commit details
    Browse the repository at this point in the history

  5. Update escort.lua

    @ThrosturX
    ThrosturX committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    0a5243b View commit details
    Browse the repository at this point in the history

  6. Update escort.lua 

    right file this time
    @ThrosturX
    ThrosturX committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    419d1a8 View commit details
    Browse the repository at this point in the history

  7. Update scavenger_event.lua 

    minor fixes based on feedback
    @ThrosturX
    ThrosturX committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    47d789e View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    88dc772 View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    9f638f3 View commit details
    Browse the repository at this point in the history

  3. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    bc6aa8a View commit details
    Browse the repository at this point in the history

  4. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    fc12498 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    ca79441 View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    7eddc56 View commit details
    Browse the repository at this point in the history

  3. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    373d9b7 View commit details
    Browse the repository at this point in the history

  4. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    3ec765a View commit details
    Browse the repository at this point in the history

  5. Delete escort.lua

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    b77cf6d View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    0f1196f View commit details
    Browse the repository at this point in the history

  7. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    fdf688f View commit details
    Browse the repository at this point in the history

  8. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    ea6bb81 View commit details
    Browse the repository at this point in the history

  9. Update wrapper.lua

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    8cd1beb View commit details
    Browse the repository at this point in the history

  10. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    ebb7973 View commit details
    Browse the repository at this point in the history

  11. Add files via upload 

    hopefully fixed can't fire commander bug
    @ThrosturX
    ThrosturX committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    5918050 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    ac8ccb2 View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    3f8b957 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2022

  1. Create placeholder.png

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    e2c7b9c View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    06b65bb View commit details
    Browse the repository at this point in the history

  3. Delete dat/gui/gfx/portraits/neutral/unique directory

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    f1fc17d View commit details
    Browse the repository at this point in the history

  4. Create placeholder.png

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    322e22e View commit details
    Browse the repository at this point in the history

  5. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    79bf216 View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    0c76dd4 View commit details
    Browse the repository at this point in the history

  7. Create escort_menu.png

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    02b0e34 View commit details
    Browse the repository at this point in the history

  8. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    5776c85 View commit details
    Browse the repository at this point in the history

  9. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    9a08cba View commit details
    Browse the repository at this point in the history

  10. Add files via upload

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    f0df05c View commit details
    Browse the repository at this point in the history

  11. hopefully all the changes

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    43ab692 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    d9f8735 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #1 from naev/main 

    fetch
    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    9319b62 View commit details
    Browse the repository at this point in the history

  14. typos mostly

    @ThrosturX
    ThrosturX committed Jul 10, 2022
    Configuration menu
    Copy the full SHA
    02507e6 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    0878b2c View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    b5bfa4d View commit details
    Browse the repository at this point in the history

  2. mem.autoleader

    @ThrosturX
    ThrosturX committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    4a513fc View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. various fixes and improvements

    @ThrosturX
    ThrosturX committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    d42d046 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    659a2ab View commit details
    Browse the repository at this point in the history

  3. fix wrong portrait bug

    @ThrosturX
    ThrosturX committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    3c00ab1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ThrosturX-escorts' of https://github.com/ThrosturX/naev … 

    …into ThrosturX-escorts
    @ThrosturX
    ThrosturX committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    dc1691f View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    6012bb9 View commit details
    Browse the repository at this point in the history

  2. minor fixes

    @ThrosturX
    ThrosturX committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    3021826 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    e066129 View commit details
    Browse the repository at this point in the history

  2. Update human.lua

    @ThrosturX
    ThrosturX committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    122774d View commit details
    Browse the repository at this point in the history

  3. Update artwork

    @ThrosturX
    ThrosturX committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    dd7e4a7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ThrosturX-escorts' of https://github.com/ThrosturX/naev … 

    …into ThrosturX-escorts
    @ThrosturX
    ThrosturX committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    a53b188 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. fix some luacheck errors

    @ThrosturX
    ThrosturX committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    ebaf737 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    dfc2b38 View commit details
    Browse the repository at this point in the history

  3. more luacheck stuff 

    and tabs converted to 3 spaces
    @ThrosturX
    ThrosturX committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    3a09aa1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ThrosturX-escorts' of https://github.com/ThrosturX/naev … 

    …into ThrosturX-escorts
    @ThrosturX
    ThrosturX committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    7ebdbfd View commit details
    Browse the repository at this point in the history

  5. Update scavenger_event.lua

    @ThrosturX
    ThrosturX committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    8d6f66e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    c8ffdc1 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    b41e1fa View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2022

  1. outfits -> outfitsList

    @ThrosturX
    ThrosturX committed Aug 14, 2022
    Configuration menu
    Copy the full SHA
    3a0b521 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'naev:main' into ThrosturX-escorts

    @ThrosturX
    ThrosturX committed Aug 14, 2022
    Configuration menu
    Copy the full SHA
    d0ebe6e View commit details
    Browse the repository at this point in the history