OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
823 Commits 7 Branches 10 Tags 14 MiB
f7e9cc2cea
Commit Graph

823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
CPunch
3fe1a02200 include 0104 if PROTO_VERSION is undefined 2020-08-21 14:29:09 -05:00
CPunch
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
CPunch
1669ee3660 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-21 00:31:09 -05:00
CPunch
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
CPunch
c7f9358ae5 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-20 22:25:53 -05:00
CPunch
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
CPunch
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
CPunch
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
CPunch
49fbdd2154 Merge branch 'master' of https://github.com/OpenFusionProject/OpenFusion 2020-08-20 16:43:57 -05:00
CPunch
6857f50c30 added basic NPCManager 2020-08-20 16:43:48 -05:00
Raymonf
c827b5a1b6 Lower CMake version requirement to 3.13 
Technically we could probably move this all the way down to 3.6, but 3.13 should be a good version to target.
 2020-08-20 17:21:43 -04:00
Raymonf
7f8e7dfa1c
Use regular old MIT license 2020-08-20 16:17:53 -04:00
Raymonf
09b21c54d3
Update compilation instructions 2020-08-20 16:10:29 -04:00
Raymonf
c549192f59
CMake build support (#8) 
* CMake build support

* Make things nice for VS users

Co-authored-by: Raymonf <Raymonf@users.noreply.github.com>
 2020-08-20 15:59:54 -04:00
CPunch
6843faeb8d fixed windows makefile 2020-08-20 13:31:40 -05:00
CPunch
b43628a19d faster player distance check 2020-08-20 13:19:03 -05:00
CPunch
b94f602537 fixed window build 2020-08-20 12:05:01 -05:00
dongresource
fa5f194cc7
Standardized Makefile. (#7) 
* Standardized Makefile.

* Incremental compilation
* C++ compilers are called CXX
* Removed excessive comments for well-understood things
* Added clean target
* Proper .PHONY usage
* Updated .gitignore for object files (+ ctags, and vim temp files)

* Add mkdir -p bin.
 2020-08-20 12:03:15 -05:00
CPunch
fbc3c79aa2
Merge pull request #6 from CakeLancelot/add-more-movement-packets 
Add zipline, slide, cannon, and jump pad packets
 2020-08-20 11:38:13 -05:00
CPunch
93d973bf21 small CNStructs.hpp refactor 2020-08-20 11:37:47 -05:00
CPunch
7cf239e3af added 0728 structs + small CNStruct.hpp refactor 2020-08-20 11:36:29 -05:00
CakeLancelot
14d556976d Add zipline, slide, cannon, and jump pad packets 
Cannon still looks wonky from other player's PoV, something's up with the rotation - will investigate later.
 2020-08-20 11:26:26 -05:00
CPunch
af6158fbb2
Merge pull request #5 from dongresource/master 
Add example config.ini with documented options.
 2020-08-20 10:53:45 -05:00
CPunch
c0abab39ae better structs header 2020-08-20 10:45:50 -05:00
CPunch
dff6e8c23b better structs header 2020-08-20 10:44:49 -05:00
CPunch
d6e1f57c23 merged master 2020-08-20 10:43:37 -05:00
dongresource
9f3f9bb9c3 Fix grammar. 2020-08-20 17:24:27 +02:00
dongresource
0654500df3 Add default config.ini. 
Custom servers will always need one anyway. Might as well give them a
properly documented example to start with.
 2020-08-20 17:14:25 +02:00
CPunch
a0065c2050
Merge pull request #4 from Eperty123/master 
Added nano summon feature
 2020-08-20 09:48:31 -05:00
Onii-chan
795107a274 Added nano summon feature 2020-08-20 11:51:02 +02:00
CPunch
42597c2a7a bitch, we good! 2020-08-19 22:32:33 -05:00
Raymonf
bb1ce5c28d fix: MOTD not showing up without config.ini 
Since we do an early return without a config.ini file, the MOTDSTRING will still be the default std::string value (""), causing the game to output "Gamemaster: ". To fix this, we'll just hardcode the preferred default value for now.
 2020-08-19 22:39:23 -04:00
Raymonf
e75049fc98 MSVC support: alternative implementation of getTime() 2020-08-19 22:26:46 -04:00
Raymonf
1ec4634f69 long -> int64_t; push and pop the original packing for structures 
fixes the issue with the tutorial thing
 2020-08-19 22:25:19 -04:00
CPunch
4d9072a752 added radio's logo, started NPCManager 2020-08-19 17:21:35 -05:00
CPunch
a0d59419f1 changed non-blocking failure to a socket shutdown 2020-08-19 15:54:44 -05:00