Commit graph

17979 commits

Author SHA1 Message Date
Bret Curtis
c6805314c2 be explicit about what we are trying to catch instead of catching everything and fixed up formatting
use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love

revert allman formatting changes
2017-06-12 00:32:29 +02:00
Bret Curtis
7c758a6293 std::stof can not handle comma in us localization and can not handle period in french localization, using std::replace is not a solution, going back to boost::lexical_cast 2017-06-12 00:32:28 +02:00
Bret Curtis
f0b21cca22 use own inline hash_combine function 2017-06-12 00:32:28 +02:00
scrawl
fb7479c194 Update CONTRIBUTING.md 2017-06-11 23:52:01 +02:00
Bret Curtis
266ffc84ff Merge pull request #1315 from devnexen/getuid_build_fix
needs this head for getuid
2017-06-10 16:25:37 +02:00
David Carlier
8a5c62de97 needs this head for getuid 2017-06-10 14:50:43 +01:00
Bret Curtis
11c4aed4e5 algo needed for std::min/max in msvc2013 2017-06-10 09:09:30 +02:00
Bret Curtis
dbf149f9b2 gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now 2017-06-10 00:51:19 +02:00
Bret Curtis
c781d1f8ed purge unnecessary imports
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0 replace and purge boost::math::gcd and other non-used headers 2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2 replace and purge boost::function 2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702 replace boost::bind 2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96 remove boost/tuple 2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b remove more unused imports, including boost headers 2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required
put boost system back in, clean others up

revert Qt

add back boost fstream
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104 replace boost::shared_ptr in extern and components 2017-06-09 19:08:53 +02:00
Nikolay Kasyanov
dd882b69c6 [macOS, CI] Use Release configuration 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
071419db4a [macOS, CI] Enable OpenCS build and see what happens 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
bf630b99fa Use most recent Xcode 2017-06-09 16:49:25 +02:00
Bret Curtis
c8b67221d7 use nullptr instead of NULL 2017-06-09 16:49:25 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
27a5c06f04 [OS X, CI] Disable packaging 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
c16506d07c [OS X, CI] Use Xcode 8/macOS 10.12 SDK 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
6260e15852 [OS X] Temporarily disable OpenCS build on CI 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
4138723bbf [OS X] Add libc++ to linker flags 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
231908d9cf [OS X, CI] Use dependencies build against libc++ 2017-06-09 16:49:25 +02:00
Bret Curtis
5fa2f46499 only set libc++ for APPLE 2017-06-09 16:49:25 +02:00
Bret Curtis
26c023efe2 stdlib to libc++ 2017-06-09 16:49:25 +02:00
Bret Curtis
cb26f52032 matching ifs 2017-06-09 16:49:25 +02:00
Bret Curtis
5a65d6e18d fix std::move 2017-06-09 16:49:25 +02:00
Bret Curtis
433129e728 only bundle with Qt5, for now 2017-06-09 16:49:25 +02:00
Bret Curtis
b6ee76b77b Switch to latest Qt5 version which is C++11-compatible 2017-06-09 16:49:25 +02:00
Bret Curtis
dbc29854b2 try to fix enums 2017-06-09 16:48:40 +02:00
Bret Curtis
b657517bea use c++11 and see what happens 2017-06-09 16:48:40 +02:00
scrawl
59eb0aba7d Merge pull request #1310 from akortunov/guifixes
Removed empty space before dialogue entry (bug #3892)
2017-06-07 21:55:45 +02:00
Andrei Kortunov
c2962ced90 Removed empty space before dialogue entry (bug #3892) 2017-06-04 23:20:43 +04:00
scrawl
6f878327bf Fix unused ICS_MAX warning 2017-06-04 12:50:25 +02:00
scrawl
172cc65be9 Merge pull request #1308 from akortunov/spellpriority
Spell priority: dispel usage improvements
2017-06-04 12:49:53 +02:00
Andrei Kortunov
00402b7154 Removed unused variable 2017-06-04 14:09:23 +04:00
scrawl
d6b97604ba Update AUTHORS.md 2017-06-04 11:19:28 +02:00
scrawl
70e02f4c28 Merge pull request #1306 from Nialsy/master
Fixed quickload with menus open
2017-06-04 11:18:49 +02:00
scrawl
305f5af4a6 Merge pull request #1309 from akortunov/enchantchance
Move a setting to show enchanting success chance to Game section
2017-06-03 22:17:41 +02:00
Andrei Kortunov
f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 2017-06-03 23:03:24 +04:00
scrawl
516e99c6e7 Merge pull request #1305 from akortunov/enchantchance
Show success chance when self-enchanting
2017-06-03 15:19:12 +02:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
scrawl
9032443272 Merge pull request #1307 from nikolaykasyanov/fix-macos-ci
Fix macOS CI
2017-06-03 11:21:46 +02:00
Andrei Kortunov
42f3c73c75 Spell priority: dispel usage improvements 2017-06-03 13:16:44 +04:00
Nikolay Kasyanov
224fcc9a4a [macOS, CI] Fix dependency installation 2017-06-03 10:42:49 +02:00