-
Notifications
You must be signed in to change notification settings - Fork 0
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
Feedback branch #46
base: feedback
Are you sure you want to change the base?
Feedback branch #46
Commits on Jan 25, 2021
-
Add basic files, including confituration files and package.json (#1)
* Add basic files, including confituration files and package.json * Delete index.js content
Configuration menu - View commit details
-
Copy full SHA for 04ce016 - Browse repository at this point
Copy the full SHA 04ce016View commit details -
MNG-73 Add workflow for gh-pages (#2)
Should work on master as Ola added package.json in different task.
Configuration menu - View commit details
-
Copy full SHA for 42b9376 - Browse repository at this point
Copy the full SHA 42b9376View commit details
Commits on Jan 26, 2021
-
MNG-77_SetupSASSforProject (#3)
* Add scss files * Import files to app.scss and add placeholders * Add mixin to responsive-view * Change config import order * Add comments to files * Add mixin to config file
Configuration menu - View commit details
-
Copy full SHA for e18cd6e - Browse repository at this point
Copy the full SHA e18cd6eView commit details -
MNG-87-add images and fonts to project (#4)
* MNG-87-add images and fonts to project * MNG-87 add images rename images, fix one typo from styles > sass config file, deleted bellota Text font - can be add from google fonts with @import
Configuration menu - View commit details
-
Copy full SHA for 6521410 - Browse repository at this point
Copy the full SHA 6521410View commit details
Commits on Jan 28, 2021
-
styled loading page added fonts addes variables - colors and some mixins
Configuration menu - View commit details
-
Copy full SHA for 1bbc28d - Browse repository at this point
Copy the full SHA 1bbc28dView commit details -
MNG-83 Add the Pokemon class (#5)
* Add the Pokemon class * Fix getters and setters in Pokemon Class * Change getters into functions, remove isAlive key, add readonly to some keys * Fix Pokemon.subtractHP method * Change pokemonType to PokemonType
Configuration menu - View commit details
-
Copy full SHA for 36d9be3 - Browse repository at this point
Copy the full SHA 36d9be3View commit details
Commits on Jan 29, 2021
-
fixed variable names added transition added template placeholders for diffrent views to html
Configuration menu - View commit details
-
Copy full SHA for b8b10df - Browse repository at this point
Copy the full SHA b8b10dfView commit details -
Merge pull request #6 from lukaszdutka/MNG-76-loading-page
MNG-76 Create Loading Page
Configuration menu - View commit details
-
Copy full SHA for 69ae587 - Browse repository at this point
Copy the full SHA 69ae587View commit details
Commits on Feb 1, 2021
-
* Add template for starting page * Add basic styling to starting page * Pre-position the elements * Change color names * Style info buttons * Style header * Add button hover class * Add hover to start btn * Add template for info modal * Add placeholder attribute to input field * Add styling for responsive view * Adjust index.html * Resolve conflicts * Correct responsive view
Configuration menu - View commit details
-
Copy full SHA for 1c62f91 - Browse repository at this point
Copy the full SHA 1c62f91View commit details
Commits on Feb 3, 2021
-
MNG-82 create player class (#8)
* add Player class * type of list of pokemons * Protection against bad data * length of name * add new method + add activePokemon value + add alivePokemons array * Corrections
Configuration menu - View commit details
-
Copy full SHA for f3e3433 - Browse repository at this point
Copy the full SHA f3e3433View commit details -
Mng 81 add pokemon choosing screen (#9)
* Add basic choose view css and html * Add responsievness * Comment out the script that makes the choose pokemon page visible * Improve choosing page layout * merge with master * Fix choose view height
Configuration menu - View commit details
-
Copy full SHA for 54b5fb1 - Browse repository at this point
Copy the full SHA 54b5fb1View commit details
Commits on Feb 4, 2021
-
* Create fightClass * Add test for fight class * MNG-90 91 Fix tests and run the project with webpack server * MNG-85 Fix test error
Configuration menu - View commit details
-
Copy full SHA for ec4e716 - Browse repository at this point
Copy the full SHA ec4e716View commit details
Commits on Feb 5, 2021
-
MNG-79 fight view template (#13)
* MNG-79 fight view for mobile initially * MNG-79 added responsive for desktop
Configuration menu - View commit details
-
Copy full SHA for a3d60cb - Browse repository at this point
Copy the full SHA a3d60cbView commit details
Commits on Feb 7, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 4bd134c - Browse repository at this point
Copy the full SHA 4bd134cView commit details -
* MNG-84 Add pokemon data, import json and correct abstract class * MNG-84 Finish pokemon factory * MNG-84 Pokemon factory test and class corrections
Configuration menu - View commit details
-
Copy full SHA for 50d9ff8 - Browse repository at this point
Copy the full SHA 50d9ff8View commit details -
MNG-92 MNG-93 Set timeOut for showing the starting page, add event li…
…stener to the … (#11) * Set timeOut for showing the starting page, add event listener to the info button, fix some css for starting page * Add the exitButton variable in showAPopUpScreen.ts * Change the approach to rendering the starting page, change btn into button * Change repeting ID * Change modal functions and make app variable scoped * Delete empty rulesets * Fix hiding modal and function names
Configuration menu - View commit details
-
Copy full SHA for 2d25dbd - Browse repository at this point
Copy the full SHA 2d25dbdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5a2b7b3 - Browse repository at this point
Copy the full SHA 5a2b7b3View commit details -
Configuration menu - View commit details
-
Copy full SHA for cda6db2 - Browse repository at this point
Copy the full SHA cda6db2View commit details -
MNG-88_StartButtonActivation (#12)
* Add keyup to input * Add activateStart.ts * Uncomment html * Add class to activate/disable start button * Add activateStartButton function * Change class name to button-enabled
Configuration menu - View commit details
-
Copy full SHA for b8f5490 - Browse repository at this point
Copy the full SHA b8f5490View commit details -
Configuration menu - View commit details
-
Copy full SHA for d0489f4 - Browse repository at this point
Copy the full SHA d0489f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for e43e43d - Browse repository at this point
Copy the full SHA e43e43dView commit details -
MNG-89 clicking start should render choose pokemon screen (#17)
* Function RenderChoosePokemonScreen * Appendig function to the whole index.ts * Corrections
Configuration menu - View commit details
-
Copy full SHA for b0b3a0f - Browse repository at this point
Copy the full SHA b0b3a0fView commit details
Commits on Feb 8, 2021
-
MNG-95 Add GameHandler class (#14)
* Add GameHandler class * Fix GameHandler class and add tests * Fix tests
Configuration menu - View commit details
-
Copy full SHA for 3a67f72 - Browse repository at this point
Copy the full SHA 3a67f72View commit details -
MNG-107 Add geodude instead of tentacruel
Filter moves to 4 for each pokemon Use mostly pokemon type moves
Configuration menu - View commit details
-
Copy full SHA for fd852ef - Browse repository at this point
Copy the full SHA fd852efView commit details -
Merge pull request #18 from lukaszdutka/MNG-107-Poke-data-corrections
MNG-107 Add geodude instead of tentacruel
Configuration menu - View commit details
-
Copy full SHA for 6ab1f86 - Browse repository at this point
Copy the full SHA 6ab1f86View commit details -
MNG-103 choose pokemon system (#19)
* Add choosePokemonsPage.ts * Add all functions for choose pokemon page * Change event.target, loading time
Configuration menu - View commit details
-
Copy full SHA for b3ee751 - Browse repository at this point
Copy the full SHA b3ee751View commit details
Commits on Feb 10, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 1a80fae - Browse repository at this point
Copy the full SHA 1a80faeView commit details -
> created menu and back button with options. Options need to be fixed (now are default). Animation also needs to look better
Configuration menu - View commit details
-
Copy full SHA for a866dd0 - Browse repository at this point
Copy the full SHA a866dd0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7de69d4 - Browse repository at this point
Copy the full SHA 7de69d4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5410f15 - Browse repository at this point
Copy the full SHA 5410f15View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9c2d5b0 - Browse repository at this point
Copy the full SHA 9c2d5b0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5e6471d - Browse repository at this point
Copy the full SHA 5e6471dView commit details
Commits on Feb 11, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 5d1336c - Browse repository at this point
Copy the full SHA 5d1336cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 80e3d48 - Browse repository at this point
Copy the full SHA 80e3d48View commit details -
Merge pull request #21 from lukaszdutka/MNG-99&MNG-100-modals-for-act…
…ion-buttons MNG-99 & MNG-100
Configuration menu - View commit details
-
Copy full SHA for 05ecc60 - Browse repository at this point
Copy the full SHA 05ecc60View commit details -
Configuration menu - View commit details
-
Copy full SHA for c52b5c9 - Browse repository at this point
Copy the full SHA c52b5c9View commit details -
Configuration menu - View commit details
-
Copy full SHA for c69aec4 - Browse repository at this point
Copy the full SHA c69aec4View commit details -
Configuration menu - View commit details
-
Copy full SHA for b3e7d74 - Browse repository at this point
Copy the full SHA b3e7d74View commit details -
Merge pull request #23 from lukaszdutka/MNG-89---Clicking-Start-shoul…
…d-render-ChoosePokemonScreen Mng 89 clicking start should render choose pokemon screen
Configuration menu - View commit details
-
Copy full SHA for 53dbfb9 - Browse repository at this point
Copy the full SHA 53dbfb9View commit details -
MNG-98 Add useMango to gameHandler class (#22)
* Add useMango to gameHandler class * corrections type of mango value * Corrections * useMango i PlayerClass Co-authored-by: AleksandraCyp <73715885+AleksandraCyp@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 15911f8 - Browse repository at this point
Copy the full SHA 15911f8View commit details -
MNG-97 MNG-101 change player&change pokemon (#24)
* Add switch pokemon and switch Player game handler methods * Implement mango, change the structure (build up magic function) * remove an unnecessary comment
Configuration menu - View commit details
-
Copy full SHA for 3a9d23b - Browse repository at this point
Copy the full SHA 3a9d23bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 353dae6 - Browse repository at this point
Copy the full SHA 353dae6View commit details -
Configuration menu - View commit details
-
Copy full SHA for a80716b - Browse repository at this point
Copy the full SHA a80716bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c21a1da - Browse repository at this point
Copy the full SHA c21a1daView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7d47b29 - Browse repository at this point
Copy the full SHA 7d47b29View commit details -
Configuration menu - View commit details
-
Copy full SHA for e01d490 - Browse repository at this point
Copy the full SHA e01d490View commit details -
Configuration menu - View commit details
-
Copy full SHA for 87dc9de - Browse repository at this point
Copy the full SHA 87dc9deView commit details -
Configuration menu - View commit details
-
Copy full SHA for b33fa6a - Browse repository at this point
Copy the full SHA b33fa6aView commit details -
added some animations to FightPage
default (start) Pokemons border for active Player
Configuration menu - View commit details
-
Copy full SHA for 6bb6cf1 - Browse repository at this point
Copy the full SHA 6bb6cf1View commit details
Commits on Feb 12, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 1ef7da3 - Browse repository at this point
Copy the full SHA 1ef7da3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 243c24b - Browse repository at this point
Copy the full SHA 243c24bView commit details -
MNG-102 finish fight implementation (#16)
* Function RenderChoosePokemonScreen * MNG-102 fight method implemented * MNG-102 Add tests for fight class. Fix pokemon subtract HP * Appendig function to the whole index.ts * MNG-88_StartButtonActivation (#12) * Add keyup to input * Add activateStart.ts * Uncomment html * Add class to activate/disable start button * Add activateStartButton function * Change class name to button-enabled * Corrections * MNG-89 clicking start should render choose pokemon screen (#17) * Function RenderChoosePokemonScreen * Appendig function to the whole index.ts * Corrections * MNG-95 Add GameHandler class (#14) * Add GameHandler class * Fix GameHandler class and add tests * Fix tests * MNG-107 Add geodude instead of tentacruel Filter moves to 4 for each pokemon Use mostly pokemon type moves * MNG-103 choose pokemon system (#19) * Add choosePokemonsPage.ts * Add all functions for choose pokemon page * Change event.target, loading time * MNG-94 MNG-108 Start a new game, add functions that will render the correct view (#20) * MNG-99 & MNG-100 > created menu and back button with options. Options need to be fixed (now are default). Animation also needs to look better * MNG-109 added * Blocking the start with unwritten name * added magicFunction * added animations for buttons * Style button * Blocking button when the name is too long * MNG-98 Add useMango to gameHandler class (#22) * Add useMango to gameHandler class * corrections type of mango value * Corrections * useMango i PlayerClass Co-authored-by: AleksandraCyp <73715885+AleksandraCyp@users.noreply.github.com> * MNG-97 MNG-101 change player&change pokemon (#24) * Add switch pokemon and switch Player game handler methods * Implement mango, change the structure (build up magic function) * remove an unnecessary comment * Update test parametrization and do not use json data * MNG-102 fight method implemented * MNG-102 Add tests for fight class. Fix pokemon subtract HP * Update test parametrization and do not use json data * Apply max shortcut Co-authored-by: AgataLudwiczynska <74932979+AgataLudwiczynska@users.noreply.github.com> Co-authored-by: mariusz-sm <74978639+mariusz-sm@users.noreply.github.com> Co-authored-by: AleksandraCyp <73715885+AleksandraCyp@users.noreply.github.com> Co-authored-by: Gosia Dziewit <gosia.dziewit@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 0542a4b - Browse repository at this point
Copy the full SHA 0542a4bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2277b9b - Browse repository at this point
Copy the full SHA 2277b9bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 692ba1e - Browse repository at this point
Copy the full SHA 692ba1eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 159c9d7 - Browse repository at this point
Copy the full SHA 159c9d7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 68c8e5d - Browse repository at this point
Copy the full SHA 68c8e5dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 26f3295 - Browse repository at this point
Copy the full SHA 26f3295View commit details -
Merge pull request #29 from lukaszdutka/ts-issue
fixed ts compiling issue
Configuration menu - View commit details
-
Copy full SHA for 3c32a22 - Browse repository at this point
Copy the full SHA 3c32a22View commit details -
Configuration menu - View commit details
-
Copy full SHA for d4d8aad - Browse repository at this point
Copy the full SHA d4d8aadView commit details -
Configuration menu - View commit details
-
Copy full SHA for 82b1013 - Browse repository at this point
Copy the full SHA 82b1013View commit details -
Configuration menu - View commit details
-
Copy full SHA for 50aab7b - Browse repository at this point
Copy the full SHA 50aab7bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5800f40 - Browse repository at this point
Copy the full SHA 5800f40View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7d7e612 - Browse repository at this point
Copy the full SHA 7d7e612View commit details -
Merge pull request #25 from lukaszdutka/MNG-111_Create_game_result_modal
MNG-111_Create_game_result_modal
Configuration menu - View commit details
-
Copy full SHA for 5a56e70 - Browse repository at this point
Copy the full SHA 5a56e70View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8003266 - Browse repository at this point
Copy the full SHA 8003266View commit details -
Configuration menu - View commit details
-
Copy full SHA for df3c084 - Browse repository at this point
Copy the full SHA df3c084View commit details -
Configuration menu - View commit details
-
Copy full SHA for f2eb780 - Browse repository at this point
Copy the full SHA f2eb780View commit details
Commits on Feb 13, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 4e81ae5 - Browse repository at this point
Copy the full SHA 4e81ae5View commit details -
Merge pull request #27 from lukaszdutka/MNG-112-Animations
Mng 112 some showing up pokemon animations
Configuration menu - View commit details
-
Copy full SHA for 5f162e5 - Browse repository at this point
Copy the full SHA 5f162e5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1237f13 - Browse repository at this point
Copy the full SHA 1237f13View commit details -
Configuration menu - View commit details
-
Copy full SHA for 31692fa - Browse repository at this point
Copy the full SHA 31692faView commit details -
Fix resultsModalPopUpFunction.ts, implement it, delete some unneccess… (
#31) * Fix resultsModalPopUpFunction.ts, implement it, delete some unneccessary comments and console.logs * Autoformat, remove border to pup up screen * Add MNG-120: if the pokemon is dead, a new pokemon has to be chosen * Resolve conflicts, delete unnecessary setTImeOuts
Configuration menu - View commit details
-
Copy full SHA for f614f83 - Browse repository at this point
Copy the full SHA f614f83View commit details -
Mng 114 check if game is finished (#33)
* Fix resultsModalPopUpFunction.ts, implement it, delete some unneccessary comments and console.logs * Autoformat, remove border to pup up screen * Add MNG-120: if the pokemon is dead, a new pokemon has to be chosen * Resolve conflicts, delete unnecessary setTImeOuts * Delete not active pokemons from menu * Delete test code Co-authored-by: Daria Dziubaltowska <daria305@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 6a13a2a - Browse repository at this point
Copy the full SHA 6a13a2aView commit details -
Configuration menu - View commit details
-
Copy full SHA for e1b50f0 - Browse repository at this point
Copy the full SHA e1b50f0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9c76b97 - Browse repository at this point
Copy the full SHA 9c76b97View commit details -
Merge pull request #32 from lukaszdutka/MNG-96-Poke-attack
MNG-96 pokemon attack
Configuration menu - View commit details
-
Copy full SHA for 471ef34 - Browse repository at this point
Copy the full SHA 471ef34View commit details -
Configuration menu - View commit details
-
Copy full SHA for b14bb21 - Browse repository at this point
Copy the full SHA b14bb21View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b132c5 - Browse repository at this point
Copy the full SHA 0b132c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for fdb38a2 - Browse repository at this point
Copy the full SHA fdb38a2View commit details -
Merge pull request #37 from lukaszdutka/MNG-125---hide-the-pokemon-an…
…d-HP-bar MNG-125 hide the pokemon and HPbar when pokemon dies
Configuration menu - View commit details
-
Copy full SHA for 0bc56b7 - Browse repository at this point
Copy the full SHA 0bc56b7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 874d8c1 - Browse repository at this point
Copy the full SHA 874d8c1View commit details -
Configuration menu - View commit details
-
Copy full SHA for e6b2b0a - Browse repository at this point
Copy the full SHA e6b2b0aView commit details -
Configuration menu - View commit details
-
Copy full SHA for dbc52e9 - Browse repository at this point
Copy the full SHA dbc52e9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5dac8fa - Browse repository at this point
Copy the full SHA 5dac8faView commit details -
Add HP bar transition + some cursor plus underline names (#35)
* Add HP bar transition + some cursor plus underline names * Add transition
Configuration menu - View commit details
-
Copy full SHA for 743cb34 - Browse repository at this point
Copy the full SHA 743cb34View commit details -
Configuration menu - View commit details
-
Copy full SHA for 210f9d4 - Browse repository at this point
Copy the full SHA 210f9d4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0364bec - Browse repository at this point
Copy the full SHA 0364becView commit details
Commits on Feb 14, 2021
-
Merge pull request #38 from lukaszdutka/MNG-105-add-modals-for-Author…
…s-and-About- MNG-105 authors and about modal
Configuration menu - View commit details
-
Copy full SHA for 4a68aaa - Browse repository at this point
Copy the full SHA 4a68aaaView commit details -
mango gif fixed "jumping view" while changing pokemon or loading buttons logwindow some other small view changes
Configuration menu - View commit details
-
Copy full SHA for dcf0ffa - Browse repository at this point
Copy the full SHA dcf0ffaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 19a8103 - Browse repository at this point
Copy the full SHA 19a8103View commit details -
Configuration menu - View commit details
-
Copy full SHA for 847c9e6 - Browse repository at this point
Copy the full SHA 847c9e6View commit details
Commits on Feb 15, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 15e7538 - Browse repository at this point
Copy the full SHA 15e7538View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7231ec5 - Browse repository at this point
Copy the full SHA 7231ec5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a73e73 - Browse repository at this point
Copy the full SHA 0a73e73View commit details -
Merge pull request #39 from lukaszdutka/MNG-122
MNG-122 - Animations
Configuration menu - View commit details
-
Copy full SHA for 46bc0cd - Browse repository at this point
Copy the full SHA 46bc0cdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 701e4d8 - Browse repository at this point
Copy the full SHA 701e4d8View commit details -
MNG-119 Add_player_class_tests (#41)
* Add test for too long name * Add test for too many pokemons * Add test for useMango * Add test for addPokemon function
Configuration menu - View commit details
-
Copy full SHA for a054490 - Browse repository at this point
Copy the full SHA a054490View commit details -
Configuration menu - View commit details
-
Copy full SHA for ecd73ff - Browse repository at this point
Copy the full SHA ecd73ffView commit details -
zzz animation modals style Co-authored-by: Łukasz Dutka <lukaszdutka2@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 08d76cf - Browse repository at this point
Copy the full SHA 08d76cfView commit details -
* Update README.md * update * Update README.md * update * Update README.md * typos * some polishing * ekhem
Configuration menu - View commit details
-
Copy full SHA for 0538de5 - Browse repository at this point
Copy the full SHA 0538de5View commit details