Commit Graph

1095 Commits

Author SHA1 Message Date
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
dongresource 3e5101892b Populated the future with scraped mobs.
This system is temporary; meant to ease testing.
2020-08-26 04:57:59 +02:00
CPunch 60be814e16
Merge pull request #42 from dongresource/bugfix
Fixed a use-after-free and a memory leak.
2020-08-25 17:42:22 -05:00
dongresource 16c11dada0 Fixed a use-after-free and a memory leak. 2020-08-26 00:09:31 +02:00
CPunch 260331715f
Merge pull request #40 from dongresource/bugfix
Bugfixes
2020-08-25 13:52:51 -05:00
CPunch b187d4b65f
Merge pull request #37 from dongresource/work1
Respawn points, NPC spawning, misc stuff.
2020-08-25 13:45:59 -05:00
dongresource 3b3ddf08ef Fix github issue #38 2020-08-25 20:42:52 +02:00
dongresource 41898bb6b7 Fix a bug where nanos aren't unsummoned when unequipped.
Thanks fabriXfinn for reporting it.
Also improved sanity checks.
2020-08-25 20:30:20 +02:00
dongresource dff710cf61 Enable vehicle spawning. 2020-08-25 19:43:46 +02:00
dongresource b79bc56b31 Implement NPC spawning.
Protected by a simplified GM system. Either everyone is a GM (local
servers) or nobody is (public servers).
2020-08-25 04:28:42 +02:00
dongresource 9aa9b76826 Made the random characters level 36.
They are meant to make testing faster, after all. No point in
restricting them from fully testing items.
2020-08-25 04:17:47 +02:00
dongresource 113ce0af07 Load the NPC and warp JSON files according to the config file.
NPC data was being read from the config, but ignored.
2020-08-25 03:45:04 +02:00
dongresource 6f1a72ca0f Shut Computress up.
Setting all bits in the first use flags disables tutorial messages.
2020-08-25 03:42:52 +02:00
dongresource d964a83d6d Respawn points work now.
Note that some of them weren't present in clientnpc and will need to be
manually added later.
2020-08-25 03:34:53 +02:00
CPunch d025b611a1
Merge pull request #35 from dongresource/work1
Avoid excessive copying of large Player struct
2020-08-24 19:05:24 -05:00
dongresource 2f1358c124 Potential solution for the tutorial problem.
Will need to be tested on the public server.
2020-08-25 01:57:53 +02:00
dongresource c1b6ae8466 No need to unpack zero-length packet structs.
Also fixed formatting and added subheading to README.md.
2020-08-25 01:08:02 +02:00
dongresource 14bc368073 Dynamically allocate the Player struct in PlayerView.
This way we're not always passing it around by value.
Note that the Player structs in CNSharedData are still
pass-by-reference. Will probably change this later.
2020-08-25 00:59:55 +02:00
dongresource c5dacb4958 Removed CRs from .gitignore and an outdated comment in config.ini. 2020-08-25 00:11:54 +02:00
dongresource fb993f0c5d Added .vimrc configured for the 4 spaces style. 2020-08-25 00:11:54 +02:00
CPunch 6d3868349d removed debug output in keepAliveTimer 2020-08-24 16:12:49 -05:00
CPunch 16bca39dae added simple timer system to CNShardServer 2020-08-24 16:11:40 -05:00
Onii-chan afbf309c7e
Add player revive, vehicle mount/dismount and more (#33) 2020-08-24 16:04:56 -05:00
CPunch 28ad1a0c25 fix windows support for sockets 2020-08-24 13:23:28 -05:00
JadeShrineMaiden ff5f3966e3
Sanity checks + Starting level changes (#31)
* 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.
2020-08-24 03:07:51 -05:00
CPunch 55add82843
Merge pull request #32 from dongresource/work
-Wall, #pragma once, nanoSummonHandler() cleanup, verbosity levels
2020-08-23 16:57:58 -05:00
dongresource e99feb03d5 Add verbosity levels. 2020-08-23 23:09:31 +02:00
CPunch 431448ffb7 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-23 15:10:00 -05:00
CPunch 8105d0aa88 properly handle socket errors in recieving packets 2020-08-23 15:09:51 -05:00
CPunch acf358ef51
Merge pull request #30 from CakeLancelot/clion-gitignore
Update .gitignore for CLion
2020-08-23 13:03:10 -05:00
CakeLancelot 0a8e96ebc4 Update .gitignore for Clion 2020-08-23 12:58:08 -05:00
dongresource 756074cc62 Remove redundant initialization in nanoSummonHandler(). 2020-08-23 19:46:51 +02:00
dongresource 51a8cc8bdf Silence -Wall warnings. 2020-08-23 19:19:12 +02:00
dongresource 651ccba932 Replace ifdef guards with #pragma once
tl;dr this has potentially significant compilation speed benefits.
2020-08-23 19:14:54 +02:00
dongresource 1281fdaaf0 Add -Wall to Makefile. 2020-08-23 18:30:23 +02:00
CPunch 561a809f33 load warps into memory in NPCManager::init 2020-08-23 11:26:25 -05:00
CPunch 0d27412d81 added getNearbyPlayers 2020-08-23 10:42:37 -05:00
Zenpock 1d792a21dd
Npc Warp implementation (#29)
* Update CNShardServer.hpp

* Update ChatManager.cpp

* Update ChatManager.hpp

* Update NPCManager.cpp

* Update NPCManager.hpp

* Add files via upload

* Update NPCManager.cpp

* Update NPCManager.cpp

* Update ChatManager.cpp

* Update ChatManager.cpp

* Update NPCManager.cpp

* Update NPCManager.cpp

Co-authored-by: CPunch <sethtstubbs@gmail.com>
2020-08-23 10:32:25 -05:00
CPunch d6b96389be added sanity checks to nanos 2020-08-22 22:15:27 -05:00
dongresource 6129c0b4e2
Players can now see eachother's nanos. (#28) 2020-08-22 19:52:54 -05:00
CPunch c9bf3d1896 restored default config.ini 2020-08-22 19:27:08 -05:00
CPunch 88953541ef added INITSTRUCT to zero-out data 2020-08-22 19:26:18 -05:00
CPunch 94b0dc724e major refactoring 2020-08-22 18:31:09 -05:00