Commit Graph

237 Commits

Author SHA1 Message Date
CPunch f41bf0ace2 switched to -O2 optimizations 2020-09-02 22:49:38 -05:00
CPunch 063d302bd5
Merge pull request #62 from kamilprzyb/master
Rewrote DB and finished LoginServer
2020-09-02 22:49:08 -05:00
CPunch 7e9793bf90
Merge pull request #59 from JadeShrineMaiden/additions
Colliding NPC IID quickfix
2020-09-02 22:48:09 -05:00
CakeLancelot fa6b0b178c Remove unnecessary bracket in include statements 2020-09-02 21:25:09 -05:00
CakeLancelot dadf1c5bcf Change sqlite3.h path in sqlite_orm.h
Should fix Appveyor compilation
2020-09-02 21:11:50 -05:00
kamilprzyb 359991e274 added back accidentaly removed files in Makefile 2020-09-02 18:05:18 +02:00
kamilprzyb 260759c20b replaced tabs with 4 spaces 2020-09-02 17:53:39 +02:00
kamilprzyb 1ff5694960
Fix APPROVEALLNAMES setting
fixed GetInteger->GetBoolean

Co-authored-by: FinnHornhoover <30576665+FinnHornhoover@users.noreply.github.com>
2020-09-02 17:47:10 +02:00
CakeLancelot be4c5a8072
Update config.ini
Add acceptallcustomnames option
Correct comment
2020-09-02 07:12:24 -05:00
kamilprzyb ef84ec8fca remove CMakeSettings 2020-09-02 00:38:33 +02:00
kamilprzyb 11801c1f89 Rewrote DB to use ORM, added all remaining features to LoginServer and refactored it 2020-09-02 00:37:09 +02:00
CPunch 4f6c77be4f minor cleanup 2020-08-31 17:54:49 -05:00
dongresource 73c67a814d Fix checking of header timestamps.
This is implemented in such a way that a change in one of our headers
won't cause recompilation of large C dependancies. It's a bit hacky, but
it works.
2020-08-31 22:40:33 +02:00
dongresource d7a41d40ab Replace signal() with sigaction(). 2020-08-31 22:40:33 +02:00
dongresource 0aeac0f6f3 Improve the Makefile so we don't have to recompile the libs every time. 2020-08-31 22:40:33 +02:00
CPunch 48b0866441
Merge pull request #60 from dongresource/contrib
Wrote a CONTRIBUTING.md with instructions for clean Pull Requests
2020-08-30 22:43:40 -05:00
dongresource 4ade533f40 Wrote a CONTRIBUTING.md. 2020-08-31 03:47:56 +02:00
JadeShrineMaiden 1e344c2dd8 Small tweak 2020-08-31 01:36:29 +01:00
JadeShrineMaiden fdd0160248 Colliding NPC IID quickfix 2020-08-30 23:29:28 +01:00
CPunch 5f10718315
Merge pull request #56 from Eperty123/master
Add NPC barking, see saved characters
2020-08-30 10:41:24 -05:00
Eperty123 da293ba9b3 Add DB prefix to db stuff 2020-08-29 13:47:39 +02:00
Eperty123 437063d78a Add experimental TransportManager 2020-08-29 13:43:33 +02:00
Eperty123 b239fb9331 Add NPC barking, seeing saved characters 2020-08-29 13:14:21 +02:00
CPunch 50431024c9
Merge pull request #55 from dongresource/combat1
Implemented combat, drops, crates and the guide changer
2020-08-28 19:11:56 -05:00
CPunch 2a258a80f0 Database.cpp refactoring 2020-08-28 19:10:26 -05:00
dongresource 322bc46604 Support plain POSIX make.
Also standardized the new variable names.
2020-08-28 22:54:28 +02:00
CPunch 2551f74af1
Merge pull request #54 from CakeLancelot/editorconfig
Add .editorconfig to enforce 4 space indent, final newline, and LF EoL
2020-08-28 15:50:30 -05:00
CakeLancelot 1af240fa34 Add .editorconfig to enforce 4 space indent
Should be supported by most IDEs and text editors
2020-08-28 15:34:49 -05:00
dongresource a067975f27 Players can now see eachother fight monsters. 2020-08-28 22:22:24 +02:00
dongresource 72a811d6ab Implemented guide changing.
This means the Time Machine works as well.
2020-08-28 22:22:24 +02:00
dongresource 3b35e0017a Moved all JSON files into a dedicated data directory. 2020-08-28 22:22:24 +02:00
dongresource 4df812f996 Implemented crates (dropping and opening).
Also fixed a bug in vaildOutVarPacket().
2020-08-28 22:22:24 +02:00
dongresource 67d899efe6 Implemented proper validation of variable-length packets.
Also changed output buffer in pcAttackNpcs() from dynamically to
statically allocated. This in itself is temporary as I have a better
idea as to how we can allocate buffers with a bit less boilerplate.
2020-08-28 22:18:28 +02:00
dongresource 64accecc30 Initial implementation of CombatManager.
Overflow detection must still be implemented.
2020-08-28 22:18:28 +02:00
dongresource c8c2f4b05f Catch SIGINT with signal(), to allow for gprof instrumentation.
Note: signal() is undefined behaviour in multithreaded programs and is
unportable for handling signals in general. This will need to be
replaced with sigaction() or something.
2020-08-28 22:18:28 +02:00
dongresource 3c43dd0193 Try to transmit FF packets in one go, instead of sending the id first. 2020-08-28 22:18:28 +02:00
dongresource 9e9161083d Reword some comments and correct paths in the Readme. 2020-08-28 22:18:28 +02:00
darkredtitan 5cf7225f52
Tried to manually merge kamilprzyb and main repo's code (#45)
* Merge kamilprzyb and main repo's code

* Update Makefile by FunnHornhoover

* Update Makefile by FinnHornhoover

* Add flag to Makefile by FinnHornhoover

* Remove extra line from makefile

* Remove lbcrypt from Makefile

* Fix flag to Makefile by FinnHornhoover

* Reimplement potential fix for tutorial blackscreen by Dongresources

* Update CMakeLists.txt

* Update CMakeLists.txt

* Reinsert Jade's changes

* Cosmetic Changes to Databases .h & .cpp

* Remove CMakeSettings.json

* Update Makefile by Finn Hornhoover

* More cosmetic changes to Databases.cpp

* More cosmetic changes to Databases.cpp

* Remove unnecessary line (CMakeSettings.json)

* Fix CNLoginServer.cpp

* More cosmetic Changes to Database.hpp, edit Database.cpp to use JSON library onstead of json11 library, and delete json11 library files

* Delete json11 library files

* Delete JSON library to reupload

* Reupload JSON library from main repo

* Reupload JSON library from main repo

* Fix syntax error

* Fix Makefile

* Remove commented line of code to be like master

Co-authored-by: CPunch <sethtstubbs@gmail.com>
2020-08-28 13:02:03 -05:00
JadeShrineMaiden 5c8a0069fc
Vehicle and trading bugfixes (#51)
* Sanity checks + Starting level changes

- Item movement handler checks to make sure items aren't moved from equipment slot to equipment slot.
- Item give command checks to make sure an out of bounds item is not spawned (Below iType 0 or above iType 8)
- Players now begin at level 36, consequently the item give command does not level you up now.

* Initial Trade Implementation

* Sanity Check

- Prevents out of bounds item movement by comparing it to AINVEN_COUNT.

* Taros and Trading

* Update ItemManager.cpp

* Update ItemManager.cpp

* working trading system

* Trading system code pointerified

- It works with the recent pointer changes needed.

* Vehicles and Trading bugfixes
2020-08-26 21:35:13 -05:00
CPunch 64d4b1d26a
Merge pull request #50 from dongresource/bugfix
Fix crash when receiving invalid packets with very low ids.
2020-08-26 15:33:23 -05:00
dongresource 9b0cb7f441 Fix crash when receiving invalid packets with very low ids.
Also fix benign NPC deallocation bug.
2020-08-26 22:22:52 +02:00
CPunch c48db0f9f9 ignore SIGPIPE 2020-08-26 14:38:09 -05:00
CPunch e0c00bcdc8 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-26 14:23:43 -05:00
CPunch 6db1a7baf1 removed unnecessary allocation 2020-08-26 14:23:40 -05:00
CPunch 99e357d24e
Merge pull request #47 from OpenFusionProject/Raymonf-readme-fix
Correct AppVeyor link
2020-08-26 13:04:32 -05:00
Raymonf 57681cd669
Correct AppVeyor link 2020-08-26 13:53:50 -04:00
CPunch c9badae526
Merge pull request #46 from dongresource/mobs2
Populated the future with scraped mobs
2020-08-26 12:42:35 -05:00
JadeShrineMaiden d3ca93a9b8
Trading System (#43)
* Sanity checks + Starting level changes

- Item movement handler checks to make sure items aren't moved from equipment slot to equipment slot.
- Item give command checks to make sure an out of bounds item is not spawned (Below iType 0 or above iType 8)
- Players now begin at level 36, consequently the item give command does not level you up now.

* Initial Trade Implementation

* Taros and Trading

* working trading system

* Trading system code pointerified

- It works with the recent pointer changes needed.
2020-08-26 12:40:10 -05:00
JadeShrineMaiden 6808365d48
Sanity checks fix (#41)
* Sanity checks + Starting level changes

- Item movement handler checks to make sure items aren't moved from equipment slot to equipment slot.
- Item give command checks to make sure an out of bounds item is not spawned (Below iType 0 or above iType 8)
- Players now begin at level 36, consequently the item give command does not level you up now.

* Sanity Check

- Prevents out of bounds item movement by comparing it to AINVEN_COUNT.

* Update ItemManager.cpp

* Update ItemManager.cpp
2020-08-26 12:39:49 -05:00
dongresource 4178945abe Decoupled player and NPC view distance. 2020-08-26 04:58:17 +02:00