3eafb57403
Fixed magic numbers for default screen size
2015-09-03 14:47:03 +10:00
47d464ed3a
Merge remote-tracking branch 'commondir/libcommon' into libcommon
2015-09-03 14:25:59 +10:00
f83f5f76c7
tweaked .gitignore
2015-09-03 14:23:59 +10:00
fd98749995
Added the scene template framework
2015-09-03 14:19:57 +10:00
e7d3205a96
Comment tweak
2015-08-24 14:38:59 +10:00
a083cce5da
Merge remote-tracking branch 'refs/remotes/origin/libcommon' into libcommon
2015-08-24 14:26:47 +10:00
37fadc6567
Resolved bug #45
2015-08-24 14:26:32 +10:00
0c1232ae3b
Fixed a graphical bug
2015-08-24 02:01:46 +10:00
540f646209
Added color macros for buttons
2015-08-23 04:54:51 +10:00
93a955caf9
Removed commented code
2015-08-23 02:47:59 +10:00
2dd2aead13
Tweaked FPS implementation
2015-08-23 01:52:03 +10:00
03e643a17a
Updated network version tag
2015-08-20 20:42:19 +10:00
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
6bcaf460b9
Reversed the display order of the lines
2015-08-18 03:59:17 +10:00
68eddcfcbb
Fixed a makefile
2015-08-14 22:42:48 +10:00
b33fb66d2a
Created a new branch to act as a submodule of common classes
2015-08-14 22:14:26 +10:00
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
e8347cb9fb
Reverted templated TextBox; too much unnecessary complexity
2015-08-14 20:52:05 +10:00
8c3f7913f6
Converted TextBox into a template class
2015-08-14 19:42:45 +10:00
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
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
fedc420c19
Merged common/ui into common/graphics
2015-08-14 18:02:39 +10:00
b10572ccaf
Imported TextLine and TextBox, added Image::CopyTexture
2015-08-13 23:47:32 +10:00
ca67bf3bdd
Closed the font
2015-08-02 04:17:01 +10:00
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
8838fcd14e
client/entities and client/client_utilities build
2015-08-02 04:12:22 +10:00
0150dbb929
Began work on the client
2015-08-02 03:20:59 +10:00
aa9081d9cf
Imported new Button class, deleted menu_bar.*pp
2015-08-02 01:45:46 +10:00
48f5512e1a
Fixed a mistyped variable name
2015-07-20 17:14:24 +10:00
d2e75e02c5
Imported updates to the map system
2015-07-20 13:35:10 +10:00
4ced681c76
Working on the ui, incomplete
2015-07-08 03:09:50 +10:00
e08e34b677
Updated README.md
2015-07-07 20:00:38 +10:00
af17bd2800
Updated common/graphics, client/base_scene.*pp to SDL2
2015-07-07 19:51:27 +10:00
24eb730c72
Switched to the #pragma once system
2015-07-07 17:36:14 +10:00
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)
2015-07-07 12:52:46 +10:00
210bccbe0d
Pruned the usage of the incomplete monster system
2015-07-07 12:41:57 +10:00
68429806d1
Merge branch 'master' into develop
2015-05-18 21:29:15 +10:00
a8cf0a6947
Updated .gitignore
2015-05-18 21:28:55 +10:00
822d0636cc
Merge branch 'master' into develop
2015-05-17 12:38:44 +10:00
164a3e18d9
Fixed formatting
2015-05-17 12:36:43 +10:00
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
96c10da527
Tweaked README.md
2015-05-17 09:48:49 +10:00
3856b3cdd2
DELETE ME: temporary commit
2015-05-17 09:36:37 +10:00
661f6db82c
Added the linux release to README.md
2015-05-17 09:28:37 +10:00
99b35483f8
Tenative port for Linux
2015-05-17 09:18:46 +10:00
102ba18b7b
Finally wrote the monster manager API
2015-05-08 23:17:35 +10:00
07faf1b96b
Moved a file
2015-05-08 22:33:46 +10:00
1d70e271b6
Merge branch 'master' into develop
2015-04-28 11:03:58 +10:00
0bf5ccee4d
Spelling correction
2015-04-28 11:03:44 +10:00
35e7d0cf61
Tweaked scripts, added ForEachMonster()
...
(cherry picked from commit 0cf6a3dceb56a85969e8248e19f9143364b75c68)
2015-04-28 10:25:12 +10:00
Kayne Ruse