Commit Graph

438 Commits

Author SHA1 Message Date
Kayne Ruse 9ba76c8987 Added RegionPagerLua destructor 2014-11-26 06:11:27 +11:00
Kayne Ruse 5eeda8235d Fixed the scripts struggling with nested API tables
I actually don't remember what the RoomData's lua references where for,
but I'm pretty srue it wasn't this. I'll figure something out when I've
had a sleep.
2014-11-23 06:40:31 +11:00
Kayne Ruse 20d40d5b81 Implemented two-step logins, basic connections build 2014-11-23 05:47:21 +11:00
Kayne Ruse 5e11077c7a Merge branch 'develop' into server-expansion 2014-11-23 04:13:11 +11:00
Kayne Ruse ba81bcba69 Added a README for the demo build 2014-11-22 04:21:15 +11:00
Kayne Ruse 9329274866 Project builds, but with a lot of logic dummied out 2014-11-16 23:16:21 +11:00
Kayne Ruse ace87b438b Began working changes into lobby 2014-11-16 23:02:06 +11:00
Kayne Ruse 1f3c1f32f4 Moved 'renderable' stuff to 'entities' 2014-11-16 22:40:13 +11:00
Kayne Ruse cacd3dcd6d Removed the statistics structure from common/* and server/* 2014-11-16 22:34:12 +11:00
Kayne Ruse 97b7945191 need to go TMP COMMIT 2014-11-14 10:20:04 +11:00
Kayne Ruse a01d75549f Updated todo.txt
I'm so bored I'm working on my game remotely. This is a public access computer without a compiler :/
2014-11-14 10:16:27 +11:00
Kayne Ruse ecd0b43abe Corrected comments
Because this file was originally copied from the map API, there were references to the map. I've corrected this.
2014-11-14 10:05:00 +11:00
Kayne Ruse d35ab24e15 Added TODO 2014-11-14 10:02:15 +11:00
Kayne Ruse 100c4f6522 Added TODO 2014-11-14 10:01:24 +11:00
Kayne Ruse a1c20959fe The server builds using the new packet types; incomplete
Most of this was achieved by dummying out calls in HandlePacket(), so the
server's actual logic is incomplete.
2014-11-09 23:15:09 +11:00
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 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 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