65 Commits a3b4bd2219 ... 0c461da0d5

Author SHA1 Message Date
  “priscila.snl” 0c461da0d5 feature: insert game mode legend on custom menu 3 months ago
  leo d2cfee17e0 Update 'php/README.md' 3 months ago
  leo a9ad8b03a6 Update 'php/create_ifractions_data_base.sql' 3 months ago
  leo b740fc73f6 Add 'php/reate_ifractions_data_base.sql' 3 months ago
  laira bccd30cbff Merge branch 'fix/s2-labels' of LInE/Ifractions-web into master 3 months ago
  lairaalmas bd4ddb1f8d fix: franctions being rendered in incorrect order on end screen 3 months ago
  lairaalmas bc4c340959 chore: remove unnecessary comments 3 months ago
  lairaalmas 25527183c5 chore: remove date from homepage 3 months ago
  lairaalmas a73e10a305 feature: now game s2 toggle show fraction label and always show auxiliar blocks 3 months ago
  lairaalmas d809a86f18 refactor: S1 and S2 code and add doc comments 3 months ago
  laira 7c3dbde96f Merge branch 'fix/load-assets' of LInE/Ifractions-web into master 4 months ago
  lairaalmas d2652cc824 fix: console text 4 months ago
  lairaalmas 870aae680c fix: error handling for loading assets 4 months ago
  laira 2db4cde70e Merge branch 'fix/moodle-bugs' of LInE/Ifractions-web into master 1 year ago
  lairaalmas 5d4fb7e090 refactor: remove unnecessary console messages 1 year ago
  lairaalmas 821435cb80 refator: set moodle var to false 1 year ago
  lairaalmas e326db5ed7 fix: nuil properties when creating a new activity 1 year ago
  lairaalmas 97ebef314f refactor: remove alert created for debug 1 year ago
  lairaalmas 9c72a719f2 Merge branch 'fix/moodle-bugs' of ssh://200.144.254.107:2245/LInE/Ifractions-web into fix/moodle-bugs 1 year ago
  lairaalmas 10fc5b4b7f refactor: integration function for moodle 1 year ago
  lairaalmas 94fc6e2dcf fix: remove "back to menu" button from end screen on moodle, only allowing user to leave screen by using the page's submit button 1 year ago
  lairaalmas 150eef64e9 fix: using deprecated object to get correct answer 1 year ago
  lairaalmas 25000ad94d fix: add command to end timer to s2 game 1 year ago
  lairaalmas cb1ce3430d doc: update comments in save.php 1 year ago
  lairaalmas 34b97f39c2 refactor: wordings 1 year ago
  lairaalmas 832ece49ff fix: wrong value being sent in s2: Equals instead of equals 1 year ago
  lairaalmas dc2a3599f9 feature: add i18n wording for 'submit' 1 year ago
  lairaalmas 099545d69f temp 1 year ago
  lairaalmas e4e188c430 Merge branch 'master' of ssh://200.144.254.107:2245/LInE/Ifractions-web into fix/moodle-bugs 1 year ago
  lairaalmas 7f8f8a5e2a doc: update readme file again 1 year ago
  lairaalmas e8d80b5d27 doc: udpate readme structure 1 year ago
  lairaalmas 35f4563750 refactor: update code for retrocompatibility 1 year ago
  lairaalmas be4bac3b57 doc: add release section with brief changelog and links to older versions 1 year ago
  lairaalmas 10bfd2d40c Merge branch 'master' of ssh://200.144.254.107:2245/LInE/Ifractions-web into fix/moodle-bugs 1 year ago
  lairaalmas ea7f0a8e33 doc: update readme 1 year ago
  lairaalmas c6eb8f052f update readme 1 year ago
  lairaalmas 5d0f274757 fix: set new variable gameId when on Moodle 1 year ago
  lairaalmas 3e24fac5b7 refactor: add try catch to getILMContent function 1 year ago
  lairaalmas 81bb1fdb6a fix: bug where disableIcons would throw error if there was no icon on screen 1 year ago
  lairaalmas 9793010998 refactor: set default moodleVar on declaration and set moodle to true 1 year ago
  laira 8c9aa3e89d unset debug mode 1 year ago
  laira 3aa4881545 Merge branch 'refactor' of LInE/Ifractions-web into master 1 year ago
  lairaalmas 4e8d8187bb refactor: maintains game settings if user returns to custom menu (resets only after returning to main menu) 1 year ago
  lairaalmas 69556abc82 fix: error in game S1 when showFractions is false 1 year ago
  lairaalmas 062f0d9c25 fix: error in game C1 when showFractions is false 1 year ago
  lairaalmas bbc77e8b70 fix: continue end operation display refactor 1 year ago
  lairaalmas c42e157736 refactor: make the game circleOne have 3 difficulties instead of 5 1 year ago
  lairaalmas e1485cbf68 fix: refactor games result text structure 1 year ago
  lairaalmas 897f1d1c80 fix: adjust signs format of fraction expressions on S1 1 year ago
  lairaalmas c3ed124845 fix: missing line breaking in wording in spanish and remove debug alert 1 year ago
  lairaalmas af346657e9 refactor: update page title 1 year ago
  lairaalmas 1816f347e4 refactor: remove google font 1 year ago
  lairaalmas 58299b4d42 undo last commits for refactor and remove /src folter 1 year ago
  lairaalmas f4be16b44c fix: adjust wording for Spanish 1 year ago
  lairaalmas c90fda21b2 Merge branch 'prisla' of ssh://200.144.254.107:2245/LInE/Ifractions-web into refactor 1 year ago
  lairaalmas ddff079237 fix: correct position is game circleOne mixed being out of bounds in 'b' 1 year ago
  lairaalmas 0a2cfe1fdb fix: correct position is game circleOne mixed being out of bounds 1 year ago
  lairaalmas e181b63df6 feature: implement game.add.geom.line for adding fraction lines 1 year ago
  lairaalmas af32fc63fc refactor: add text with paragraph to game S1 1 year ago
  lairaalmas c3d1bb0241 refactor: add text with paragraph to game c1 1 year ago
  lairaalmas 461b34ea80 refactor: add text with paragraph to game S2 fractions 1 year ago
  lairaalmas 2ca3de064a refactor: add text with paragraph in level intro texts 1 year ago
  lairaalmas e2ff3c7154 refactor: add text with paragraph in custom menu 1 year ago
  lairaalmas 10c7cb8c10 feature: game.add.text now accepts paragraphs 1 year ago
  lairaalmas f577ca667f update lang file 1 year ago
100 changed files with 36 additions and 3 deletions
  1. 36 3
      README.md
  2. 0 0
      assets/audio/beep.mp3
  3. 0 0
      assets/audio/beep.ogg
  4. 0 0
      assets/audio/error.mp3
  5. 0 0
      assets/audio/error.ogg
  6. 0 0
      assets/audio/ok.mp3
  7. 0 0
      assets/audio/ok.ogg
  8. 0 0
      assets/audio/pop.wav
  9. 0 0
      assets/img/NOT-USED/add.png
  10. 0 0
      assets/img/NOT-USED/close.png
  11. 0 0
      assets/img/NOT-USED/info.png
  12. 0 0
      assets/img/NOT-USED/list.png
  13. 0 0
      assets/img/NOT-USED/multiply.png
  14. 0 0
      assets/img/NOT-USED/subtract.png
  15. 0 0
      assets/img/NOT-USED/view.png
  16. 0 0
      assets/img/characters/balloon/balloon.png
  17. 0 0
      assets/img/characters/balloon/balloon_basket.png
  18. 0 0
      assets/img/characters/kid/lost.png
  19. 0 0
      assets/img/characters/kid/running.png
  20. 0 0
      assets/img/characters/kid/walking.png
  21. 0 0
      assets/img/characters/scale/scale_arm.png
  22. 0 0
      assets/img/characters/scale/scale_base.png
  23. 0 0
      assets/img/characters/scale/scale_plate.png
  24. 0 0
      assets/img/characters/tractor/tractor.png
  25. 0 0
      assets/img/fallback.png
  26. 0 0
      assets/img/flags/br.png
  27. 0 0
      assets/img/flags/es.png
  28. 0 0
      assets/img/flags/fr.png
  29. 0 0
      assets/img/flags/it.png
  30. 0 0
      assets/img/flags/us.png
  31. 0 0
      assets/img/icons_interactive/answer_correct.png
  32. 0 0
      assets/img/icons_interactive/answer_wrong.png
  33. 0 0
      assets/img/icons_interactive/arrow_down.png
  34. 0 0
      assets/img/icons_interactive/btn_square.png
  35. 0 0
      assets/img/icons_interactive/info.png
  36. 0 0
      assets/img/icons_interactive/pointer.png
  37. 0 0
      assets/img/icons_interactive/select_input.png
  38. 0 0
      assets/img/icons_menu/circleOne.png
  39. 0 0
      assets/img/icons_menu/circleOne_1.png
  40. 0 0
      assets/img/icons_menu/circleOne_2.png
  41. 0 0
      assets/img/icons_menu/operation_equals.png
  42. 0 0
      assets/img/icons_menu/operation_minus.png
  43. 0 0
      assets/img/icons_menu/operation_mixed.png
  44. 0 0
      assets/img/icons_menu/operation_plus.png
  45. 0 0
      assets/img/icons_menu/scaleOne.png
  46. 0 0
      assets/img/icons_menu/scaleOne_1.png
  47. 0 0
      assets/img/icons_menu/squareOne.png
  48. 0 0
      assets/img/icons_menu/squareOne_1.png
  49. 0 0
      assets/img/icons_menu/squareOne_2.png
  50. 0 0
      assets/img/icons_menu/squareTwo.png
  51. 0 0
      assets/img/icons_menu/squareTwo_1.png
  52. 0 0
      assets/img/icons_menu/squareTwo_2.png
  53. 0 0
      assets/img/icons_navigation/audio.png
  54. 0 0
      assets/img/icons_navigation/back.png
  55. 0 0
      assets/img/icons_navigation/home.png
  56. 0 0
      assets/img/icons_navigation/language.png
  57. 0 0
      assets/img/icons_navigation/menu.png
  58. 0 0
      assets/img/icons_navigation/show_solution.png
  59. 0 0
      assets/img/info_box/c1-A-h.png
  60. 0 0
      assets/img/info_box/c1-A.png
  61. 0 0
      assets/img/info_box/c1-B-h.png
  62. 0 0
      assets/img/info_box/c1-diff-1.png
  63. 0 0
      assets/img/info_box/c1-diff-5.png
  64. 0 0
      assets/img/info_box/c1-label.png
  65. 0 0
      assets/img/info_box/map-c1s2.png
  66. 0 0
      assets/img/info_box/map-s1.png
  67. 0 0
      assets/img/info_box/op_eq.png
  68. 0 0
      assets/img/info_box/op_min.png
  69. 0 0
      assets/img/info_box/op_mix.png
  70. 0 0
      assets/img/info_box/op_plus.png
  71. 0 0
      assets/img/info_box/s1-A-h.png
  72. 0 0
      assets/img/info_box/s1-A.png
  73. 0 0
      assets/img/info_box/s1-B-h.png
  74. 0 0
      assets/img/info_box/s1-diff-1.png
  75. 0 0
      assets/img/info_box/s1-diff-3.png
  76. 0 0
      assets/img/info_box/s1-label.png
  77. 0 0
      assets/img/info_box/s2-A-h.png
  78. 0 0
      assets/img/info_box/s2-B-h.png
  79. 0 0
      assets/img/info_box/s2-diff-1.png
  80. 0 0
      assets/img/info_box/s2-diff-5.png
  81. 0 0
      assets/img/info_box/s2-label.png
  82. 0 0
      assets/img/info_box/s2.png
  83. 0 0
      assets/img/scene/.png
  84. 0 0
      assets/img/scene/bg_default.jpg
  85. 0 0
      assets/img/scene/bg_map.png
  86. 0 0
      assets/img/scene/block_grass.png
  87. 0 0
      assets/img/scene/building_farm.png
  88. 0 0
      assets/img/scene/building_garage.png
  89. 0 0
      assets/img/scene/building_house.png
  90. 0 0
      assets/img/scene/building_school.png
  91. 0 0
      assets/img/scene/bush.png
  92. 0 0
      assets/img/scene/cloud.png
  93. 0 0
      assets/img/scene/flag.png
  94. 0 0
      assets/img/scene/floor_grass.png
  95. 0 0
      assets/img/scene/floor_road.png
  96. 0 0
      assets/img/scene/map_place.png
  97. 0 0
      assets/img/scene/new_level/bg_snow.png
  98. 0 0
      assets/img/scene/new_level/floor_snow.png
  99. 0 0
      assets/img/scene/new_level/floor_stone.png
  100. 0 0
      src/assets/img/scene/new_level/floor_stone_left.png

+ 36 - 3
README.md

@@ -16,7 +16,7 @@ Follow the description below based on in which platform you want to run iFractio
 
 * Extract the content of `Ifraction-web.zip` inside the server directory
 
-* Check that the variable `moodle` is set to **false** inside `src/js/globals/globals_control.js`
+* Check that the variable `moodle` is set to **false** inside `js/globals/globals_control.js`
 
 * It can now be accessed through the **browser** (e.g http://localhost/Ifractions-web)
 
@@ -24,7 +24,7 @@ Follow the description below based on in which platform you want to run iFractio
 
   * you'll need to have **PHP** and **MySQL** installed on the machine
 
-  * follow the steps on `src/php/README.md` to setup the database and variables
+  * follow the steps on `./php/README.md` to setup the database and variables
 
 * Otherwise you're good to go.
 
@@ -34,7 +34,7 @@ Follow the description below based on in which platform you want to run iFractio
 
 * To download and setup **iAssign** access: http://200.144.254.107/git/LInE/iassign
 
-* Be sure to check that the variable `moodle` is set to **true** inside `src/js/globals/globals_control.js`
+* Be sure to check that the variable `moodle` is set to **true** inside `js/globals/globals_control.js`
 
 * With **iAssign** installed, as a Moodle professor on you'll be able to:
   
@@ -44,3 +44,36 @@ Follow the description below based on in which platform you want to run iFractio
 
   * get the automatic evaluation for the activities
 
+## Releases:
+
+### A new version will be available soon!
+
+* Bug fixes 
+
+* GUI changes
+
+* Code refactoring
+
+### [v2.0.0](http://200.144.254.107/git/LInE/Ifractions-web/src/release-2.0.0) (stable)
+
+* Bug fixes
+
+* No longer uses Phaser.io
+
+  * Now iFractions implements its own game mechanics
+
+* Add Moodle integration
+
+  * Now iFractions is a part of the iAssign package and can be integrated to Moodle
+
+* New available language: Italian
+
+* GUI changes
+
+* Code refactoring and documenting
+
+### [v1.0.0](http://200.144.254.107/git/LInE/Ifractions-web/src/release-1.0.0) (deprecated)
+
+* Uses Phaser.io to handle game mechanics
+
+* Available languages: Spanish, Portuguese, English and French.

src/assets/audio/beep.mp3 → assets/audio/beep.mp3


src/assets/audio/beep.ogg → assets/audio/beep.ogg


src/assets/audio/error.mp3 → assets/audio/error.mp3


src/assets/audio/error.ogg → assets/audio/error.ogg


src/assets/audio/ok.mp3 → assets/audio/ok.mp3


src/assets/audio/ok.ogg → assets/audio/ok.ogg


src/assets/audio/pop.wav → assets/audio/pop.wav


src/assets/img/NOT-USED/add.png → assets/img/NOT-USED/add.png


src/assets/img/NOT-USED/close.png → assets/img/NOT-USED/close.png


src/assets/img/NOT-USED/info.png → assets/img/NOT-USED/info.png


src/assets/img/NOT-USED/list.png → assets/img/NOT-USED/list.png


src/assets/img/NOT-USED/multiply.png → assets/img/NOT-USED/multiply.png


src/assets/img/NOT-USED/subtract.png → assets/img/NOT-USED/subtract.png


src/assets/img/NOT-USED/view.png → assets/img/NOT-USED/view.png


src/assets/img/characters/balloon/balloon.png → assets/img/characters/balloon/balloon.png


src/assets/img/characters/balloon/balloon_basket.png → assets/img/characters/balloon/balloon_basket.png


src/assets/img/characters/kid/lost.png → assets/img/characters/kid/lost.png


src/assets/img/characters/kid/running.png → assets/img/characters/kid/running.png


src/assets/img/characters/kid/walking.png → assets/img/characters/kid/walking.png


src/assets/img/characters/scale/scale_arm.png → assets/img/characters/scale/scale_arm.png


src/assets/img/characters/scale/scale_base.png → assets/img/characters/scale/scale_base.png


src/assets/img/characters/scale/scale_plate.png → assets/img/characters/scale/scale_plate.png


src/assets/img/characters/tractor/tractor.png → assets/img/characters/tractor/tractor.png


src/assets/img/fallback.png → assets/img/fallback.png


src/assets/img/flags/pt.png → assets/img/flags/br.png


src/assets/img/flags/es.png → assets/img/flags/es.png


src/assets/img/flags/fr.png → assets/img/flags/fr.png


src/assets/img/flags/it.png → assets/img/flags/it.png


src/assets/img/flags/us.png → assets/img/flags/us.png


src/assets/img/icons_interactive/answer_correct.png → assets/img/icons_interactive/answer_correct.png


src/assets/img/icons_interactive/answer_wrong.png → assets/img/icons_interactive/answer_wrong.png


src/assets/img/icons_interactive/arrow_down.png → assets/img/icons_interactive/arrow_down.png


src/assets/img/icons_interactive/btn_square.png → assets/img/icons_interactive/btn_square.png


src/assets/img/icons_interactive/info.png → assets/img/icons_interactive/info.png


src/assets/img/icons_interactive/pointer.png → assets/img/icons_interactive/pointer.png


src/assets/img/icons_interactive/select_input.png → assets/img/icons_interactive/select_input.png


src/assets/img/icons_menu/circleOne.png → assets/img/icons_menu/circleOne.png


src/assets/img/icons_menu/circleOne_1.png → assets/img/icons_menu/circleOne_1.png


src/assets/img/icons_menu/circleOne_2.png → assets/img/icons_menu/circleOne_2.png


src/assets/img/icons_menu/operation_equals.png → assets/img/icons_menu/operation_equals.png


src/assets/img/icons_menu/operation_minus.png → assets/img/icons_menu/operation_minus.png


src/assets/img/icons_menu/operation_mixed.png → assets/img/icons_menu/operation_mixed.png


src/assets/img/icons_menu/operation_plus.png → assets/img/icons_menu/operation_plus.png


src/assets/img/icons_menu/scaleOne.png → assets/img/icons_menu/scaleOne.png


src/assets/img/icons_menu/scaleOne_1.png → assets/img/icons_menu/scaleOne_1.png


src/assets/img/icons_menu/squareOne.png → assets/img/icons_menu/squareOne.png


src/assets/img/icons_menu/squareOne_1.png → assets/img/icons_menu/squareOne_1.png


src/assets/img/icons_menu/squareOne_2.png → assets/img/icons_menu/squareOne_2.png


src/assets/img/icons_menu/squareTwo.png → assets/img/icons_menu/squareTwo.png


src/assets/img/icons_menu/squareTwo_1.png → assets/img/icons_menu/squareTwo_1.png


src/assets/img/icons_menu/squareTwo_2.png → assets/img/icons_menu/squareTwo_2.png


src/assets/img/icons_navigation/audio.png → assets/img/icons_navigation/audio.png


src/assets/img/icons_navigation/back.png → assets/img/icons_navigation/back.png


src/assets/img/icons_navigation/home.png → assets/img/icons_navigation/home.png


src/assets/img/icons_navigation/language.png → assets/img/icons_navigation/language.png


src/assets/img/icons_navigation/menu.png → assets/img/icons_navigation/menu.png


src/assets/img/icons_navigation/show_solution.png → assets/img/icons_navigation/show_solution.png


src/assets/img/info_box/c1-A-h.png → assets/img/info_box/c1-A-h.png


src/assets/img/info_box/c1-A.png → assets/img/info_box/c1-A.png


src/assets/img/info_box/c1-B-h.png → assets/img/info_box/c1-B-h.png


src/assets/img/info_box/c1-diff-1.png → assets/img/info_box/c1-diff-1.png


src/assets/img/info_box/c1-diff-5.png → assets/img/info_box/c1-diff-5.png


src/assets/img/info_box/c1-label.png → assets/img/info_box/c1-label.png


src/assets/img/info_box/map-c1s2.png → assets/img/info_box/map-c1s2.png


src/assets/img/info_box/map-s1.png → assets/img/info_box/map-s1.png


src/assets/img/info_box/op_eq.png → assets/img/info_box/op_eq.png


src/assets/img/info_box/op_min.png → assets/img/info_box/op_min.png


src/assets/img/info_box/op_mix.png → assets/img/info_box/op_mix.png


src/assets/img/info_box/op_plus.png → assets/img/info_box/op_plus.png


src/assets/img/info_box/s1-A-h.png → assets/img/info_box/s1-A-h.png


src/assets/img/info_box/s1-A.png → assets/img/info_box/s1-A.png


src/assets/img/info_box/s1-B-h.png → assets/img/info_box/s1-B-h.png


src/assets/img/info_box/s1-diff-1.png → assets/img/info_box/s1-diff-1.png


src/assets/img/info_box/s1-diff-3.png → assets/img/info_box/s1-diff-3.png


src/assets/img/info_box/s1-label.png → assets/img/info_box/s1-label.png


src/assets/img/info_box/s2-A-h.png → assets/img/info_box/s2-A-h.png


src/assets/img/info_box/s2-B-h.png → assets/img/info_box/s2-B-h.png


src/assets/img/info_box/s2-diff-1.png → assets/img/info_box/s2-diff-1.png


src/assets/img/info_box/s2-diff-5.png → assets/img/info_box/s2-diff-5.png


src/assets/img/info_box/s2-label.png → assets/img/info_box/s2-label.png


src/assets/img/info_box/s2.png → assets/img/info_box/s2.png


src/assets/img/scene/.png → assets/img/scene/.png


src/assets/img/scene/bg_default.jpg → assets/img/scene/bg_default.jpg


src/assets/img/scene/bg_map.png → assets/img/scene/bg_map.png


src/assets/img/scene/block_grass.png → assets/img/scene/block_grass.png


src/assets/img/scene/building_farm.png → assets/img/scene/building_farm.png


src/assets/img/scene/building_garage.png → assets/img/scene/building_garage.png


src/assets/img/scene/building_house.png → assets/img/scene/building_house.png


src/assets/img/scene/building_school.png → assets/img/scene/building_school.png


src/assets/img/scene/bush.png → assets/img/scene/bush.png


src/assets/img/scene/cloud.png → assets/img/scene/cloud.png


src/assets/img/scene/flag.png → assets/img/scene/flag.png


src/assets/img/scene/floor_grass.png → assets/img/scene/floor_grass.png


src/assets/img/scene/floor_road.png → assets/img/scene/floor_road.png


src/assets/img/scene/map_place.png → assets/img/scene/map_place.png


src/assets/img/scene/new_level/bg_snow.png → assets/img/scene/new_level/bg_snow.png


src/assets/img/scene/new_level/floor_snow.png → assets/img/scene/new_level/floor_snow.png


src/assets/img/scene/new_level/floor_stone.png → assets/img/scene/new_level/floor_stone.png


+ 0 - 0
src/assets/img/scene/new_level/floor_stone_left.png


Some files were not shown because too many files changed in this diff