Commit graph

1769 commits

Author SHA1 Message Date
Gregory A Lundberg
b3b3b61c5a
Remove trailing tabs from CodeBlocks projectfile 2018-03-08 07:40:43 -06:00
newfrenchy83
5e272829fa Update wesnoth.cbp 2018-03-08 06:31:29 -06:00
Sofartin
07436dd7bd Add missing scenario-story.cfg in data 2018-03-07 13:59:52 -06:00
Sofartin
ff6e78a60f Fix of Fix Xcode Project after 078f61c 2018-03-07 01:01:45 -06:00
Sofartin
25d459c480 Fix Xcode Project after 078f61c 2018-03-07 01:01:45 -06:00
Charles Dang
078f61c412 Removed unused GUI1 label widget 2018-03-07 06:17:20 +11:00
Celtic Minstrel
b02e73535e Fix wesnothd and campaignd link errors 2018-03-04 21:21:33 -05:00
Sofartin
30f78cc2db Update Fix_Xcode_Dependencies
Update SDL2 to 2.0.8 and SDL2_image to 2.0.3
2018-03-03 18:36:50 -06:00
pentarctagon
b71f7cdc3c Moves the ccache clang wrapper scripts to utils/travis/.
Also clears the ccache statistics after printing them. This means the hit/miss count will be shown per run, rather than cumulatively.
2018-02-24 10:56:05 -06:00
pentarctagon
2151ed6be1 Enable use of ccache for xcode build.
Also sets it to use clang rather than gcc.
2018-02-23 17:51:08 -06:00
newfrenchy83
6a2631a5b2 Update wesnoth.cbp (#2543) 2018-02-23 14:32:29 +02:00
newfrenchy83
5207a7b1c1 Update wesnoth.cbp 2018-02-23 21:33:47 +11:00
Sofartin
21806443ec Updated README.md for Xcode project 2018-02-22 11:10:00 -06:00
Sofartin
51478f2545 Fixed Xcode project 2018-02-22 08:46:43 -06:00
Charles Dang
5291d41377 Updated VS projectfile for bcrypt changes
[ci skip]
2018-02-22 13:13:05 +11:00
Jyrki Vesterinen
eb900c980c Restore ai/registry.hpp
Because obviously calling an empty function is essential for AI to work
correctly in GCC/Clang builds. #logic
2018-02-21 21:03:07 +02:00
Jyrki Vesterinen
f96b9d2bba Promote ai_info_ from pointer to a member object
We used to create a new ai_info object in the constructor of
playsingle_controller in order to reset it on scenario changes.
Now when the AI manager is a part of game state, resetting the game state
implicitly creates a new ai_info object, and setting the AI info manually
is no longer necessary.

This also ensures that ai_info can't ever be null, fixing #2522.

In the process, I also discovered that ai::registry::init() doesn't do
anything, so I removed it, its declaration, and ai/registry.hpp which
contained nothing except said function declaration.
2018-02-21 19:41:52 +02:00
Charles Dang
db0f23701b VC Projfile: minor entry cleanup
[ci skip]
2018-02-22 01:57:37 +11:00
Charles Dang
99a8427d41 Define _WINSOCK_DEPRECATED_NO_WARNINGS in VC projectfile
[ci skip]

Seems the definition in wesnothd_connection.hpp is insufficient if warning C4996
is enabled.
2018-02-22 01:53:12 +11:00
Charles Dang
8707a13a2f Cleaned up MSVC error suppression
The following have been enabled. They no longer cause any errors or warnings.
* C4819
* C4355
* C4351
* C4345

The following has been disabled globally and will be handled in individual cases:
* C4996

The following have been moved to the project files (meaning they become global in
their respective projects):
* C4250 (in wesnoth)
* C4244 (in wesnoth, wesnoth-lib, wesnothd, and campaignd)

The following has been left alone since I don't build the unit tests:
* C4702
2018-02-22 01:30:57 +11:00
Jyrki Vesterinen
77edec6048 Visual Studio: disable C4351 in wesnothlib
Follow-up to commit 1703029bc3.
2018-02-19 19:25:57 +02:00
Sofartin
dcd2123026 Add missing pango dependence 2018-02-19 10:25:14 -05:00
Sofartin
24d113d473 Add missing files to Xcode project and include systeml libraries as absolute path. Don't include system libraries into .app bundle, it is bad idea. 2018-02-14 17:22:49 +01:00
newfrenchy83
33f9bb9b56 Update wesnoth.cbp 2018-02-14 12:25:11 +02:00
Jyrki Vesterinen
1703029bc3 Visual Studio: disable warning C4351 (#2492)
See the warning's documentation:
https://msdn.microsoft.com/en-us/library/1ywe7hcy.aspx

Microsoft advises any project that wants the new standard-compliant
behavior to disable the warning. That includes us.

Fixes #2492.
2018-02-12 07:29:14 +02:00
Celtic Minstrel
3440546f2d Some fixes to the Lua deprecation API, and extend it to C++
* Some improvements to the messages
* Don't clobber existing metatables on deprecated subtables
* Fix Lua deprecation messages not even being logged
* Fix deprecation of Lua subtables
* Don't clobber the metatable when deprecating a subtable
2018-02-12 00:09:48 -05:00
Sofartin
940cd3a781 Remove duplicated headers search path
`$(PROJECT_DIR)/Headers` is included in `System Header Search Path` so this is just redundant duplicate.
2018-02-11 21:06:20 +11:00
Sofartin
90e693fdce Fixed Xcode project (#2450)
* Removed bad openssl include and tuned header search paths
* Xcode project now requires libreadline 7.0 .
Added Fix_Xcode_Dependencies script. Just run it and script take care about all dependencies. No longer need to download Mac Compile Stuff.
Xcode now outputs .app which searches for .dylibs and .frameworks inside Frameworks directory in .app bundle.
* Some fixes and improvements

This commit made with help from @singalen
2018-02-10 22:37:43 -05:00
newfrenchy83
7f55296c7d Update wesnoth.cbp 2018-02-05 18:55:28 +02:00
Sofartin
d9d67f0b95 Update Xcode project 2018-02-05 13:55:01 +02:00
Charles Dang
9f0df10e29 Updated VS projectfile
[ci skip]
2018-02-05 17:12:47 +11:00
kallaballa
024b2e7e9b Implement a surrender dialog
This records a surrender command in replays and quits the game.
2018-02-05 00:35:35 +01:00
Sofartin
4f798e8121 Downgrade Xcode project back to C++11 (#2439)
Downgrading Xcode project to C++11 until 1.14 release
2018-02-04 15:30:31 -05:00
Sofartin
09bc22bac8 Upgrade Info.plist 2018-02-04 19:05:16 +02:00
Sofartin
2935b6a186 Fix and Upgrade Xcode project 2018-02-04 19:05:16 +02:00
Charles Dang
b6a5341ec4 Pre-release version bump 2018-02-04 12:56:53 +11:00
Sofartin
4d7df5fffe Update Copyright year 2018-02-02 13:50:48 +02:00
newfrenchy83
e20c55f57d Update Code::Blocks project files to C++14 (#2416) 2018-01-29 12:13:24 +02:00
newfrenchy83
9d2765e73a Update Wesnoth Code::Blocks project files (#2386) 2018-01-20 17:04:39 +02:00
newfrenchy83
1aaac42d3b Update wesnoth.cbp 2018-01-20 14:59:26 +02:00
mattsc
ddc4334143 Update Xcode project 2017-12-16 07:34:28 -08:00
Charles Dang
002b1a3c87 MP Staging/Join Game: unified player list handling and added player icons
Previously, MP Staging was using connect_engine::connected_users() to fill in the user list.
However, I noticed that the server was already sending the user list to all clients, including
the host, so I could unify the handling between Staging and Join Game by just using the server
data for both.

I've also added appropriate indicators for host, observer, and self in the list for both dialogs.
Additional host= and observer= status keys are sent by the server for that purpose.

I've also made the server dispatch the player list to the host when a game is created. This is
slightly redundant, since the host is the only player at that point, but it's easier than creating
a user config locally, or using connected_users(), not to mention easier to maintain.

The wesnothd::game::send_user_list function no longer exists early id `description_` is null.
No idea why it did that. It's not even used in the function. Anyway, it needed to be removed in
order for the above change to work.

Speaking of the host's copy of the player list, I haven't touched that. It's still needed for
managing things in the connect_engine. Might simplify things further in the future by delegating
more handling to the server, since it has a lot of the data needed already, but that's a different
project.
2017-12-14 11:12:49 +11:00
Charles Dang
6759f41b1e GUI2: cleaned up and restructured initialization process
This mostly has to do with moving various components into more logical locations instead of
all mushed together in gui/widgets/settings.*pp. To that end, the following changes have been
made:

* The gui2::init function has been moved to its own file in the gui/ toplevel.
* load_settings() has been merged into init().
* All functions and code relating to gui theme definitions have been moved to their own file.
* All code relating to widgets or window static init have been moved to their own file.
* window::update_screen_size has been moved out of the window class and into settings.cpp.
* The unimplemented free-stadnding version of load_widget_definitions has been removed.
* gui_definition::read and gui_defintion::load have been merged into the gui_definition ctor
  and greatly simplified.
* Some functions relating to builder_widgets have been renamed for clarity.
* add/remove_single_widget_defintion now access the current gui theme instead of the default.
  This looks like it was a mistake made in the original code.
* Since the static registry is now externally linked, the unit tests accessor for window types
  has been removed.
* Documentation has been updated. The wikidoc comment for gui_definition has been removed. It
  was rather out-of-date and needed to be reworked anyway.
* widget_builder_func_t's signature is now to take a config reference and not a copy, though
  REGISRER_WIDGET had already passed register_builder_widget a lambda that took a reference.
* Various other misc cleanups and improvements.
2017-12-11 14:49:58 +11:00
Charles Dang
e08350cd17 Revert "rebase commit: implemented a surrender dialog that records a surrender command in replays and quits the game"
This reverts commit 4dda0ad9b2. This feature needs to be
considered further. Right now the design doesn't make sense.
2017-12-06 13:35:28 +11:00
Charles Dang
003d964c4b Updated VC projectfile for 4dda0ad9b2
[ci skip]
2017-12-06 10:49:04 +11:00
kallaballa
4dda0ad9b2
rebase commit: implemented a surrender dialog that records a surrender command in replays and quits the game 2017-12-05 17:01:06 -06:00
Charles Dang
c2fbfbf8ac Removed abandoned CodeLite projectfiles
[ci skip]

No updates have been made since 2015, and it was last used seriously in 2014 by @cbeck88.
2017-12-06 01:37:01 +11:00
Wedge009
f61138498c Remove header from VC project (deleted in 056d7ac8).
[ci skip]
2017-11-30 11:59:01 +11:00
lundberg
ba6b6a1f53 Update VC12 project for wesnothd
Drop the additional requirements for SDL2 libraries. Wesnothd no longer requires SDL2.
2017-11-26 15:26:17 -06:00
mattsc
5987ff88ae Update Xcode project 2017-11-24 11:23:52 -08:00