Commit Graph

173 Commits

Author SHA1 Message Date
Kayne Ruse 95e3ce9a69 Re-added the network version 2015-02-05 22:24:04 +11:00
Kayne Ruse 5583ba4323 Updated TODO comments 2015-02-04 16:52:22 +11:00
Kayne Ruse a18577665a Updated TODO tags 2015-01-23 03:34:53 +11:00
Kayne Ruse 0bdafe7e15 minor file shuffling 2015-01-21 05:21:14 +11:00
Kayne Ruse 38f6ced633 Filled out some client side monster code 2015-01-21 05:09:55 +11:00
Kayne Ruse 65f23bbd1a Fixed issue caused by merges 2015-01-20 22:43:47 +11:00
Kayne Ruse 1e8f91a871 rename 2015-01-20 05:18:52 +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 bd878e20ce Added monster message handlers 2015-01-20 05:02:44 +11:00
Kayne Ruse dacb8df674 Split in_world.cpp into three files 2015-01-17 22:09:14 +11:00
Kayne Ruse 7356e8ae77 Removed the dependencies on utility.*pp 2015-01-17 21:46:12 +11:00
Kayne Ruse 9b2e78a68e Split the scenes directory into gameplay_scenes and menu_scenes 2015-01-17 16:57:04 +11:00
Kayne Ruse be90694234 Added network tweaks to client; project builds cleanly 2015-01-15 23:32:04 +11:00
Kayne Ruse de6eb38516 Reduced CPU load of the client 2015-01-13 01:34:59 +11:00
Kayne Ruse 9f3721247d Replaced a block of code in setup_server.lua with one line 2015-01-11 20:12:50 +11:00
Kayne Ruse 0344fe0d6d Added a link to the github page to the main menu 2015-01-02 08:49:06 +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 8708cfbee0 I give up, I'm just using the stop-dead system for now. 2014-12-27 23:16:48 +11:00
Kayne Ruse b67e85e87b Moved some messy code from InWorld::Update() to utility methods 2014-12-27 21:00:00 +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 f6e90d7e39 Fixed controls & hotkeys interferring; smoother logouts 2014-12-27 19:25:49 +11:00
Kayne Ruse ee0b7884a8 Partial collision (box prep) complete; untested 2014-12-27 15:05:34 +11:00
Kayne Ruse 7e5a7f8183 Updated the copyright headers about a week ahead 2014-12-27 13:29:16 +11:00
Kayne Ruse 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
Kayne Ruse 6c11aa0927 Characters are moving around in the world 2014-12-27 02:26:44 +11:00
Kayne Ruse 398f1c8bfd Added a room check to the character query 2014-12-27 01:33:10 +11:00
Kayne Ruse 3e2d1a5a56 Implemented client-side HandleCharacterSet*(); untested 2014-12-22 23:09:28 +11:00
Kayne Ruse 900f623f3b Camera centering and client drop message 2014-12-19 20:33:09 +11:00
Kayne Ruse 2ae2c48819 Added LocalCharacter, removed entityIndex 2014-12-19 19:44:34 +11:00
Kayne Ruse 07af05712b Implemented client-side query 2014-12-19 18:33:41 +11:00
Kayne Ruse 7962692641 Implemented client-side character delete; untested 2014-12-19 14:21:05 +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 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
Kayne Ruse 72f641bf63 Server sends character create & delete messages 2014-12-11 07:12:16 +11:00
Kayne Ruse 0e666d3203 Server accepts and creates the character's data 2014-12-02 23:11:08 +11:00
Kayne Ruse f50406d69f Code tweak 2014-12-01 22:59:26 +11:00
Kayne Ruse cc167180f6 Added support for cleaning up after rejection messages 2014-12-01 22:33:15 +11:00
Kayne Ruse 822ff5827e Map protocol works in theory 2014-12-01 00:13:46 +11:00
Kayne Ruse 8579d7e0d6 Implemented client-side HandleRegionContent() 2014-11-30 23:29:46 +11:00
Kayne Ruse 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
Kayne Ruse 9329274866 Project builds, but with a lot of logic dummied out 2014-11-16 23:16:21 +11:00
Kayne Ruse ace87b438b Began working changes into lobby 2014-11-16 23:02:06 +11:00
Kayne Ruse 1f3c1f32f4 Moved 'renderable' stuff to 'entities' 2014-11-16 22:40:13 +11:00
Kayne Ruse 4434900afc Merge branch 'unix-compat' into develop
Conflicts:
	todo.txt
2014-10-19 05:53:09 +11:00
Kayne Ruse 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
fro_ozen de7167e830 Added unix compatability 2014-10-18 20:10:17 +02:00
Kayne Ruse 40c76b4285 Implemented a few minor changes from the monster branch 2014-10-19 01:25:03 +11:00
Kayne Ruse 974effd95e Implemented DisconnectedScreen, and removed CharacterMap
Project also builds, since I went through and adjusted it. It's hacky
right now, but I just want to make sure it worked. I'll give it another
pass before merging into develop.
2014-10-10 06:54:48 +11:00