Commit Graph

575 Commits

Author SHA1 Message Date
Kayne Ruse 3b9df46510 Merge branch 'network-expansion' into server-expansion 2014-11-08 17:09:04 +11:00
Kayne Ruse f7ba34dcec Fleshed out ClientManager
* Fleshed out the ClientManager internals
* Folded some ServerApplication methods into ClientManager
* Removed Manager references from ServerApplication
* Corrected server_methods.cpp (compiles)
2014-11-08 16:33:27 +11:00
Kayne Ruse 3192524922 Merge commit '0f13956'
* also eliminated ./todo.txt
2014-11-07 00:17:31 +11:00
Kayne Ruse 74234684af Started planning ServerApp refactoring 2014-11-07 00:07:19 +11:00
Kayne Ruse 06e027710f Created the room system's API, and tweaked some other APIs 2014-11-06 22:42:03 +11:00
Kayne Ruse 73d9095604 Minor comment tweaks 2014-11-06 02:00:13 +11:00
Kayne Ruse f2d79225a3 Created '*_data.cpp' files, modified API files a bit 2014-11-06 01:54:27 +11:00
Kayne Ruse daa38413f3 temp script changes 2014-11-06 01:22:08 +11:00
Kayne Ruse a4ed23f6c7 Created a way to coalesce map modules into one table 2014-11-06 01:16:02 +11:00
Kayne Ruse cfdc61c357 Tweaked TODO comments 2014-11-06 00:04:42 +11:00
Kayne Ruse 77b47b4634 Merge branch 'mingw-fix' into server-expansion 2014-11-05 23:55:38 +11:00
Kayne Ruse 0f139562c3 Theoretically resolved jenky cross-compiler compatability 2014-11-05 23:54:10 +11:00
Kayne Ruse fc2bc06992 Made a few tweaks to various managers 2014-11-05 23:43:36 +11:00
Kayne Ruse 8eefdd71b5 Moved the API files back again 2014-11-05 23:07:34 +11:00
Kayne Ruse 966443be3d CharacterData inherits from Entity 2014-11-05 23:02:14 +11:00
Kayne Ruse 5327d91917 Moved API files to their own directory 2014-11-02 20:42:26 +11:00
Kayne Ruse 6399efc227 Created the monster system 2014-10-30 01:05:41 +11:00
Kayne Ruse 7da5de619b Created entity.hpp and door system 2014-10-30 01:01:11 +11:00
Kayne Ruse 0735037f10 Created ClientManager 2014-10-30 00:40:32 +11:00
Kayne Ruse 8c78a5d26c Updated TODO.txt 2014-10-29 23:34:36 +11:00
Kayne Ruse f584dd140b Began work on expanding the network protocols 2014-10-23 23:50:49 +11:00
Kayne Ruse 4434900afc Merge branch 'unix-compat' into develop
Conflicts:
	todo.txt
2014-10-19 05:53:09 +11:00
Kayne Ruse 2a7a2889c6 Merge branch 'unix-compat' 2014-10-19 05:50:13 +11:00
Kayne Ruse e488b15acc Corrected the libs order in the root makefiles
The calls to ConfigUtility::Load() also received some tweaks, to use '/'
instead of '\' for unix compatability. Also removed -llua from graphics
makefile.
2014-10-19 05:40:48 +11:00
Kayne Ruse 387e86de63 Merge remote-tracking branch 'froozen/master' into unix-compat 2014-10-19 05:17:45 +11:00
Kayne Ruse 0e3a042fbb Minor notes in todo.txt 2014-10-19 05:16:42 +11:00
fro_ozen de7167e830 Added unix compatability 2014-10-18 20:10:17 +02:00
Kayne Ruse 40c76b4285 Implemented a few minor changes from the monster branch 2014-10-19 01:25:03 +11:00
Kayne Ruse 12cc970bf1 Merge branch 'develop', read more
This merge covers mostly back-end refactoring, including splitting
Character into Renderable and BaseCharacter, as well as creating the
manager interface.
release-0.5.2
2014-10-18 23:45:57 +11:00
Kayne Ruse bd2fd4ee97 Merge remote-tracking branch 'origin/monsters' into develop
This branch splits Character into two classes:

* Renderable
* BaseCharacter

While also adding these two empty classes:

* LocalCharacter
* BaseMonster

This split is not used in any major way, due to implementation issues encountered in a later version of this branch. Before I can implement monsters and local/foreign characters, the types of network packets need to be expanded in yet another branch.

It also renames CleanUp to DisconnectedScreen, and simplifies it's implementation.
2014-10-18 23:31:53 +11:00
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