Commit Graph

767 Commits

Author SHA1 Message Date
Kayne Ruse 45f67476b8 Fixed a graphical bug 2015-08-24 02:03:00 +10:00
Kayne Ruse 0c1232ae3b Fixed a graphical bug 2015-08-24 02:01:46 +10:00
Kayne Ruse dfa8683c47 Tweaks for windows 2015-08-23 19:41:01 +10:00
Kayne Ruse c36c5210ab Splash screen fits to the new logo on startup, before reverting 2015-08-23 05:56:42 +10:00
Kayne Ruse 57a4fc8380 Messing with buttons & fonts 2015-08-23 04:55:50 +10:00
Kayne Ruse 540f646209 Added color macros for buttons 2015-08-23 04:54:51 +10:00
Kayne Ruse caf6403a76 Added platform & version detection 2015-08-23 03:44:19 +10:00
Kayne Ruse f585b8adda Added some admin tools 2015-08-23 02:59:33 +10:00
Kayne Ruse 3e42371e02 Fixed character movement by ignoring key repeats 2015-08-23 02:48:58 +10:00
Kayne Ruse 93a955caf9 Removed commented code 2015-08-23 02:47:59 +10:00
Kayne Ruse 563a217237 Changed the formats of the graphical assets 2015-08-23 02:20:38 +10:00
Kayne Ruse 41d601ab06 Re-enabled FPS display, fix other display issues 2015-08-23 01:53:13 +10:00
Kayne Ruse 2dd2aead13 Tweaked FPS implementation 2015-08-23 01:52:03 +10:00
Kayne Ruse 915660da0e Server runs, but it's far off from being stable again 2015-08-20 23:24:20 +10:00
Kayne Ruse 3d6509b5a5 Client builds & runs, can't test the gameplay without the server
SDL_ttf is now being initialized, and all usages of fonts are now checked for nullptr.
A bug where the renderer's logical size was not properly set has been fixed.
The FPS counter is disabled for now.
2015-08-20 20:45:13 +10:00
Kayne Ruse 03e643a17a Updated network version tag 2015-08-20 20:42:19 +10:00
Kayne Ruse dc5b09a9b4 world_logic.cpp builds, disabled FPS display 2015-08-20 02:36:42 +10:00
Kayne Ruse 345980af5e Changed an inclusion path
I've also modified my local SDL_net install to ensure that it built with the correct version of
SDL. Long story short: This worked me up way too much.
2015-08-20 02:32:00 +10:00
Kayne Ruse 371ca4a22c Updated libcommon 2015-08-18 04:08:26 +10:00
Kayne Ruse 6bcaf460b9 Reversed the display order of the lines 2015-08-18 03:59:17 +10:00
Kayne Ruse 00fe2263d5 This will take getting used to 2015-08-14 22:43:41 +10:00
Kayne Ruse 68eddcfcbb Fixed a makefile 2015-08-14 22:42:48 +10:00
Kayne Ruse f2ee1e8b24 Testing submodules 2015-08-14 22:33:35 +10:00
Kayne Ruse dd50287bdd Deleted common directory 2015-08-14 22:25:57 +10:00
Kayne Ruse b33fb66d2a Created a new branch to act as a submodule of common classes 2015-08-14 22:14:26 +10:00
Kayne Ruse 2f86511254 lobby_menu.cpp builds, as does all of client/menu_scenes
This is great progress, but I think I should turn the common directory into a subnmodule, since
I've been constantly tabbing back and forward between this folder, and the debug folder, making
and committing identical edits to both.

 Scene list:
        > disconnected_screen.*pp
        > lobby_menu.*pp
        > main_menu.*pp
        > options_menu.*pp
        > splash_screen.*pp
        * world*.*pp

        * unfinished
        > building
2015-08-14 21:47:04 +10:00
Kayne Ruse e8347cb9fb Reverted templated TextBox; too much unnecessary complexity 2015-08-14 20:52:05 +10:00
Kayne Ruse 8c3f7913f6 Converted TextBox into a template class 2015-08-14 19:42:45 +10:00
Kayne Ruse a7ce7a0e9b main_menu.*pp is building
Scene list:
    > disconnected_screen.*pp
    * lobby_menu.*pp
    > main_menu.*pp
    > options_menu.*pp
    > splash_screen.*pp
    * world*.*pp

    * unfinished
    > building
2015-08-14 18:49:37 +10:00
Kayne Ruse a4d3a356c3 Some menu scenes compiling; replaced KR Studios logo file
Scene list:
> disconnected_screen.*pp
* lobby_menu.*pp
* main_menu.*pp
> options_menu.*pp
> splash_screen.*pp
* world*.*pp

* unfinished
> building
2015-08-14 18:18:21 +10:00
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