46f02dcfdd
Minor tweak to ConfigUtility
2014-07-31 17:14:40 +10:00
414a0896c9
Began merging the jam branch into the development (read more)
...
The list of changes committed:
* Removed SimpleRNG
* Added Timer (for debugging)
* Added BoundingBox
* Added floating point snapToBase()
* Added error check to Vector2::Normalize()
* Updated makefiles, project compiles
2014-07-30 21:10:43 +10:00
28d083cba4
Hammered out server-side issues, read more
...
* Removed the client-only code from CharacterData, including the .cpp file
* Removed CombatManager and EnemyManager instanciation
2014-07-03 01:41:58 +10:00
4dd4b37fc0
It now builds cleanly, but I cut a few code stubs
2014-07-03 00:56:30 +10:00
82b1b589dc
Moved some files around
2014-07-03 00:23:43 +10:00
93480be685
Solid data is moving from the server to the client, read more
...
The APIs have access to the solid data, and I fixed a bug: Basically, the
template parameter for std::bitset expects an integer representing the
number of bits to hold, but I initially misread it as the number of bytes.
This has been corrected.
I've also added a sandy beach to the generated island. I'm tempted to
start working on some simple generators soon.
2014-07-02 00:47:37 +10:00
8ed308e89a
Switched the hack for the bitset
...
I've also added acessors and mutators to the Region and RegionPagerBase
classes.
2014-07-01 22:55:43 +10:00
8df1ecd804
This hack for the collision map was a terrible idea
...
I'm committing these changes before undoing these, and coding it properly.
2014-07-01 22:04:45 +10:00
8c9d071c7a
Minor tweaks
2014-07-01 01:03:03 +10:00
95362286f8
Committing the island generator script, and a bugfix
...
region_api.cpp had a bug, where a glue function's name was used twice. It
was an easy catch, but there was an issue in the new script, where I was
counting from 0 instead of 1. As a result, I was chasing a segfault for 5
hours.
2014-06-23 10:29:39 +10:00
316db43b0a
Fixed CreateRoom()'s return type
2014-06-23 04:54:01 +10:00
46ed196bf4
All current lua hooks are being called
2014-06-23 04:10:21 +10:00
64baa63d12
Changed the naming conventions (read more)
...
I've changed some naming concentions in the lua APIs. I've also made a few
other tweaks, like region_pager_api.cpp delegating to the passed
RegionPager object. This won't explicitly run, becuase there's still a few
more changes needed.
2014-06-23 03:45:30 +10:00
a6de5f9e69
Imported the files from branch 'fixed-map'
2014-06-21 05:28:06 +10:00
618666de43
Renamed the Restart scene to CleanUp
2014-06-15 22:39:10 +10:00
5c74ecdd72
Removed ESC key exit, and tweaked some comments
2014-06-15 22:24:50 +10:00
bd5e57401e
Minor comment tweaks
2014-06-14 23:27:33 +10:00
c021032512
The character is visible, fixed a database issue
2014-06-14 22:37:21 +10:00
c210b99a5f
Merging a slight change to master
2014-06-14 04:08:18 +10:00
b418ad713d
Worked these changes into the client & server (read more)
...
The changes were fairly easy, and I was actually able to find and fix an
out-of-sequence bug: The destructors for the AccountManager and the
CharacterManager were using SQL code after the call to SQLite3_close_v2(),
so I added and called UnloadAll() for both of them.
2014-06-14 03:38:13 +10:00
1bc51fe035
Removed the 'erase_if' template, that was silly
2014-06-14 03:08:33 +10:00
793737e1ed
Experimenting with the map
2014-06-14 03:05:21 +10:00
a11867126c
Fixed segfault in common, changed casting of packets to static_cast
...
This required that I switch from using a char array for the packet buffers
to using malloc() and free(). They make more sense anyway, and I've
learned (or relearned) something about casting.
2014-06-12 03:47:49 +10:00
955aed2224
in_world.cpp is building
2014-06-11 21:48:01 +10:00
ee79231de0
Began bringing the client into line with the server's changes
...
Several parts of the client already built correctly.
Updated LobbyMenu, it not builds.
2014-06-10 02:42:07 +10:00
a07e7418a6
Implemented a basic API for the server's rooms
2014-06-10 01:46:42 +10:00
1ef5eb7a0f
Pager's heavyweight API methods call the Region's counterparts
2014-06-10 00:52:19 +10:00
135e650ec8
Moved the map API to the map directory
2014-06-10 00:38:00 +10:00
b7c12ba106
Fleshed out the pager's API
2014-06-10 00:20:51 +10:00
2d27399fd1
Added the pager API placeholder files
2014-06-08 19:43:24 +10:00
ba83fac29f
Changed map API to region API
2014-06-08 19:30:03 +10:00
b269ce5fb9
Re-added the lua hooks
2014-06-08 04:20:07 +10:00
f034c32c38
Collapsed the pager into a single file, removing lua hooks
...
I need to re-add the lua hooks, but it'll be easy.
2014-06-08 04:01:09 +10:00
ee2ac0b7a9
Created MAX_PACKET_SIZE
2014-06-08 00:36:05 +10:00
63be0ee70d
The server is building, but still needs work
...
There is some missing character creation/unloading code, and there are a
few other issues highlighted by TODO tags, see below.
In general, 'mapIndex' has been renamed to 'roomIndex'. Multiple rooms
have not been fully implemented yet, but I'm working on it.
Other issues:
* FileFormat needs to be changed to MapLoader
* Server's character movement is still slaved to the clients
The client does not build.
2014-06-07 02:15:40 +10:00
cac273da5e
Partial rewrite of server_application.cpp
...
I've also fixed some other issues along the way. However, the next step
requires support for multiple rooms. Finally.
2014-06-07 01:14:54 +10:00
973a2be16b
Merged server_internals.cpp and network_handlers.cpp into
...
server_application.cpp
2014-06-06 22:11:05 +10:00
310f701b0d
Began modulating ServerApplication, beginning with the accounts
2014-06-06 21:43:54 +10:00
2c9b0fc3e7
Committing some comment tweaks
2014-06-06 21:12:46 +10:00
5966d7b51a
Fleshed out the serialization internals
2014-06-04 23:30:20 +10:00
46dff9b97b
Implemented the minor changes into UDPNetworkPacket
2014-06-04 23:08:52 +10:00
23364b2810
Split up the serial code, but had to gut it in the process
...
Since the contents of the packets are different than before, I decided to
gut the serialization code. I'll reimplement the internals soon.
2014-06-04 23:03:24 +10:00
da60fa8f94
Began reworking the network code
...
This commit devides SerialPacket into a series of different structures,
all decended from a common base class.
Using a union was not a good idea.
2014-06-04 21:16:51 +10:00
0a03535ecb
Replaced several lookups to the same object with a reference
2014-06-02 22:35:55 +10:00
2bebfdfb97
Updated database control, character stats are saving
...
Just for the record, I don't like the way SAVE_CHARACTER is expanded like
that.
2014-06-02 22:22:51 +10:00
fb6fba9564
Removed BBox, renamed position to origin
...
I've replaced the BBox class with a pair of inline functions in
check_bounds.hpp. I've also renamed the 'position' variable to 'origin' in
several locations.
These changes are mostly to alleviate ambiguity.
2014-06-02 21:13:08 +10:00
d2f03b98dc
Screwing around with some settings
2014-06-02 20:02:19 +10:00
1cfb814ee4
Added the rest of the combat info to the network code
2014-06-01 23:07:02 +10:00
bf922ec598
Updated the license headers
...
It only took me 5 months.
2014-05-29 00:16:49 +10:00
de902d2d3d
Bumped the network version
2014-05-28 23:39:31 +10:00
Kayne Ruse