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.

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

chore. Update module and fix bugs in build #12

Merged
merged 3 commits into from
Aug 31, 2024

Conversation

jorge990125
Copy link
Contributor

@jorge990125 jorge990125 commented Aug 29, 2024

Changes Proposed:

  • Update sql and npcpromotion.cpp
  • Change the getLevel method to GetLevel
  • Update the method of writing commands

Tests Performed:

  • build without problems
  • Windows 10

How to Test the Changes:

  1. update module
  2. generate project with cmake
  3. compile the project again

@jorge990125 jorge990125 changed the title update update module Aug 29, 2024
@pangolp
Copy link
Owner

pangolp commented Aug 29, 2024

Thank you. I'm running the tests. If all goes well, we merged it.

@pangolp
Copy link
Owner

pangolp commented Aug 29, 2024

Do you want to correct the errors yourself or do you want me to correct them? I'll be waiting for anything.

@jorge990125
Copy link
Contributor Author

¿Quieres corregir los errores tú mismo o prefieres que los corrija yo? Estaré atento a cualquier cosa.

If you can correct them I would appreciate it, if not, when I come home from work I will correct the errors.

@jorge990125 jorge990125 force-pushed the update branch 4 times, most recently from 3249cc3 to 579c184 Compare August 29, 2024 15:08
@pangolp
Copy link
Owner

pangolp commented Aug 29, 2024

¿Quieres corregir los errores tú mismo o prefieres que los corrija yo? Estaré atento a cualquier cosa.

If you can correct them I would appreciate it, if not, when I come home from work I will correct the errors.

The case was useful to me, to show how a person can contribute to another person's branch, even if that person did not create the pull request. But there is no rush, and other scenarios may arise in the future. That's why I asked you, to know if I should get involved or not.

@pangolp
Copy link
Owner

pangolp commented Aug 29, 2024

I left you some suggestions, none of them are really obligatory, they are more than anything recommendations, to respect the way of writing things, but none of them play a really important role in this case.

@jorge990125
Copy link
Contributor Author

I left you some suggestions, none of them are really obligatory, they are more than anything recommendations, to respect the way of writing things, but none of them play a really important role in this case.

I really like it when you give me advice since I don't know everything and every day you learn something new, learning from mistakes is wise, so any help I receive will always be appreciated.

@pangolp
Copy link
Owner

pangolp commented Aug 30, 2024

Don't worry about the number of commits that are formed within this pull request, because when the merge is performed, using the Squash and merge option, all the commits are combined into just 1, regardless of the number that have been generated within this branch.

@pangolp
Copy link
Owner

pangolp commented Aug 30, 2024

The tests passed without any problems. However, the changes I mentioned above would have to be made. I can do them myself, or if you want and have time, if you want to do them yourself, no problem. Let me know. I'll be waiting.

@jorge990125
Copy link
Contributor Author

Ok, if you can do it, I would appreciate it very much.

@pangolp
Copy link
Owner

pangolp commented Aug 30, 2024

Ok, if you can do it, I would appreciate it very much.

Perfect, I'll do it.

Most of the fixes in this commit are not important, except for the command fix.
But the rest are more cosmetic, and to try to always write the code with the same format.
As well as the issue of leaving the line break at the end of the document.
@pangolp
Copy link
Owner

pangolp commented Aug 31, 2024

On GitHub, by default, there is an option configured to accept commits from other people on some branches. You have to check if you have that option enabled, because I think not. I don't remember if it can be enabled within each pull request, or if it is an account setting.

image

image

image

@jorge990125
Copy link
Contributor Author

I already activated the option

@pangolp
Copy link
Owner

pangolp commented Aug 31, 2024

I already activated the option

Perfect, I can now commit. Now we need to wait for the tests to pass, and check if there is anything else pending. I have to test in-game if it works, because I haven't tested it and since we made changes to the command, we will have to test that part.

@pangolp pangolp changed the title update module chore. Update module and fix bugs in build Aug 31, 2024
@pangolp
Copy link
Owner

pangolp commented Aug 31, 2024

Apparently, there is a small failure, when using the command. But now I correct it. The rest, it seems that everything is fine.

[09:12:54]  ------------------------------------------------     
[09:12:54]  Username : ADMIN
[09:12:54]  Email : 
[09:12:54]  Last IP : 127.0.0.1
[09:12:54]  Online :  [ONLINE]
[09:12:54]  Recruiter : 25862
[09:12:54]  ------------------------------------------------     
[09:12:54]       --- LISTA DE PERSONAJES ---                     
[09:12:54] Wrong format occurred (argument not found). Fmt string: 'Character: {}, {}: {}, date: {}'

@pangolp
Copy link
Owner

pangolp commented Aug 31, 2024

Done, it is now fixed, if it passes the tests, we merge it.

[09:19:20]  ------------------------------------------------     
[09:19:20]  Username : ADMIN
[09:19:20]  Email : 
[09:19:20]  Last IP : 127.0.0.1
[09:19:20]  Online :  [ONLINE]
[09:19:20]  Recruiter : 26271
[09:19:20]  ------------------------------------------------     
[09:19:20]       --- LISTA DE PERSONAJES ---                     
[09:19:20] Character: Stevej - IP: 127.0.0.1 - date: 2024-08-31 09:07:56

@pangolp pangolp merged commit 7366b45 into pangolp:master Aug 31, 2024
2 checks passed
@pangolp
Copy link
Owner

pangolp commented Aug 31, 2024

Merged. Thanks.

@jorge990125 jorge990125 deleted the update branch August 31, 2024 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants