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
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
7e5a7f8183
Updated the copyright headers about a week ahead
2014-12-27 13:29:16 +11:00
015631a73d
Implemented client-side HandleCharacterCreate
2014-12-18 09:14:11 +11:00
3399053e64
Added an option to skip missing config files
2014-12-16 21:49:50 +11:00
c89f94b681
Missed the map system's nested API table
2014-12-01 00:26:47 +11:00
06eb1f2e9e
Minor tweak to the Timer class; kind of pointless
2014-11-30 23:04:54 +11:00
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
584b6ea303
Fixed a bug in deserializePacket()
2014-11-26 07:51:24 +11:00
01461deaa5
Set the values for packets, and added getRoom()
2014-11-26 07:11:27 +11:00
9ba76c8987
Added RegionPagerLua destructor
2014-11-26 06:11:27 +11:00
20d40d5b81
Implemented two-step logins, basic connections build
2014-11-23 05:47:21 +11:00
ace87b438b
Began working changes into lobby
2014-11-16 23:02:06 +11:00
cacd3dcd6d
Removed the statistics structure from common/* and server/*
2014-11-16 22:34:12 +11:00
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
3b9df46510
Merge branch 'network-expansion' into server-expansion
2014-11-08 17:09:04 +11:00
06e027710f
Created the room system's API, and tweaked some other APIs
2014-11-06 22:42:03 +11:00
f2d79225a3
Created '*_data.cpp' files, modified API files a bit
2014-11-06 01:54:27 +11:00
a4ed23f6c7
Created a way to coalesce map modules into one table
2014-11-06 01:16:02 +11:00
0f139562c3
Theoretically resolved jenky cross-compiler compatability
2014-11-05 23:54:10 +11:00
f584dd140b
Began work on expanding the network protocols
2014-10-23 23:50:49 +11:00
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
de7167e830
Added unix compatability
2014-10-18 20:10:17 +02:00
7c4762852b
Moved Renderable and Character into Renderable/
2014-10-10 06:18:50 +11:00
8dcd02aba3
Separated some character code into Renderable
2014-10-10 06:00:58 +11:00
1f099a07dc
Changed the command line argument's requirements
2014-10-01 02:51:56 +10:00
be9ce33637
Changed a bunch of method names, including Singleton<>
2014-10-01 01:57:03 +10:00
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
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
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
ad2c65dc67
Remeved the commented BUGFIX tags
2014-09-10 17:00:13 +10:00
2c06232264
JOIN_REJECTION works, ready for the rest
2014-09-09 08:39:36 +10:00
4c882682ed
Added TextPacket
2014-09-09 08:05:50 +10:00
f581c3238f
Tweaked some TODO comments
2014-09-03 04:36:02 +10:00
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
d50cf5b91e
Fixed shoddy packet typing
2014-09-03 00:45:08 +10:00
5536bf366d
Implemented the serialization switch statement
2014-08-31 15:35:14 +10:00
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
6f4334f84d
Moved serialization globals
2014-08-25 00:07:17 +10:00
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
5dea53ad50
Removed delta time system from the framework
2014-08-19 02:52:15 +10:00
59c9ba698f
Implemented the new system in the startup script, needs testing
2014-08-15 09:12:22 +10:00
4ea1f8b016
Added glue functions to set the pager triggers
2014-08-15 08:34:33 +10:00
f1080151e3
Minor preemptive bugfixes
2014-08-15 08:19:22 +10:00
5af0a7999c
Recoded the pager to use lua registry functions, needs testing
2014-08-15 07:10:27 +10:00
1b041d7771
Tied region_pager_lua.cpp to region_api.hpp
2014-08-14 00:03:22 +10:00
b6c70cbc0d
Tweaked the bounds values
2014-08-13 09:05:26 +10:00
1776583e01
Added the escape hotkey, refined BoundingBox a bit
...
LobbyMenu also searches for a server as soon as you enter, so you don't
have to press an extra button, a good feature.
2014-08-13 08:08:16 +10:00
74f809a801
UDPNetworkUtility is a singleton, disabled InCombat scene
...
I found incombat to be way too finicky to keep up to date, so I disabled
it for now.
2014-08-13 06:53:47 +10:00
182101b592
Minor tweaks
2014-08-13 06:19:07 +10:00
Kayne Ruse