e4d7ece99c
Merge branch 'bugfix-lambda' into multiple-rooms
...
Conflicts:
server/server_methods.cpp
2015-01-02 07:10:29 +11:00
eb897c81e8
Tentative solution for bug #38
2015-01-02 07:09:04 +11:00
b2452fb6fe
Committing incomplete work; need to fix an urgent bug
2015-01-02 06:57:20 +11:00
4579f9f388
Don't code while drunk; it never ends well
2015-01-01 12:53:32 +11:00
b4b7c0d877
Pop & Push don't work like they should
2015-01-01 03:37:13 +11:00
ebd8e54725
Added PushEntity() & PopEntity() to RoomManager
...
Calling them from server_character_methods.cpp.
2015-01-01 02:51:04 +11:00
963aca218a
Comment tweaks
2015-01-01 01:29:48 +11:00
8b8ef088d9
HOTFIX: Incorrect error code checked
2014-12-31 06:10:03 +11:00
8e50be24d4
Updated room system and room API, more to come
...
There's a lot of verbosity in the scripts, so it might be beneficial to
redice that at some point.
2014-12-31 04:52:10 +11:00
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
78c04718e0
Removed ManagerInterface, it was a bad idea
2014-12-31 03:05:19 +11:00
bb592b2436
Added the waypoint system to the modules
...
Also fleshed out entity_api.cpp, but that's just filler.
2014-12-30 04:37:56 +11:00
f3fb5017b3
Added waypoint API placeholder files
2014-12-30 02:45:35 +11:00
3a9fdd511b
Replaced door system with waypoint system
2014-12-30 02:38:25 +11:00
57c6f45c21
Added API placeholder files
2014-12-30 02:19:19 +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
6c11aa0927
Characters are moving around in the world
2014-12-27 02:26:44 +11:00
398f1c8bfd
Added a room check to the character query
2014-12-27 01:33:10 +11:00
3e2d1a5a56
Implemented client-side HandleCharacterSet*(); untested
2014-12-22 23:09:28 +11:00
f52eafdf55
Implemented server-side HandleSetCharacter*(); untested
2014-12-22 22:13:42 +11:00
dff04b5b69
Moved server_util.cpp methods; created server_character_methods.cpp
2014-12-21 08:07:55 +11:00
900f623f3b
Camera centering and client drop message
2014-12-19 20:33:09 +11:00
44a1edac30
HOTFIX: Patched the stupid auto& for loop with the jenky pattern
2014-12-19 20:11:22 +11:00
2ae2c48819
Added LocalCharacter, removed entityIndex
2014-12-19 19:44:34 +11:00
15ea360b8a
Replaced lambda implementations with calls to the 'full unload' methods
...
IT should be noted that ClientManager::CheckConnections() no longer
removes a client; instead, it returns a client index that needs to be
removed via another means. This allows ServerApplication to use the 'full
unload' method.
2014-12-19 17:58:50 +11:00
0d9dfad4a5
Implemented 'full unload' methods, not used yet
2014-12-19 15:52:05 +11:00
7962692641
Implemented client-side character delete; untested
2014-12-19 14:21:05 +11:00
4d1bb17382
Comment tweaks
2014-12-18 09:28:24 +11:00
3399053e64
Added an option to skip missing config files
2014-12-16 21:49:50 +11:00
ae046977f0
Server state query works, client doesn't use the result yet
...
Both sides of this message uses QUERY_CHARACTER_EXISTS because I'm just
trying to push forward, without worrying about mistakes I might be making.
I just want to merge this back into the main branch so I can say that I've
actually done something over the last few months.
2014-12-11 08:02:38 +11:00
72f641bf63
Server sends character create & delete messages
2014-12-11 07:12:16 +11:00
dbd1289ced
Moved map and character management to server_data.cpp
2014-12-09 00:41:09 +11:00
de4e539449
Moved the connection code to server_connections.cpp
2014-12-03 00:46:38 +11:00
61f462a882
Server-side HandleCharacterUnload()
2014-12-03 00:06:07 +11:00
5607f76ce7
Server-side HandleCharacterDelete()
2014-12-02 23:41:08 +11:00
0e666d3203
Server accepts and creates the character's data
2014-12-02 23:11:08 +11:00
cc167180f6
Added support for cleaning up after rejection messages
2014-12-01 22:33:15 +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
bac8bc2b41
Fixed a misspelled method call
2014-11-26 10:28:57 +11:00
e5abd51f76
Two-step login system works perfectly; can't shut the server down
...
I've also removed a large amount of commented and uncommented code from
in_world.cpp, simply because so much code was dummied out. I can readd
this code as I reimeplement various features.
2014-11-26 10:14:26 +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
fa0d232727
Removed one parameter from RoomManager::Create()
2014-11-26 06:41:29 +11:00
6485839dcf
Replaced RoomData's hooks with Initialize API function
2014-11-26 06:33:02 +11:00
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
20d40d5b81
Implemented two-step logins, basic connections build
2014-11-23 05:47:21 +11:00
cacd3dcd6d
Removed the statistics structure from common/* and server/*
2014-11-16 22:34:12 +11:00
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
d35ab24e15
Added TODO
2014-11-14 10:02:15 +11:00
Kayne Ruse