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
4b4814e89a
Tweaked windows build script
2015-08-26 14:09:47 +10:00
c0bbadb0bf
Merge branch 'upgrade', updated to SDL 2.0, among many other improvements
2015-08-24 14:45:43 +10:00
c6bc8c24fb
Removed some debugging code
2015-08-24 14:40:33 +10:00
e7d3205a96
Comment tweak
2015-08-24 14:38:59 +10:00
ffe5c80117
Comment tweaks, build tweaks, bugfixes
...
I've also disabled the "screen trick". It was ugly as hell.
2015-08-24 14:34:54 +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
188a6805bf
Found the culprit for bug #45
2015-08-24 03:37:44 +10:00
626435974e
Tweaked the packaging script to source from bin
2015-08-24 03:04:55 +10:00
b6c9361876
Added .dll files in a submodule for windows build only
2015-08-24 02:52:05 +10:00
45f67476b8
Fixed a graphical bug
2015-08-24 02:03:00 +10:00
0c1232ae3b
Fixed a graphical bug
2015-08-24 02:01:46 +10:00
dfa8683c47
Tweaks for windows
2015-08-23 19:41:01 +10:00
c36c5210ab
Splash screen fits to the new logo on startup, before reverting
2015-08-23 05:56:42 +10:00
57a4fc8380
Messing with buttons & fonts
2015-08-23 04:55:50 +10:00
540f646209
Added color macros for buttons
2015-08-23 04:54:51 +10:00
caf6403a76
Added platform & version detection
2015-08-23 03:44:19 +10:00
f585b8adda
Added some admin tools
2015-08-23 02:59:33 +10:00
3e42371e02
Fixed character movement by ignoring key repeats
2015-08-23 02:48:58 +10:00
93a955caf9
Removed commented code
2015-08-23 02:47:59 +10:00
563a217237
Changed the formats of the graphical assets
2015-08-23 02:20:38 +10:00
41d601ab06
Re-enabled FPS display, fix other display issues
2015-08-23 01:53:13 +10:00
2dd2aead13
Tweaked FPS implementation
2015-08-23 01:52:03 +10:00
915660da0e
Server runs, but it's far off from being stable again
2015-08-20 23:24:20 +10:00
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
03e643a17a
Updated network version tag
2015-08-20 20:42:19 +10:00
dc5b09a9b4
world_logic.cpp builds, disabled FPS display
2015-08-20 02:36:42 +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
371ca4a22c
Updated libcommon
2015-08-18 04:08:26 +10:00
6bcaf460b9
Reversed the display order of the lines
2015-08-18 03:59:17 +10:00
00fe2263d5
This will take getting used to
2015-08-14 22:43:41 +10:00
68eddcfcbb
Fixed a makefile
2015-08-14 22:42:48 +10:00
f2ee1e8b24
Testing submodules
2015-08-14 22:33:35 +10:00
dd50287bdd
Deleted common directory
2015-08-14 22:25:57 +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
Kayne Ruse