OpenPunk
/
OpenFusion
mirror of https://github.com/OpenFusionProject/OpenFusion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
281 Commits 6 Branches 9 Tags 14 MiB
Commit Graph

281 Commits

Author SHA1 Message Date
JadeShrineMaiden 0fc072d591 Initial implementation of nano powers. 2020-09-21 19:51:30 +02:00
CPunch 24341c578a
Merge pull request #105 from FinnHornhoover/mingw-version-check-fix 
Fix Make Linux GCC warning and Windows GIT_VERSION error
 2020-09-20 20:14:48 -05:00
FinnHornhoover a05bb15697 fixed makefile append and mingw bugs 2020-09-21 02:12:34 +03:00
CakeLancelot 94583e534b
Merge pull request #102 from darkredtitan/LoadisGMfromConfig.ini 
Respect config.ini GM settings
Upon character creation, the GM value from the config will now be used instead of always being set to false. The default in Settings.cpp has also been changed to be consistent with the config.ini in the repo.
 2020-09-20 14:04:33 -05:00
darkredtitan ff7c78d545 Change default value for GM to true 2020-09-20 20:50:58 +02:00
CakeLancelot 77df7b7160
Merge pull request #92 from gsemaj/crocpot 
Implement Croc Pot item combining
Fix vehicle type override
 2020-09-20 13:40:36 -05:00
darkredtitan 6eb21e6d67 Respect config.ini GM settings 2020-09-20 19:53:33 +02:00
CPunch 228a181b74 removed ChunkManager::removeNPC() 2020-09-20 10:34:43 -05:00
FinnHornhoover 27df1bd7d0 fixed indent 2020-09-20 01:24:42 +03:00
Gent c6ec1c46c2 Add documentation for getItemType() 2020-09-19 16:38:50 -04:00
Gent d1c5e272a8 Fix vehicle type override 2020-09-19 15:26:16 -04:00
CakeLancelot 4d437bcb34
Merge pull request #97 from gsemaj/bugfix1 
Preventing spawning of invalid items using /itemN
Fix fusion matter amount not displaying on enter
 2020-09-19 07:46:56 -05:00
Gent 5dbca0b7b1 Fix fusion matter amount not displaying on enter 2020-09-18 23:26:20 -04:00
CPunch ce9285bab5 support for /unsummon 2020-09-18 16:24:15 -05:00
Gent cd7fec2d5b Fix invalid item bug 2020-09-18 14:45:51 -04:00
CPunch d9d781c37d whoops, everyone had gm 2020-09-18 02:10:30 -05:00
Gent b929d12902 Implement Croc Pot item combining 2020-09-17 23:55:57 -04:00
CPunch 9f78735caa fixed socket reference bug 2020-09-17 22:44:37 -05:00
CPunch 31ef03610d temp fix and small refactor 2020-09-17 21:41:09 -05:00
CPunch 22e3e9e4de fixed 'player clone' bug 2020-09-17 18:03:23 -05:00
CPunch f4db0830ba huge refactoring, chunking added 2020-09-17 17:45:43 -05:00
dongresource 001564a257 Hotfix to stop crashing the server. 
This will need to be fixed properly; probably while we implement
chunking.
 2020-09-17 21:22:31 +02:00
dongresource e79f179628 Mobs respawn now. 
Began work on mob logic. Also cleaned up TableData a little.
 2020-09-17 01:43:48 +02:00
dongresource 027b783571 Visual studio doesn't use -ldl. 2020-09-16 23:13:06 +02:00
dongresource e03da83ff3 Rearranged the codebase a little. 
* Deleted empty Player.cpp
* Moved the helper functions from the obsolete CNStructs.cpp into
main.cpp and deleted it
* Renamed CombatManager to MobManager, as that will likely become it's
main focus soon
 2020-09-16 21:46:15 +02:00
dongresource 5efc8ac089 Switched getTime() to std::chrono on all platforms. 2020-09-16 20:14:00 +02:00
dongresource efda6673b5 Print server version when starting up. 
Also added -ldl to fix cmake compilation on Unix systems.
 2020-09-16 20:12:56 +02:00
dongresource f7571607ba Only send live checks when the connection has been silent for a while. 
Also:
* Made the timeout configurable
* Removed the stale randomcharacters config option
* Switched to time_t for time values, even though it doesn't really
matter that much
* Halved the keepAliveTimer frequency
 2020-09-16 17:45:53 +02:00
CakeLancelot 501d153894
Update README.md 
Inventories are now saved to DB
 2020-09-15 06:02:39 -05:00
dongresource 4d21410980 Merge PR #87 2020-09-14 18:42:03 +02:00
Gent 148d90f4f1 "Boosts and potions!" 
Fixed crate opening such that the item has an iOpt of 1.
 2020-09-14 18:36:50 +02:00
Gent a976fef2b4 Implement vendor stack logic 2020-09-14 10:25:15 -04:00
Gent da8c833587 Implement buyback 
Sellability tweak


Add additional item categories
 2020-09-14 10:25:15 -04:00
Gent c91022030c Load item tables + price implementation 2020-09-14 10:25:15 -04:00
Gent f55cc8f36d Load vendor tables 2020-09-14 10:24:55 -04:00
dongresource 9cc5f3e4d5 Cleaned up comment formatting. 
The incantation was: sed -i 's://\([^ ]\):// \1:' src/*.[ch]pp

Lines of code that was commented out were then manually reverted.
 2020-09-14 16:07:05 +02:00
dongresource 131997f34f Cleaned up all whitespace issues. 
The incantation was: sed -i 's/[ \t]*$//g' src/*.[ch]pp
 2020-09-14 16:07:05 +02:00
dongresource ed86bc9160 Assorted cleanups and fixes. 
* Clean up spacing/indentation
* Proper enum formatting
* Fix nano dismissal (for real this time)
* Do not copy Player struct when a pointer is right there
* Stop looking after the trade partner has been found
* Make sure we're shifting unsigned values (and 64-bit when they need to be)
* Look for JSONs in tdata/
* Add a dbsaveinterval to the example config.ini, in the login category
 2020-09-14 16:07:05 +02:00
darkredtitan 38d5998a6e Sanity checks for creating and deleting characters. 
Co-authored-by: kamilprzyb <kamilprzybspam@wp.pl>
 2020-09-14 16:07:02 +02:00
kamilprzyb c7189a5cef added saving missions 2020-09-14 16:07:02 +02:00
kamilprzyb de15e2004b added bank functionality, refactored itemMoveHandler 
Co-authored-by: Cake Lancelot <CakeLancelot@users.noreply.github.com>
 2020-09-14 16:07:02 +02:00
darkredtitan 480cca82fa Make name checking case insensitive. 
Co-authored-by: kamilprzyb <kamilprzybspam@wp.pl>
 2020-09-14 16:06:57 +02:00
kamilprzyb 3d83f93167 added periodic DB saves, fixed some settings 2020-09-14 01:38:27 +02:00
kamilprzyb 1d9a7139a8 deleteing player deletes inventory and nanos, minor tweaks to settings 2020-09-14 01:38:27 +02:00
kamilprzyb 2fd7a8c6fc Implemented saving inventory and nanos 2020-09-14 01:38:27 +02:00
kamilprzyb fc57cae37d added saving character when a connection with shard is killed 2020-09-14 01:38:04 +02:00
Gent Semaj 3cfec7aab3
Implement transportation framework + full S.C.A.M.P.E.R. functionality (#86) 
* Add transportation registration
* Add S.C.A.M.P.E.R. functionality

Co-authored-by: dongresource <dongresource@protonmail.com>
 2020-09-13 22:26:16 +02:00
CakeLancelot 29e53117e7
Merge pull request #72 from FinnHornhoover/msys-mingw-compile-fix 
Warnings and compile errors for MSYS2 MinGW64
 2020-09-13 07:35:32 -05:00
dongresource c1ac2250a0 Minor changes. 
This was me fixing a few bugs and finding that Gent was working on some
of the same ones, then awkwardly merging the changes together.
 2020-09-12 22:43:04 +02:00
dongresource a4716b0164
Merge pull request #82 from gsemaj/nanos 
Improve revival code
 2020-09-12 22:10:49 +02:00