Commit Graph

232 Commits

Author SHA1 Message Date
Kayne Ruse 2f86511254 lobby_menu.cpp builds, as does all of client/menu_scenes
This is great progress, but I think I should turn the common directory into a subnmodule, since
I've been constantly tabbing back and forward between this folder, and the debug folder, making
and committing identical edits to both.

 Scene list:
        > disconnected_screen.*pp
        > lobby_menu.*pp
        > main_menu.*pp
        > options_menu.*pp
        > splash_screen.*pp
        * world*.*pp

        * unfinished
        > building
2015-08-14 21:47:04 +10:00
Kayne Ruse e8347cb9fb Reverted templated TextBox; too much unnecessary complexity 2015-08-14 20:52:05 +10:00
Kayne Ruse 8c3f7913f6 Converted TextBox into a template class 2015-08-14 19:42:45 +10:00
Kayne Ruse fedc420c19 Merged common/ui into common/graphics 2015-08-14 18:02:39 +10:00
Kayne Ruse b10572ccaf Imported TextLine and TextBox, added Image::CopyTexture 2015-08-13 23:47:32 +10:00
Kayne Ruse aa9081d9cf Imported new Button class, deleted menu_bar.*pp 2015-08-02 01:45:46 +10:00
Kayne Ruse 48f5512e1a Fixed a mistyped variable name 2015-07-20 17:14:24 +10:00
Kayne Ruse d2e75e02c5 Imported updates to the map system 2015-07-20 13:35:10 +10:00
Kayne Ruse 4ced681c76 Working on the ui, incomplete 2015-07-08 03:09:50 +10:00
Kayne Ruse af17bd2800 Updated common/graphics, client/base_scene.*pp to SDL2 2015-07-07 19:51:27 +10:00
Kayne Ruse 24eb730c72 Switched to the #pragma once system 2015-07-07 17:36:14 +10:00
Kayne Ruse 99b35483f8 Tenative port for Linux 2015-05-17 09:18:46 +10:00
Kayne Ruse 5c404c572e Patched bug #45 without resolving it 2015-04-28 06:01:58 +10:00
Kayne Ruse 878d502b8b Looking for the bug 2015-04-27 01:35:14 +10:00
Kayne Ruse 2a1ee4acbf tmp 2015-04-26 03:29:33 +10:00
Kayne Ruse 0e149acc62 Pointless tweak 2015-04-26 03:24:25 +10:00
Kayne Ruse 63e4394583 I can't seem to pinpoint the cause 2015-04-26 03:11:00 +10:00
Kayne Ruse 501b1e9814 Reduced script verbosity to a degree 2015-03-08 20:08:12 +11:00
Kayne Ruse 74ed93ddc7 Character bounds are stored in the server database
This allows for customization of bounding boxes, as well as highlighting
aspects needed when adding new fields to the characters.
2015-03-04 04:06:16 +11:00
Kayne Ruse 3e6a05307e Minor TODO tweaks 2015-02-27 03:36:47 +11:00
Kayne Ruse 46df0f17b7 Changed a massive swap statement for bounds checks
Instead of using a massive block of case statements in serial_utility.cpp,
I've added FORMAT_* tags to SerialPacketType as a way to destinguish
between type values, at least internally. I can't believe I missed this
for so long.

I've also added a placeholder for the network API, as I was working on
that when I ran into this problem.
2015-02-21 23:46:50 +11:00
Kayne Ruse 87af4f1a1e Comment tweaks, updated network version 2015-02-14 23:54:18 +11:00
Kayne Ruse 18b144fa46 Updated client, read more
It seems like the project as a whole is fairly stable now. I'm prepping to
merge this into master, despite the lack of monsters ATM. Hopefully this
break hasn't affected the stability too much.
2015-02-14 23:39:56 +11:00
Kayne Ruse e71d0b3a09 Finished these server tweaks 2015-02-13 23:34:34 +11:00
Kayne Ruse ca2d4c9217 Expanded network protocol, read more
Not really doing much, just busywork with the server's handlers.

I've tweaked the TODO tags as well.
2015-02-13 02:05:10 +11:00
Kayne Ruse bad6cc2fab Moved ip_operators.*pp to common/utilities 2015-02-05 23:06:22 +11:00
Kayne Ruse 95e3ce9a69 Re-added the network version 2015-02-05 22:24:04 +11:00
Kayne Ruse a18577665a Updated TODO tags 2015-01-23 03:34:53 +11:00
Kayne Ruse 2a86a09693 Merge branch 'monsters' into develop
Conflicts:
	client/scenes/in_world.cpp
2015-01-20 05:04:08 +11:00
Kayne Ruse 7356e8ae77 Removed the dependencies on utility.*pp 2015-01-17 21:46:12 +11:00
Kayne Ruse dc40ee64cf common builds cleanly 2015-01-13 00:23:01 +11:00
Kayne Ruse de1cd8d6a8 Began expanding network protocols for monsters
All big feature expansions have begun with SerialPacketType, and this is
no exception.
2015-01-13 00:04:42 +11:00
Kayne Ruse f13e8479e4 Refactored scripts, added a smoother for Debug Islan
I've added a simple edge-smoothing function to debug island's generator. It
doesn't handle all edge cases (pun intended), but the proof of concept is
sound. I just wish I could release this...

I've also added exception checks to region.cpp
2015-01-12 01:14:24 +11:00
Kayne Ruse be67906218 Moved TileSheet to common/graphics
Also deleted TileSheet's vestigial API.
2015-01-09 12:41:24 +11:00
Kayne Ruse 877c0f59d3 Removed preprocessor switch surrounding library headers 2015-01-03 03:20:13 +11:00
Kayne Ruse 6704944105 Updated the map system & APIs 2014-12-31 06:01:03 +11:00
Kayne Ruse f9c19a630d Added trigger reference to WaypointData, unused
WaypointData also inherits from Entity now, so I could alias Entity's API
for it too. I've also made a number of comment tweaks.
2014-12-31 03:34:06 +11:00
Kayne Ruse 33c3143de9 Added unary negative to Vector2
This is the only fragment I'm bothering to salvage from the collisions
branch.
2014-12-27 20:31:09 +11:00
Kayne Ruse ce16fc6969 Merge branch 'develop' into high-water-mark
Conflicts:
	server/server_logic.cpp

Finally merging the changes to develop. This is only the ConfigUtility
skipping missing files, and something with the Timer class, that I'll need
to test the collisions.
2014-12-27 19:28:02 +11:00
Kayne Ruse 7e5a7f8183 Updated the copyright headers about a week ahead 2014-12-27 13:29:16 +11:00
Kayne Ruse 015631a73d Implemented client-side HandleCharacterCreate 2014-12-18 09:14:11 +11:00
Kayne Ruse 3399053e64 Added an option to skip missing config files 2014-12-16 21:49:50 +11:00
Kayne Ruse c89f94b681 Missed the map system's nested API table 2014-12-01 00:26:47 +11:00
Kayne Ruse 06eb1f2e9e Minor tweak to the Timer class; kind of pointless 2014-11-30 23:04:54 +11:00
Kayne Ruse b59cd0fe87 Server-side HandleRegionRequest() reimplemented
Note that this locally handles bug #35, and adds a new packet type:

REGION_REJECTION
2014-11-30 22:23:46 +11:00
Kayne Ruse 584b6ea303 Fixed a bug in deserializePacket() 2014-11-26 07:51:24 +11:00
Kayne Ruse 01461deaa5 Set the values for packets, and added getRoom() 2014-11-26 07:11:27 +11:00
Kayne Ruse 9ba76c8987 Added RegionPagerLua destructor 2014-11-26 06:11:27 +11:00
Kayne Ruse 20d40d5b81 Implemented two-step logins, basic connections build 2014-11-23 05:47:21 +11:00
Kayne Ruse ace87b438b Began working changes into lobby 2014-11-16 23:02:06 +11:00