Commit Graph

787 Commits

Author SHA1 Message Date
Kayne Ruse fedc420c19 Merged common/ui into common/graphics 2015-08-14 18:02:39 +10:00
Kayne Ruse b10572ccaf Imported TextLine and TextBox, added Image::CopyTexture 2015-08-13 23:47:32 +10:00
Kayne Ruse ca67bf3bdd Closed the font 2015-08-02 04:17:01 +10:00
Kayne Ruse f0ab1dfef8 One menu scene works, but I need some more UI widgets
Namely, I need a text box widget, which can display text without having to
re-create and destroy the texture every frame.
2015-08-02 04:13:54 +10:00
Kayne Ruse 8838fcd14e client/entities and client/client_utilities build 2015-08-02 04:12:22 +10:00
Kayne Ruse 0150dbb929 Began work on the client 2015-08-02 03:20:59 +10:00
Kayne Ruse aa9081d9cf Imported new Button class, deleted menu_bar.*pp 2015-08-02 01:45:46 +10:00
Kayne Ruse 48f5512e1a Fixed a mistyped variable name 2015-07-20 17:14:24 +10:00
Kayne Ruse d2e75e02c5 Imported updates to the map system 2015-07-20 13:35:10 +10:00
Kayne Ruse 4ced681c76 Working on the ui, incomplete 2015-07-08 03:09:50 +10:00
Kayne Ruse e08e34b677 Updated README.md 2015-07-07 20:00:38 +10:00
Kayne Ruse af17bd2800 Updated common/graphics, client/base_scene.*pp to SDL2 2015-07-07 19:51:27 +10:00
Kayne Ruse 24eb730c72 Switched to the #pragma once system 2015-07-07 17:36:14 +10:00
Kayne Ruse f82b0a8843 Merge branch 'develop', read more
* moved network_api.*pp
* Added copyright notices to scripts
* Changed SQL table names (including hardcoded usage)
* Added monster tables to the database
* Made updates.sql (unneeded, and deleted)
* Added ForEachMonster() to the room API (incomplete)
* Created class MonsterData (incomplete)
* Created class MonsterManager (incomplete)
* Created MonsterManager API (incomplete)
release-0.6.4
2015-07-07 12:52:46 +10:00
Kayne Ruse 210bccbe0d Pruned the usage of the incomplete monster system 2015-07-07 12:41:57 +10:00
Kayne Ruse 68429806d1 Merge branch 'master' into develop 2015-05-18 21:29:15 +10:00
Kayne Ruse a8cf0a6947 Updated .gitignore 2015-05-18 21:28:55 +10:00
Kayne Ruse 822d0636cc Merge branch 'master' into develop 2015-05-17 12:38:44 +10:00
Kayne Ruse 164a3e18d9 Fixed formatting 2015-05-17 12:36:43 +10:00
Kayne Ruse 3498b5d154 Merge branch 'ubuntu-build'
Conflicts:
	README.md

After setting up my new PC's build environment, I've made some changes to make
both setups compatible.
2015-05-17 12:33:31 +10:00
Kayne Ruse 96c10da527 Tweaked README.md 2015-05-17 09:48:49 +10:00
Kayne Ruse 3856b3cdd2 DELETE ME: temporary commit 2015-05-17 09:36:37 +10:00
Kayne Ruse 661f6db82c Added the linux release to README.md 2015-05-17 09:28:37 +10:00
Kayne Ruse 99b35483f8 Tenative port for Linux 2015-05-17 09:18:46 +10:00
Kayne Ruse 102ba18b7b Finally wrote the monster manager API 2015-05-08 23:17:35 +10:00
Kayne Ruse 07faf1b96b Moved a file 2015-05-08 22:33:46 +10:00
Kayne Ruse 1d70e271b6 Merge branch 'master' into develop 2015-04-28 11:03:58 +10:00
Kayne Ruse 0bf5ccee4d Spelling correction 2015-04-28 11:03:44 +10:00
Kayne Ruse 35e7d0cf61 Tweaked scripts, added ForEachMonster()
(cherry picked from commit 0cf6a3dceb56a85969e8248e19f9143364b75c68)
2015-04-28 10:25:12 +10:00
Kayne Ruse 27fd810cfd Added a simple database update script, and comment headers
I don't know why it took me this long to add those headers in the first
place.

(cherry picked from commit 3c28b6c3bf75c4bdb42e5ea9d9864efaa855620c)
2015-04-28 10:24:47 +10:00
Kayne Ruse 8903b1e28d Began marking changes for monsters
These changes include storing monsters on shutdown, storing dead
characters and monsters, etc. Also fleshed out the MonsterManager's
internals a bit.

(cherry picked from commit af982710f6de050c09ef503cf2f8e1c9fdd34979)
2015-04-28 10:24:17 +10:00
Kayne Ruse c1ace69e19 Merge branch 'bug-hunting' release-0.6.3 2015-04-28 06:04:06 +10:00
Kayne Ruse 5c404c572e Patched bug #45 without resolving it 2015-04-28 06:01:58 +10:00
Kayne Ruse 878d502b8b Looking for the bug 2015-04-27 01:35:14 +10:00
Kayne Ruse 2a1ee4acbf tmp 2015-04-26 03:29:33 +10:00
Kayne Ruse 0e149acc62 Pointless tweak 2015-04-26 03:24:25 +10:00
Kayne Ruse 63e4394583 I can't seem to pinpoint the cause 2015-04-26 03:11:00 +10:00
Kayne Ruse 7aeabf0d14 Hunting a strange networking bug 2015-04-26 02:14:26 +10:00
Kayne Ruse 9d5a668045 Merge branch 'develop', read more
The trigger system has been fully implemented, as well as a few other
tweaks as the occasional thought came to mind.

Multiple rooms are now fully functional, mostly as a way to test the
triggers. Although there are still no real generation algorithms, a
utility for creating door pairs between given rooms is included in the
scripts directory.

Other changes in this merge include:

* Network updates via lua
* Entity types can be determined in lua
* Database columns are now order independant

It should be noted that only two types of userdata will work as far as
entity names are concerned: Characters and Monsters. I tried getting it to
work for all objects passed to lua, but it proved to be too obtuse.

In theory, I could create a teleport puzzle using what I've written here.
That might be a side project, or a way to test saving & loading systems. I
don't see any reason to delay monsters any longer; hopefully, I can get
them going soon too.
release-0.6.2
2015-03-13 21:28:05 +11:00
Kayne Ruse 0efb541074 Moved the door pair script to it's own file 2015-03-13 21:24:31 +11:00
Kayne Ruse 4ae58550b5 Changed SetRoomIndex() to SetRoom() 2015-03-13 21:05:24 +11:00
Kayne Ruse d82e3a8b79 Triggers now support exclusion lists 2015-03-13 20:43:47 +11:00
Kayne Ruse 954213f1ff Minor tweak to hCharacterMovement() 2015-03-13 19:36:03 +11:00
Kayne Ruse d2bb3575fc Removed initial world query
The world is queried once the client has the player's character.
2015-03-13 19:12:34 +11:00
Kayne Ruse ca6afb72ad Minor comment tweaks 2015-03-11 20:23:52 +11:00
Kayne Ruse 670ab22e96 Using an entity stack for trigger comparisons 2015-03-11 18:22:09 +11:00
Kayne Ruse 4d71d4cc40 Room transitions are working smoothly, read more
Although the room transitions are working fairly well, it is still heavy
handed, and a number of optimizations can be done. On the whole, this
needs a review.
2015-03-09 23:26:37 +11:00
Kayne Ruse 81b3769188 Implemented networked room chainging function 2015-03-09 21:28:28 +11:00
Kayne Ruse c3c6d42a80 Characters moving via scripts are pushed & popped from the rooms
The delete & create messages still need to be implemented.
2015-03-09 10:27:50 +11:00
Kayne Ruse 3d8ee25ae7 AccountManager's SQL is order-independant 2015-03-09 09:34:38 +11:00