3322783d95
Merge branch 'develop' into rooms
2015-01-03 03:27:34 +11:00
9895e27d5a
Merge branch 'develop'
2015-01-03 03:20:54 +11:00
877c0f59d3
Removed preprocessor switch surrounding library headers
2015-01-03 03:20:13 +11:00
92eb75af7e
Slight tweaks to waypoints
2015-01-02 23:51:00 +11:00
d815f17442
Reimplemented the push/pop entity methods in RoomManager
...
Some accessors in Entity had to be made const, as they were being called
from lambdas with const parameters.
2015-01-02 23:25:59 +11:00
0344fe0d6d
Added a link to the github page to the main menu
2015-01-02 08:49:06 +11:00
a10636e067
Merge branch 'bugfix-lambda'
2015-01-02 07:21:52 +11:00
4b8f9b4330
Merge branch 'bugfix-lambda' into develop
2015-01-02 07:21:41 +11:00
eb897c81e8
Tentative solution for bug #38
2015-01-02 07:09:04 +11:00
963aca218a
Comment tweaks
2015-01-01 01:29:48 +11:00
c6981e6216
Merge branch 'develop'
2014-12-31 06:10:24 +11:00
8b8ef088d9
HOTFIX: Incorrect error code checked
2014-12-31 06:10:03 +11:00
6704944105
Updated the map system & APIs
2014-12-31 06:01: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
4b5011a579
Merge branch 'develop'
2014-12-30 02:52:26 +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
8d204dc3c4
Merge branch 'master' into develop
...
Also saved todo.txt
2014-12-30 01:21:11 +11:00
9413adcf4a
Forgot the copyright in the README files
2014-12-30 01:10:43 +11:00
99af76c5b5
Merge branch 'develop'
...
Conflicts:
todo.txt
2014-12-27 23:44:54 +11:00
cc6458daa7
Merge branch 'high-water-mark' into develop
...
Thank fuck that's over.
2014-12-27 23:34:51 +11:00
8708cfbee0
I give up, I'm just using the stop-dead system for now.
2014-12-27 23:16:48 +11:00
b67e85e87b
Moved some messy code from InWorld::Update() to utility methods
2014-12-27 21:00:00 +11:00
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
f6e90d7e39
Fixed controls & hotkeys interferring; smoother logouts
2014-12-27 19:25:49 +11:00
ee0b7884a8
Partial collision (box prep) complete; untested
2014-12-27 15:05:34 +11:00
7e5a7f8183
Updated the copyright headers about a week ahead
2014-12-27 13:29:16 +11:00
f2d517df9d
BUGFIX: Infinitely small motion on an axis after repeated key release;
...
read more
I've patched this issue by setting motion's elements to
CHARACTER_WALKING_SPEED or negative CHARACTER_WALKING_SPEED if they're
above or below zero, respectively.
2014-12-27 12:33:51 +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
07af05712b
Implemented client-side query
2014-12-19 18:33:41 +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
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
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
Kayne Ruse