Commit Graph

104 Commits

Author SHA1 Message Date
Onii-chan
4dfbc6253e Update PlayerManager.cpp 2020-08-22 17:18:15 +02:00
Onii-chan
d618d1b353 Updated indentations 2020-08-22 17:11:41 +02:00
Onii-chan
70816e3e64 Update PlayerManager.cpp 2020-08-22 16:39:49 +02:00
Onii-chan
a985da4943 Update PlayerManager.hpp 2020-08-22 15:57:57 +02:00
Onii-chan
d1e9ad92c1 Update NanoManager.hpp 2020-08-22 15:52:02 +02:00
Onii-chan
402d1bd920 Merge branch 'Test' 2020-08-22 15:47:11 +02:00
Onii-chan
40b717f570 Test: More nano features 2020-08-22 15:38:57 +02:00
Onii-chan
68358b4a62 Update NanoManager.cpp 2020-08-22 13:51:30 +02:00
Onii-chan
18633124ac Test: Add nano power feature
Nano powers are set to the first power in its selection by default.
2020-08-22 13:49:32 +02:00
Onii-chan
292b677535 Update CNShardServer.hpp 2020-08-22 13:44:06 +02:00
Onii-chan
0701871a0a Update CNShardServer.hpp 2020-08-22 13:43:17 +02:00
Onii-chan
0e74248fff Merge remote-tracking branch 'upstream/master' 2020-08-22 13:35:43 +02:00
Onii-chan
3e73245d24 Merge remote-tracking branch 'upstream/master' into Test 2020-08-22 13:32:48 +02:00
FinnHornhoover
5f65a84b02 Fix unhandled exception in NPCManager (#24)
* fixed PROTOCOL_VERSION not being defined

* handle exceptions in NPCManager init
2020-08-22 01:46:52 -05:00
78c493b461 switched default ip in config.ini 2020-08-21 23:37:09 -05:00
f71e1349c1 temp fix for U16toU8 edgecase 2020-08-21 22:11:04 -05:00
cff382a8ce sets a limit for sendData() 2020-08-21 21:32:22 -05:00
bbd6c5b532 moved header libraries 2020-08-21 21:03:12 -05:00
JadeShrineMaiden
ab6df26f92 Disabled GM mode (#22)
Temporarily disabled, players can now use item commands without GM mode.
2020-08-21 19:38:10 -05:00
FinnHornhoover
786ee5f4f4 fixed PROTOCOL_VERSION not being defined (#23) 2020-08-21 19:37:59 -05:00
c5efbceca3 added sanity checks for sendPacket() 2020-08-21 19:33:42 -05:00
bf6c5d1b6b fixed NPC scrape 2020-08-21 18:08:42 -05:00
fdfa7b5776 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-21 17:14:38 -05:00
f289c72f6f populated NPCManager 2020-08-21 17:14:11 -05:00
Raymonf
7318d9b578 AppVeyor: Build all protocol versions on Linux (#21)
* let's try this

* Update appveyor.yml
2020-08-21 16:39:30 -04:00
JadeShrineMaiden
caaffcbe3d Item Deletion and extra fixes (#17)
* Deleting Items

* fixes

* fixes 2

* Basic GM login

* Update ItemManager.cpp

Co-authored-by: Raymonf <raymonf@outlook.com>
2020-08-21 15:09:52 -05:00
3fe1a02200 include 0104 if PROTO_VERSION is undefined 2020-08-21 14:29:09 -05:00
cd19c54824 itemManager now uses a reference to the PlayerView 2020-08-21 14:28:14 -05:00
Raymonf
88d08ffca7 Fix MSVC compilation by not using non-standard struct initialization (#20)
Co-authored-by: Raymonf <Raymonf@users.noreply.github.com>
2020-08-21 14:17:06 -04:00
Raymonf
7a46f061ed Fix Windows CI by removing leading 0 in packet versions 2020-08-21 13:50:09 -04:00
dongresource
df18f3ccd1 PROTOCOL_VERSION, test items, MOTD fix (#18)
* Cleaned up protocol selection.

* cmake now works even if protocol option is omitted
* make now supports protocol selection
* removed PACKET_VERSION/CNPROTO_VERSION* redundancy
* ubuntu appveyor script has yet to be written
* cleaned up some trailing spaces

* Add some test items.

Ironically, this change is untested.

* [bugfix] Transmit MOTD when entering the game, not when loading screen fades.

This fixes unnecessary retransmission when /warping.
2020-08-21 12:38:45 -05:00
Onii-chan
4f49eb652a Merge remote-tracking branch 'upstream/master' into Test 2020-08-21 12:24:55 +02:00
Onii-chan
2c09401ab7 Add nano power feature 2020-08-21 12:00:13 +02:00
1669ee3660 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-21 00:31:09 -05:00
5d0b30b4cb added AINVEN_COUT for 0728 2020-08-21 00:31:00 -05:00
Raymonf
0041da795a Build multiple packet versions on AppVeyor for Windows (#14)
* Move to PowerShell script for Windows build

* Allow CMake to override struct version

* PACKET_VERSION option

* Rename CNPROTO_CUSTOM to CNPROTO_OVERRIDE

Co-authored-by: Raymonf <Raymonf@users.noreply.github.com>
2020-08-21 01:18:19 -04:00
Raymonf
24be117e28 Add Discord badge to README (#13) 2020-08-20 23:26:27 -04:00
c7f9358ae5 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-20 22:25:53 -05:00
eee1b52722 fixed ItemManager 2020-08-20 22:25:39 -05:00
CakeLancelot
e3d53e8dcf Add Discord badge to README 2020-08-20 22:04:35 -05:00
Raymonf
b89df8d497 Mention AppVeyor in the readme 2020-08-20 22:54:11 -04:00
Raymonf
faf73fc835 Initial AppVeyor build configuration (#12) 2020-08-20 22:46:48 -04:00
JadeShrineMaiden
aa2adcd9e2 Items Implementation (#11)
* Item Manager (Initial Implementation)

* Item Manager (Second Phase)

* Item Manager (Phase Three)

* Not Working Code

* Inventory Implementation (Complete?)

* Items Implementation

-Fixed Indentations
-Final touches to make it all work

* Update Makefile

* Added small comments

-- needs to be fixed
2020-08-20 21:10:14 -05:00
dongresource
e044b4251a Cleanup indentation. (#10) 2020-08-20 19:37:34 -05:00
7b085e9c8b added sanity checks 2020-08-20 18:50:30 -05:00
Raymonf
da11220762 Allow opening CMakeLists as a CMake project in VS
Added another check just in case someone wants to do this for some reason. It's bad. You shouldn't do it.
2020-08-20 18:44:30 -04:00
1425074ccb edited config.ini default back, better plr pos 2020-08-20 16:59:32 -05:00
Raymonf
c66ac111ab Silence codecvt deprecation warning on VC++ 2020-08-20 17:47:38 -04:00
Raymonf
32a37acd5a Update CMakeLists to use correct binary name and pthreads if not using MinGW/VS 2020-08-20 17:47:27 -04:00
49fbdd2154 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-20 16:43:57 -05:00