Skip to content
Jump to bottom

Merge pull request #1 from bordasb/master #2

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open

Merge pull request #1 from bordasb/master #2

wants to merge 81 commits into from

Commits on Feb 12, 2018

  1. Merge pull request #1 from bordasb/master 

    pulling to dev to be up to date
    @bordasb
    bordasb committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    bc6df43 View commit details
    Browse the repository at this point in the history

  2. Checking stuff out

    bordasb committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    804f9b7 View commit details
    Browse the repository at this point in the history

  3. testing

    bordasb committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    eb00df2 View commit details
    Browse the repository at this point in the history

  4. test commit

    baguideh committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    111e3b8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    bordasb committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    653686e View commit details
    Browse the repository at this point in the history

  6. Main file for the game, currently only contains 1/5 Chapters

    baguideh committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    36e04af View commit details
    Browse the repository at this point in the history

  7. deleted empty and unnecessary files

    bordasb committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    5952538 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    bordasb committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    7ed7c3e View commit details
    Browse the repository at this point in the history

  9. Character Class, needed if you need the character stats

    baguideh committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    e7e2ed4 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    bordasb committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    30668cb View commit details
    Browse the repository at this point in the history

  2. Added Battle System

    baguideh committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    447d54c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    bordasb committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    5bebe61 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. Finished battle system

    baguideh committed Feb 19, 2018
    Configuration menu
    Copy the full SHA
    57ef066 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Added a Game Over system

    baguideh committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    27104e2 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. started out sqlite

    bordasb committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    02a3ad8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    bordasb committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    51c7482 View commit details
    Browse the repository at this point in the history

  3. made players, weapons, and armory tables

    bordasb committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    1e9a92b View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

  1. this is shuvas

    rayamajs committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    f00d212 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    rayamajs committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    37cd7ca View commit details
    Browse the repository at this point in the history

  3. Create Desert_Story.cpp

    @osickaa
    osickaa committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    4cda045 View commit details
    Browse the repository at this point in the history

  4. fixed a major bug

    baguideh committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    355dd62 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2018

  1. Create ForestChapter(shuvas).cpp

    @rayamajs
    rayamajs committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    a6156bd View commit details
    Browse the repository at this point in the history

  2. Fixed a Major bug

    baguideh committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    fb235e2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev

Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Project_Witch_Hunt into dev

X
G
    baguideh committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    644193f View commit details
    Browse the repository at this point in the history

  4. Fixed a Major bug

    baguideh committed Mar 10, 2018
    Configuration menu
    Copy the full SHA
    96b71d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. Update Desert_Story.cpp

    @osickaa
    osickaa committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    561b089 View commit details
    Browse the repository at this point in the history

  2. Update Desert_Story.cpp

    @osickaa
    osickaa committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    0e8a89e View commit details
    Browse the repository at this point in the history

  3. Added disclaimer and fixed a bug

    baguideh committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    f04b9f6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    baguideh committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    f7202bf View commit details
    Browse the repository at this point in the history

  5. Added disclaimer and fixed a bug

    baguideh committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    5fb11b6 View commit details
    Browse the repository at this point in the history

  6. Create forestChapterStory(shuvas)

    @rayamajs
    rayamajs committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    1502d9f View commit details
    Browse the repository at this point in the history

  7. Delete ForestChapter(shuvas).cpp

    @rayamajs
    rayamajs committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    2b53248 View commit details
    Browse the repository at this point in the history

  8. Update Desert_Story.cpp 

    Added battle system(copied and pasted)
    @osickaa
    osickaa committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    9deb4e8 View commit details
    Browse the repository at this point in the history

  9. Update Desert_Story.cpp 

    Deleted battle system
    @osickaa
    osickaa committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    5810f2d View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. database updates

    bordasb committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    b287327 View commit details
    Browse the repository at this point in the history

  2. updated database code

    bordasb committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    321cb33 View commit details
    Browse the repository at this point in the history

  3. Delete asd.txt

    @bordasb
    bordasb committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    1d9c452 View commit details
    Browse the repository at this point in the history

  4. sigh

    baguideh committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    9ddd13b View commit details
    Browse the repository at this point in the history

  5. sigh

    baguideh committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    ef0a909 View commit details
    Browse the repository at this point in the history

  6. Update database.cpp

    @rayamajs
    rayamajs committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    0ac8700 View commit details
    Browse the repository at this point in the history

  7. Update database.cpp

    @rayamajs
    rayamajs committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    27debc7 View commit details
    Browse the repository at this point in the history

  8. Update database.cpp

    @rayamajs
    rayamajs committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    5e7f3f8 View commit details
    Browse the repository at this point in the history

  9. Rename forestChapterStory(shuvas) to forestChapter(shuvas).cpp

    @rayamajs
    rayamajs committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    17f2221 View commit details
    Browse the repository at this point in the history

  10. Delete three.cpp

    @rayamajs
    rayamajs committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    ba72c11 View commit details
    Browse the repository at this point in the history

  11. added SQL

    baguideh committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    0ee4e2e View commit details
    Browse the repository at this point in the history

  12. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    baguideh committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    8d9135e View commit details
    Browse the repository at this point in the history

  13. added SQL

    baguideh committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    b04ac0d View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. added database methods

    bordasb committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    e70543a View commit details
    Browse the repository at this point in the history

  2. deleted unnecessary Database.h file

    bordasb committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    1a08cba View commit details
    Browse the repository at this point in the history

  3. added machete and check for machete to database

    bordasb committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    6ac874a View commit details
    Browse the repository at this point in the history

  4. added key and chip

    bordasb committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    d8a97c5 View commit details
    Browse the repository at this point in the history

  5. hamza stuff

    Hamza Mahmood committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    186ae69 View commit details
    Browse the repository at this point in the history

  6. added assign methods for machete, key, and chip

    bordasb committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    d3c2be0 View commit details
    Browse the repository at this point in the history

  7. added my file - shuvas

    rayamajs committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    d39dddd View commit details
    Browse the repository at this point in the history

  8. small change

    rayamajs committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    8450324 View commit details
    Browse the repository at this point in the history

  9. my file

    Hamza Mahmood committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    4e444dc View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    Hamza Mahmood committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    666ea70 View commit details
    Browse the repository at this point in the history

  11. Create desert_story1.cpp 

    Alicja's code latest version
    @osickaa
    osickaa committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    81fff47 View commit details
    Browse the repository at this point in the history

  12. added more database functions

    bordasb committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    addce95 View commit details
    Browse the repository at this point in the history

  13. renamed desert_story1.cpp to desert_story.cpp

    bordasb committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    f7c1bbc View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

  1. bugfixes for database code

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    2ef4f21 View commit details
    Browse the repository at this point in the history

  2. fixed indentation in game.cpp

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    d002b52 View commit details
    Browse the repository at this point in the history

  3. added getplayerlevel and levelupplayer methods

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    ce13358 View commit details
    Browse the repository at this point in the history

  4. Update game.cpp

    @oommens
    oommens committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    5c31057 View commit details
    Browse the repository at this point in the history

  5. fixes in database.cpp, added miles.cpp, osg.cpp

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    699c8c6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' of https://github.coventry.ac.uk/bordasb/f5OSG_Pro… 

    …ject_Witch_Hunt into dev
    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    c459afa View commit details
    Browse the repository at this point in the history

  7. Update shuvas.cpp

    @rayamajs
    rayamajs committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    0eecb23 View commit details
    Browse the repository at this point in the history

  8. Update shuvas.cpp

    @rayamajs
    rayamajs committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    6c14e0e View commit details
    Browse the repository at this point in the history

  9. Update and rename desert_story.cpp to desert_story_alicja.cpp 

    added database connections
    @osickaa
    osickaa committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    fa97081 View commit details
    Browse the repository at this point in the history

  10. new and improved

    @mahmo199
    mahmo199 committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    f40da70 View commit details
    Browse the repository at this point in the history

  11. updates to the database

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    30f4a85 View commit details
    Browse the repository at this point in the history

  12. added main.cpp, about to put everything together

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    93af25a View commit details
    Browse the repository at this point in the history

  13. created header files and compiled database and Alicjas code

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    cac5ee0 View commit details
    Browse the repository at this point in the history

  14. deleted unnecessary screenshots of tables

    bordasb committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    2de4bed View commit details
    Browse the repository at this point in the history

  15. Update main.cpp 

    Small update to handle negative numbers
    @osickaa
    osickaa committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    b0fae06 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2018

  1. put Hamzas code into project, created header for it

    bordasb committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    451ed18 View commit details
    Browse the repository at this point in the history

  2. added Shuvas code to main.cpp, created shuvas.h

    bordasb committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    19ffc51 View commit details
    Browse the repository at this point in the history

  3. added Miles code

    bordasb committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    0146f01 View commit details
    Browse the repository at this point in the history

  4. added zero limit to database, need to fix playerID in all files

    bordasb committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    44e80ae View commit details
    Browse the repository at this point in the history

  5. fixed sqliteFile and playerID

    bordasb committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    e304ea7 View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @oommens
    oommens committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    ac267dc View commit details
    Browse the repository at this point in the history