Commit Graph

495 Commits

Author SHA1 Message Date
Kayne Ruse c3041d2a74 Merge branch 'disconnected' into monsters
This quick divergence ensured that the changes so far will work properly.
2014-10-10 06:57:52 +11:00
Kayne Ruse 974effd95e Implemented DisconnectedScreen, and removed CharacterMap
Project also builds, since I went through and adjusted it. It's hacky
right now, but I just want to make sure it worked. I'll give it another
pass before merging into develop.
2014-10-10 06:54:48 +11:00
Kayne Ruse f3073efa39 Renamed clean_up.*pp to disconnected_screen.*pp 2014-10-10 06:35:50 +11:00
Kayne Ruse 1761134839 Added LocalCharacter & BaseMonster 2014-10-10 06:32:53 +11:00
Kayne Ruse 7c4762852b Moved Renderable and Character into Renderable/ 2014-10-10 06:18:50 +11:00
Kayne Ruse 8dcd02aba3 Separated some character code into Renderable 2014-10-10 06:00:58 +11:00
Kayne Ruse 4d6186021f Added 'skume' sprites 2014-10-07 22:22:08 +11:00
Kayne Ruse b7847d6260 Merge branch 'fun-with-interfaces' into develop 2014-10-07 02:10:23 +11:00
Kayne Ruse 869780589f finished rewriting the room API 2014-10-07 02:08:00 +11:00
Kayne Ruse 254b97aa80 Implemented ManagerInterface in AccountManager and CharacterManager
ManagerInterface was already designed for those two anyway. The only thing
left to do is to rewrite the room API, and the whole thing should work
fine again.

I still think map data should be saved and loaded by lua code, so the
rooms will still implement lua hooks. There may be other things that can
be loaded from SQL, but I don't know what.
2014-10-07 01:23:55 +11:00
Kayne Ruse 5a42a7e36c Wrote ManagerInterface, implemented it in RoomManager
ManagerInterface is a server-side pure abstract class; all of it's methods
are defined as pure virtual methods, and as such should be defined in the
derived classes. It works correctly along side the Singleton class, but
does not implement it directly as originally planned. It should also
support variadic parameters, which still need testing.

I've implemented ManagerInterface in RoomManager, but I've also disabled a
number of the RoomManager's features, including the lua interface. The
project as a whole should build, but it won't run correctly. The variadic
parameters will be tested using the other managers.

It feels good just playing around instead of pushing forward all the time.
2014-10-07 00:55:55 +11:00
Kayne Ruse 76206a1146 Minor fix 2014-10-04 19:09:37 +10:00
Kayne Ruse 1f099a07dc Changed the command line argument's requirements 2014-10-01 02:51:56 +10:00
Kayne Ruse 356d83caf6 Merge branch 'develop', reviewed the managers' layout 2014-10-01 02:23:13 +10:00
Kayne Ruse be9ce33637 Changed a bunch of method names, including Singleton<> 2014-10-01 01:57:03 +10:00
Kayne Ruse 9b43b4641f Salvaging what I can from the failed experiment, read more
I'm salvaging the changes to AccountManager and CharacterManager that
don't break the build too badly. This won't build, but it'll be easier to
rectify.

Also, I've reduced the length of the manager's method names, and renamed
sql_utility.*pp to sql_tools.*pp
2014-10-01 01:33:38 +10:00
Kayne Ruse 6589a1a06d Merge branch 'develop' 2014-09-30 23:31:50 +10:00
Kayne Ruse db40f198be Moved heartbeat code to ServerApplication::CheckClientConnections() 2014-09-30 02:01:56 +10:00
Kayne Ruse 87ef03d512 Moved the debug island into a module 2014-09-30 00:44:54 +10:00
Kayne Ruse 8e97de6979 Added the scripts directory to lua's path
This will allow modules.
2014-09-29 23:42:40 +10:00
Kayne Ruse d4740df996 Merge branch 'develop' 2014-09-28 20:23:33 +10:00
Kayne Ruse 926871d5fe Merge branch 'master' into develop 2014-09-28 20:22:34 +10:00
Kayne Ruse c010c0da0a comment tweaks to bug tags 2014-09-28 20:22:11 +10:00
Kayne Ruse 8dc41886ef Updated the README 2014-09-28 19:50:15 +10:00
Kayne Ruse e452f2ecfc Moved sql_utility.*pp to server/ directory
Also padded setup_server.sql's formatting, for readability.
2014-09-28 03:42:16 +10:00
Kayne Ruse bfcf9a1d37 Moved the character's stats into their own database table
This will allow the to be reused elsewhere, as well as cleaning up big
blocks of code in the manager's source.

BUGFIX: The config's key-value pair overrides now work without requiring a
config file specification.
2014-09-28 03:10:39 +10:00
Kayne Ruse 59e3518dd8 Implemented command line config overrides
You can set the file to read as the config file via the command line, like
this, assuming the program supports it:

  prog -config=file.cfg

You can also override indevidual key-value pairs in the config system
using this syntax:

  prog -Ckey=value

Both commands can be used together, and you can override multiple
key-value pairs at once. To use this feature of the ConfigUtility, it must
receive argc and argv as parameters to the Load() method.
2014-09-28 02:11:26 +10:00
Kayne Ruse 58bb70d1c5 Merge branch 'develop', read more
This merge handles a number of backend features, including error handling and other types of messages. I think there's more I could've done in this time, but this is what I have nonetheless.
2014-09-13 12:01:48 +10:00
Kayne Ruse 9367bd802f Tweaked todo.txt 2014-09-13 12:01:29 +10:00
Kayne Ruse 411687b41c Added a proper disconnection message by hacking the config 2014-09-10 17:35:12 +10:00
Kayne Ruse ad2c65dc67 Remeved the commented BUGFIX tags 2014-09-10 17:00:13 +10:00
Kayne Ruse 712d94d3b2 Client now handles character rejections 2014-09-10 16:57:35 +10:00
Kayne Ruse 17b9eb7ad4 Added more rejection packets, revised some logic 2014-09-10 16:06:01 +10:00
Kayne Ruse 2c06232264 JOIN_REJECTION works, ready for the rest 2014-09-09 08:39:36 +10:00
Kayne Ruse 4c882682ed Added TextPacket 2014-09-09 08:05:50 +10:00
Kayne Ruse f581c3238f Tweaked some TODO comments 2014-09-03 04:36:02 +10:00
Kayne Ruse ceb6fe73f5 Merge branch 'develop', heartbeat systems 2014-09-03 03:25:04 +10:00
Kayne Ruse 246a5ee541 The server-side heartbeat is working and stable 2014-09-03 03:24:32 +10:00
Kayne Ruse 79c7e48139 UDPNetworkUtility accepts addresses by value, encapsulated ClientData
I started encapsulating ClientData, and I added the internals for the
heartbeat ssytem. However, when I took a look inside UDPNetworkUtility, I
realized that I didn't have to pass the IPaddresses by reference anymore.
Therefore, I've changed it to accept the addresses by value, and I'm
committing that change right away before I finish the heartbeat system.

This engine is really shaping up, I think.
2014-09-03 01:59:53 +10:00
Kayne Ruse 06922dc820 Client-side heartbeat is working 2014-09-03 01:21:17 +10:00
Kayne Ruse 5577387d61 Added basic hearbeat framework 2014-09-03 00:53:55 +10:00
Kayne Ruse d50cf5b91e Fixed shoddy packet typing 2014-09-03 00:45:08 +10:00
Kayne Ruse 6ca62db16d Merged network changes from branch 'develop', read more
After several days of trying, I decided to discard changes to the networking system:

> discard-encapsulated-packets

Instead, I've moved the packets and specialized serial functions into the same directory, and renamed them accordingly. The serialization code is only accessed by UDPNetworkUtility.

I've also removed the combat and enemy code from the network system, and reduced the number of packet types in SerialPacketType. These changes should make it easier to add more features in the future.
release-0.5.1
2014-08-31 15:35:35 +10:00
Kayne Ruse 5536bf366d Implemented the serialization switch statement 2014-08-31 15:35:14 +10:00
Kayne Ruse 094efad728 Rearranged the packet and serial code to make more sense
This mostly just reimplements the best parts of the discarded branch:

> discard-encapsulated-packets

There may still be some work needed.
2014-08-31 13:24:53 +10:00
Kayne Ruse f77aec6dd7 Merge branch 'develop' 2014-08-27 14:01:46 +10:00
Kayne Ruse 6f4334f84d Moved serialization globals 2014-08-25 00:07:17 +10:00
Kayne Ruse 4ed512e0e2 Moved the snapToBase() utility function to region.*pp
I've also adjusted the TODO file, which really shouldn't be committed.
Still, it's there now, so it stays. I don't think the logger is going to
be possible any time soon, so I'll probably look into the disconnection
handler.
2014-08-24 13:23:50 +10:00
Kayne Ruse d0cc5521da Merge branch 'develop' 2014-08-19 04:19:21 +10:00
Kayne Ruse af8e7b70a0 Merge branch 'refactor-server' into develop
This is mostly just back end refactoring.
2014-08-19 04:14:34 +10:00