Skip to content
Permalink
Browse files

Merge pull request #1 from Raggaer/master

merge
  • Loading branch information...
joseluis2g committed Mar 21, 2019
2 parents 9aff99b + f6cb036 commit d660162bc497dda767e75c613730f54e54f8122a
Showing with 1,064 additions and 656 deletions.
  1. +4 −1 .gitignore
  2. +0 −296 Gopkg.lock
  3. +0 −129 Gopkg.toml
  4. +1 −3 README.md
  5. +3 −2 TOC.ini
  6. +28 −7 app/app.go
  7. +27 −23 app/controllers/lua.go
  8. +2 −2 app/lua/extension.go
  9. +38 −4 app/lua/image.go
  10. +50 −0 app/lua/lua.go
  11. +120 −6 app/lua/state.go
  12. +62 −0 app/lua/xml.go
  13. +206 −0 app/util/monsters.go
  14. +2 −13 appveyor_build.ps1
  15. +12 −0 en-US/info/errors.md
  16. +33 −9 en-US/lua/{img.md → image.md}
  17. +49 −2 en-US/lua/xml.md
  18. +27 −1 en-US/tpl/func.md
  19. +28 −1 engine/util.lua
  20. +41 −0 go.mod
  21. +74 −0 go.sum
  22. +1 −1 pages/account/changemail/changemail.html
  23. +1 −1 pages/account/changepassword/changepassword.html
  24. +2 −2 pages/account/checkout/checkouthistory.html
  25. +33 −10 pages/account/createchar/config.lua
  26. +1 −1 pages/account/createchar/createcharacter.html
  27. +33 −13 pages/account/createchar/post.lua
  28. +7 −7 pages/account/dashboard/dashboard.html
  29. +1 −1 pages/account/recover/account/recover_account.html
  30. +1 −1 pages/account/recover/password/recover_password.html
  31. +1 −1 pages/account/twofa/enable/enabletwofa.html
  32. +1 −1 pages/index/get.lua
  33. +1 −1 pages/library/serverinfo/get.lua
  34. +10 −6 pages/shop/view/shopview.html
  35. +0 −4 public/css/bootstrap.min.css
  36. +89 −11 public/css/style.css
  37. +0 −6 public/js/bootstrap.min.js
  38. +18 −23 views/default/footer.html
  39. +41 −51 views/default/header.html
  40. +9 −9 widgets/account/account.html
  41. +4 −4 widgets/admin/admin.html
  42. +3 −3 widgets/toplevel/toplevel.html
@@ -22,4 +22,7 @@ public/images/outfits/*.png
public/ckeditor/images/*.png
!public/ckeditor/images/.gitkeep
i18n/*.i18n
tls
tls
*.swp
*~
castro

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit d660162

Please sign in to comment.
You can’t perform that action at this time.