Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
180 commits
Select commit Hold shift + click to select a range
74cc2f5
Made several optimizations to documentation pages.
heinermann Jul 16, 2015
d1a71d7
[docs] Added Google translate and Software Application tags.
heinermann Jul 19, 2015
b041067
[docs] Only include analytics/translate in online pages.
heinermann Jul 19, 2015
c5c01eb
[docs] Added media queries for reducing page widths.
heinermann Jul 19, 2015
918e370
[docs] Removed a couple of nowrap values.
heinermann Jul 19, 2015
389429b
[docs] Reordered scripts.
heinermann Jul 19, 2015
c310b21
[docs] Added cache control meta tag.
heinermann Jul 19, 2015
69a39bc
[docs] Added favicon.
heinermann Jul 19, 2015
b2f33cf
Revert "[docs] Removed a couple of nowrap values."
heinermann Jul 19, 2015
3b5cda2
[docs] Added conditional nowrap removal.
heinermann Jul 19, 2015
90a58fe
[docs] Added notranslate class to various tags.
heinermann Jul 19, 2015
4e0cc11
[docs] Added compression scripts. Use HTML5 header.
heinermann Aug 22, 2015
bb3fc72
[docs] Manually centered various cmdbtn icons.
heinermann Aug 23, 2015
018177f
[Docs] Added DOM manipulations for Doxygen output with PhantomJS.
heinermann Aug 30, 2015
e54b58e
[Docs] Added some supplementary type documentation.
heinermann Sep 20, 2015
cad546f
[docs] #605 Added robots.txt.
heinermann Sep 20, 2015
8d16cb9
Added notes about issues, versions, and API change
heinermann Sep 28, 2015
3456665
auto_menu: added game_type_extra option to bwapi.ini
blole Nov 5, 2015
5ddab24
fix compiler crashing
blole Sep 17, 2015
210ee0f
get starcraft directory from GetModuleFileNameA() instead of registry
blole Sep 22, 2015
f2d2fe9
made it possible to override all bwapi.ini settings with environment …
blole Sep 18, 2015
e55dd9b
auto_menu: added bwapi.ini option character_name
blole Oct 2, 2015
4f29c7c
stopped updating bwapi.ini unnecessarily
blole Oct 2, 2015
4ba0ef9
fixup! auto_menu: added bwapi.ini option character_name
blole Nov 8, 2015
d15a653
fixup! fix compiler crashing
blole Nov 8, 2015
278fff3
Ignored/removed packages folder.
heinermann Dec 7, 2015
f61a58d
#628 Note that getDistance ignores collisions.
heinermann Dec 7, 2015
484089d
#632 Removed PositionOrUnit.
heinermann Dec 7, 2015
4c155e2
Refactored UnitCommand factories.
heinermann Dec 7, 2015
7018bb4
#621 Renamed Race::getCenter to Race::getResourceDepot
heinermann Dec 8, 2015
ca555e9
#599 Removed gateway and ready pages from installer
heinermann Dec 8, 2015
9e6c6b3
Added nuget command line.
heinermann Dec 8, 2015
024fc96
#615 Duplicated BWAPI binaries in BWAPI/Starcraft folder as a backup
heinermann Dec 8, 2015
86383e4
+nuget boost
blole Dec 5, 2015
24a426e
console opening and output streams
blole Dec 5, 2015
cb27b3b
fix autoOpenConsole() so settings are replaced when called again
blole Dec 5, 2015
60aafc3
revised based on PR comments
blole Dec 5, 2015
e26cefc
Updated Broodwar function mappings.
heinermann Dec 23, 2015
5103b73
Fixed Warbringer always having 0 scarab count.
heinermann Dec 23, 2015
8348c51
#638 Relaxed some information access for enemy units.
heinermann Dec 23, 2015
a28dd86
Added BWAPI::CLIENT_VERSION and getClientVersion.
heinermann Dec 23, 2015
def732b
#625 Fixed some network module prototypes.
heinermann Dec 23, 2015
be33c73
#612 Fixed upgrades for morphed structures.
heinermann Dec 24, 2015
250a102
#618 Fixed small documentation issue.
heinermann Dec 24, 2015
459d7ea
Removed the Replay_Tool projects.
heinermann Dec 24, 2015
23b3ee6
#515 Made UnitInterface::hasPath more lenient.
heinermann Dec 27, 2015
f7a0ace
Added supplementary documentation for hasPath for previous commit.
heinermann Dec 27, 2015
58f0d42
Allows each different AI module to select its own race when multiple …
morosanmihail Jan 12, 2016
4706a84
Added documentation to bwapi.ini to highlight usage of different race…
morosanmihail Jan 12, 2016
2b0968a
avoid compilation warning in configPath()
blole Jan 13, 2016
c69e169
fixed output streams not compiling
blole Jan 13, 2016
ae9316a
fixup! fixed output streams not compiling
blole Jan 13, 2016
e2f6e21
Some VC140 compatibility fixes (suggested by tscmoo)
krasi0 Jan 27, 2016
2156b39
add quick start to readme
dansgithubuser Apr 4, 2016
2709a44
Ignore in git *.db and *.opendb generated by VS2015.
likan999 Apr 15, 2016
2b5cbd9
Some fixes to header include.
likan999 Apr 16, 2016
baf17a6
Upgraded all projects to VC++ 2015.
heinermann Apr 16, 2016
c66b9f7
Fixed a bug where Regionset::getUnits always returned an empty set
heinermann Apr 16, 2016
16fe6d9
Fixed several compiler warnings
heinermann Apr 16, 2016
df8f947
Created BWAPICore library. Created BWAPICoreTest project.
heinermann Apr 17, 2016
3adf65b
Added BWAPICoreTest to the Debug_Pipeline build
heinermann Apr 17, 2016
2575c4f
Enabled language extensions due to a bug in Visual Studio.
heinermann Apr 19, 2016
77bbc9a
Changed test project options for proper code coverage results.
heinermann Apr 19, 2016
acd3b11
#651 Removed SFileAuthenticateArchive hook
heinermann Apr 20, 2016
27994a1
Rename clamp.h to Clamp.h and sha1.{h,cpp} to Sha1.{h,cpp}.
likan999 Apr 20, 2016
1e4f9c0
#641 Made Type construction and id comparison constexpr.
heinermann Apr 21, 2016
4d3376c
#661 Removed Util/Clamp.h in favor of boost.
heinermann Apr 21, 2016
7d65f9a
Replaced ToUpper and ToLower with boost equivalents.
heinermann Apr 24, 2016
dfce1d8
Added boost::filesystem for some code reductions.
heinermann Apr 24, 2016
ffdb76e
Upgraded boost to 1.60.
heinermann Apr 24, 2016
93e0503
#666 Added Documentation and Installer projects.
heinermann May 14, 2016
2a96715
Update gitignore and set verbosity level for AppVeyor.
heinermann May 14, 2016
daa725a
bugfix: limit character_name length to 24 (broodwar limit)
blole Mar 9, 2016
6fc8d12
use boost::filesystem in LoadConfigString()
blole May 17, 2016
bcbcd2e
fix LocalPC on win10, and cleanup
blole May 17, 2016
3b7336f
AutoMenuManager: only join games with matching name
blole May 19, 2016
be57342
using boost::trim()
blole May 19, 2016
50872f5
Update SettingsDialog.cpp
Jun 2, 2016
c233ebd
Update NuGet packages.
heinermann May 14, 2016
3ae0137
Added minimalistic graphviz and attempt to fix automatic build.
heinermann Jul 15, 2016
508d5b4
Removed several FPSCounter tests that were based on unreliable real-t…
heinermann Jul 16, 2016
649b16c
Fixed AppVeyor logging. CI is finally back.
heinermann Jul 16, 2016
6eddf5c
#611 Fixed installer issues when Starcraft directory was missing
heinermann Jul 16, 2016
4701506
Fixed small workspace access issue.
heinermann Jul 16, 2016
a4ccc5b
Prevent a debug version of the SNP_DirectIP from being included in a …
heinermann Jul 16, 2016
6acd622
#598 Fixed Chaoslauncher injection with WINE
heinermann Jul 17, 2016
b9196ea
Removed the link to the old build pipeline.
heinermann Jul 17, 2016
a921185
#641 Make solution files open in VS2015
heinermann Jul 27, 2016
5b721ae
Fixed a couple g++ compiler errors.
heinermann Jul 27, 2016
555e899
Fixed some incorrect project settings for PluginInjector and Storm
heinermann Jul 27, 2016
ce13bad
Removed WindowsTypes.h due to conflicts with headers used by differen…
heinermann Jul 27, 2016
b89452c
Removed 2 unnecessary dialog offsets.
heinermann Jul 29, 2016
8ed5d03
Removed DSound offset in favour of a GetCommandLine detour.
heinermann Jul 29, 2016
0e318a4
Removed a code patch that fixed the menu return location for DirectIP…
heinermann Jul 29, 2016
d8ade8c
Fixed a crash when attempting an import detour in Starcraft 1.17.0.
heinermann Jul 29, 2016
c774756
Removed SDrawRealizePalette hook.
heinermann Jul 29, 2016
4e2b4ce
Fixed accidentally disabling Storm hooks.
heinermann Jul 29, 2016
97823ea
Mapped out a Broodwar super-structure, eliminated the need for 23 mem…
heinermann Aug 3, 2016
c7959a2
Added replay header structure.
heinermann Aug 7, 2016
1d7cb8f
#659 Added Game::getRandomSeed.
heinermann Aug 7, 2016
30179fd
#637 Added an InstallerArchive project.
heinermann Aug 7, 2016
d593686
Changed default install directory to user's profile instead of progra…
heinermann Aug 7, 2016
507a65f
Small readme update and documentation version bump.
heinermann Aug 8, 2016
d8ba336
Fixed several issues with SWIG. Attempt some Java conversions (incomp…
heinermann Aug 23, 2016
4ec7049
#678 Fixed minor GCC compile issue.
heinermann Aug 23, 2016
9e9096b
#622 Added documentation note about Zerg units in allUnitCount.
heinermann Sep 28, 2016
2da6ae3
#619 Updated getBuildUnit documentation.
heinermann Sep 28, 2016
f6dc9e9
Fixed the signature of SVidPlayBegin() function.
giszo Sep 22, 2016
d1efc1e
Use CallWndProc to call the original WndProc
neivv Nov 11, 2016
524de90
Fixed overflow in StrCopy (#695)
thai-ng Dec 22, 2016
cbcd60d
#692 Fixed issue where Zerg Hydralist upgrades
heinermann Dec 27, 2016
a14e934
#478 Fixed an issue where enemy scanner sweeps were inaccessible
heinermann Feb 10, 2017
0062daf
Note that pull requests should be based on develop
heinermann Mar 21, 2017
df71c3e
Updated quick start in readme
heinermann Mar 21, 2017
109ff28
CMakeLists to build client mode libraries + fix for VS2017 (#708)
kvakvs Mar 27, 2017
0a992d2
Upgraded all project and solution files to VS2017
heinermann Mar 27, 2017
e35b0f9
Updated cppcheck script. Fixed several warnings.
heinermann Mar 27, 2017
a44ce48
Applied more restrictive language conformance settings to core projects.
heinermann Mar 27, 2017
b6dad5d
#667 Fixed an issue with absolute paths in save_replay setting
heinermann Apr 19, 2017
59b14af
#710 Prevent BWAPI from being injected via ChaosLauncher if the versi…
heinermann Apr 19, 2017
f9de5a3
Moved apps so that the documentation post-processor would work.
heinermann Apr 28, 2017
4a9ad9c
#733 BWAPI 4.2.0 always immediately fails when injected on WinXP SP3
chriscoxe Jul 30, 2017
8bd5901
Added link to SSCAIT Discord
krasi0 Oct 25, 2017
456ad61
Added link to SSCAIT Discord
krasi0 Oct 25, 2017
9960a76
Fix crash when starting second multiplayer game with speed_override=0
jaj22 Nov 22, 2017
160bfd0
Updated documentation for unit type acceleration and turn radius
dgant Dec 29, 2017
8074f4f
Added example to documentation for acceleration()
dgant Dec 29, 2017
f41dafd
Clarified turnRadius() a bit
dgant Dec 29, 2017
fb35f41
Added documentation for haltDistance
dgant Jan 4, 2018
08e31e1
Specified splash damage percentages.
dgant Jan 4, 2018
000d754
Avoid std::tie in BWAPI::Point
N00byEdge Feb 12, 2018
ede8725
Whoops.
N00byEdge Feb 12, 2018
373d115
Full latcom rewrite
N00byEdge Mar 26, 2018
c32808a
Cleanup
N00byEdge Mar 26, 2018
cfcec3f
Fixes #613
N00byEdge Mar 26, 2018
64b1375
Now current frame works the same on client
N00byEdge Mar 26, 2018
bcac2c2
Change out buffer template for vector<vector<CommandTemp>>
N00byEdge Mar 27, 2018
12190e3
this-> consistency
N00byEdge Mar 27, 2018
82489af
Fix morph supply
N00byEdge Mar 27, 2018
b79b183
Fix cancel_morph supply
N00byEdge Mar 27, 2018
b507e2c
Add _NoCopy configurations
N00byEdge Apr 16, 2018
392c008
Make SVNRevGen work in non-bwapi solutions
N00byEdge Apr 16, 2018
ecb2434
Add NoCopy targets to .gitignore
N00byEdge Apr 17, 2018
b36b208
Cleanup bwapi.sln
N00byEdge Apr 17, 2018
cc34b3f
#790 Tell Clients about player->isParticipating
May 18, 2018
c5b3ce6
Specified that Player.weaponDamageCooldown only applies to ground att…
dgant May 3, 2018
958825f
Fix client desync when trying to expand to base with blocking minerals
N00byEdge Jul 27, 2018
dd3bf2f
Update version to 4.3.0
heinermann Oct 30, 2018
d9df910
Merge branch 'master' into develop
heinermann Oct 30, 2018
af07c94
Merge pull request #809 from bwapi/develop
heinermann Oct 30, 2018
76a59c1
Fixes #808 and similar bugs
N00byEdge Nov 4, 2018
acc91cb
Change getEnergy() to not work on enemy units
N00byEdge Nov 4, 2018
a411761
Fixes #808 and similar bugs
N00byEdge Nov 4, 2018
10093b1
Change getEnergy() to not work on enemy units
N00byEdge Nov 4, 2018
7657ab1
Made BWAPILIB compilation required. There is no more lib directory.
heinermann Mar 2, 2019
a6fc4cc
Fixed installer build
heinermann Mar 2, 2019
fce3d1a
Fix crash in latcom and in canTargetUnit()
N00byEdge Mar 4, 2019
5781852
#724 Incorrect VC++ Redist shipped with BWAPI 4.2.0
chriscoxe Mar 6, 2019
7639925
Fix buildability inaccuracy, affects only BWAPI.dll and can be backpo…
N00byEdge Mar 7, 2019
3d23135
Fix orange player color
N00byEdge Mar 7, 2019
99dd204
Change distance calculations to conform to OpenBW, closes #817
N00byEdge Mar 7, 2019
4a98429
Time client bots
N00byEdge Mar 7, 2019
b27dccc
Update version to 4.4.0
N00byEdge Mar 7, 2019
a4e8697
Apply getBuildUnit() symmetry, fixes #780
N00byEdge Mar 7, 2019
ca4a230
RANDOM map iteration, Fixes #777 and makes map iteration deterministi…
N00byEdge Mar 7, 2019
b61db9f
Fix broken example at getRegion(), fixes #723
N00byEdge Mar 7, 2019
23d6b82
Allow sending text to only bot if userInput is disabled
N00byEdge Mar 7, 2019
80cee84
Change isCloaked logic to include enemy units, fixes #656
N00byEdge Mar 7, 2019
1546701
Merge branch 'master' into develop
N00byEdge Mar 7, 2019
ae8467a
Merge branch 'develop' of github.com:bwapi/bwapi into develop
N00byEdge Mar 7, 2019
a2c9a6a
Remove spurious code from merge
N00byEdge Mar 7, 2019
e4a29d7
Merge pull request #823 from bwapi/develop
N00byEdge Mar 7, 2019
b00cbd2
Hold off on isCloaked change until we've decided on what to do
N00byEdge Mar 7, 2019
7687da8
Merge pull request #824 from bwapi/develop
N00byEdge Mar 7, 2019
4e8ba80
Merge tag 'v4.4.0' of https://github.com/bwapi/bwapi into develop-openbw
Oct 1, 2020
ce69ab9
Remove vc_redist
Oct 1, 2020
b9aa65e
Removed origs....
Oct 1, 2020
f26404d
Bumped version info
Oct 2, 2020
755392d
Fix build under MacOS
nlinker May 27, 2021
3049ab9
Merge pull request #1 from nlinker/develop-openbw
Bytekeeper May 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
*.sdf
*.opensdf
*/svnrev.h
*/include/svnrev.h
*.suo
*.log
*.ncb
Debug
Release
Release_Pipeline
Debug_Pipeline
Release_NoCopy
Debug_NoCopy
*.swp
*.bak
cppcheck.xml
Expand Down Expand Up @@ -39,3 +42,5 @@ apps/cygwin/
apps/http*
BWAPI.7z


build
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(BWAPI)
set(CMAKE_DISABLE_SOURCE_CHANGES ON)
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)

set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = BWAPI
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 4.2.0
PROJECT_NUMBER = 4.4.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
Binary file not shown.
22 changes: 22 additions & 0 deletions Documentation/post-processing/phantomjs/LICENSE.BSD
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the <organization> nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Binary file not shown.
40 changes: 40 additions & 0 deletions Documentation/post-processing/phantomjs/third-party.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
This document contains the list of Third Party Software included with
PhantomJS, along with the license information.

Third Party Software may impose additional restrictions and it is the
user's responsibility to ensure that they have met the licensing
requirements of PhantomJS and the relevant license of the Third Party
Software they are using.

Qt - http://qt-project.org/
License: GNU Lesser General Public License (LGPL) version 2.1.
Reference: http://qt-project.org/doc/qt-4.8/lgpl.html.

WebKit - http://www.webkit.org/
License: GNU Lesser General Public License (LGPL) version 2.1 and BSD.
Reference: http://www.webkit.org/coding/lgpl-license.html and
http://www.webkit.org/coding/bsd-license.html.

Mongoose - https://github.com/cesanta/mongoose
License: MIT
Reference: https://github.com/cesanta/mongoose/commit/abbf27338ef554cce0281ac157aa71a9c1b82a55

Breakpad - http://code.google.com/p/google-breakpad/
License: BSD.
Reference: http://code.google.com/p/google-breakpad/source/browse/trunk/COPYING.

OpenSSL - http://www.openssl.org/
License: OpenSSL License, SSLeay License.
Reference: http://www.openssl.org/source/license.html.

Linenoise - https://github.com/tadmarshall/linenoise
License: BSD.
Reference: https://github.com/tadmarshall/linenoise/blob/master/linenoise.h.

QCommandLine - http://xf.iksaif.net/dev/qcommandline.html
License: GNU Lesser General Public License (LGPL) version 2.1.
Reference: http://dev.iksaif.net/projects/qcommandline/repository/revisions/master/entry/COPYING

wkhtmlpdf - http://code.google.com/p/wkhtmltopdf/
License: GNU Lesser General Public License (LGPL)
Reference: http://code.google.com/p/wkhtmltopdf/
Binary file not shown.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BWAPI for OpenBW

This is a fork of BWAPI which allows the use of OpenBW as a backend for BWAPI.
The BWAPI version is 4.2.0.
The BWAPI version is 4.4.0.

This fork has significant changes and it no longer works with regular StarCraft: Brood War. Support for OpenBW should eventually be merged into the official BWAPI, but this fork will exist until then.

Expand Down Expand Up @@ -43,6 +43,7 @@ If you installed, BWAPI.h (and the rest) will be in the include folder, otherwis
On Windows, you should link to BWAPILIB.lib (not BWAPI.lib, this is different from regular BWAPI).

On Linux, you don't really need to link to anything, but you can -lBWAPILIB if you want.
* **SSCAIT Discord:** https://discord.gg/DqvHsq9

### Running

Expand Down
20 changes: 14 additions & 6 deletions bwapi/AIModuleLoader/AIModuleLoader.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -45,29 +45,29 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NOMINMAX;WIN32;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<PreLinkEvent />
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>../lib/BWAPId.lib;../lib/BWAPIClientd.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NOMINMAX;WIN32;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
Expand All @@ -79,6 +79,7 @@
<OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<PreLinkEvent />
<Link>
Expand All @@ -87,12 +88,19 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>../lib/BWAPI.lib;../lib/BWAPIClient.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Source\AIModuleLoader.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BWAPIClient\BWAPIClient.vcxproj">
<Project>{c99abf61-6716-4fc0-aa77-9a136ea61680}</Project>
</ProjectReference>
<ProjectReference Include="..\BWAPILIB\BWAPILIB.vcxproj">
<Project>{843656fd-9bfd-47bf-8460-7bfe9710ea2c}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
5 changes: 2 additions & 3 deletions bwapi/Archive/Archive.vcxproj
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
<ProjectGuid>{7C035A16-F016-4F21-88EB-8DD3B9539219}</ProjectGuid>
<Keyword>MakeFileProj</Keyword>
<ProjectName>InstallerArchive</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v141_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -42,7 +41,7 @@ IF %ERRORLEVEL% NEQ 0 (
)

cd $(SolutionDir)/../
7z a -r -mx=9 -myx=9 BWAPI.7z Release_Binary
7z a -r BWAPI.7z Release_Binary
cd $(SolutionDir)
</NMakeBuildCommandLine>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion bwapi/BWAPI/Source/BW/OrderTypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <BWAPI/Order.h>
#include <BWAPI/Race.h>

#include "../../../Debug.h"
#include <Debug.h>
namespace BW
{
namespace Orders
Expand Down
2 changes: 1 addition & 1 deletion bwapi/BWAPI/Source/BW/PositionUnitTarget.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "PositionUnitTarget.h"

#include "../../../Debug.h"
#include <Debug.h>

#include <BWAPI/GameImpl.h>

Expand Down
2 changes: 1 addition & 1 deletion bwapi/BWAPI/Source/BW/UnitTarget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <BWAPI/UnitImpl.h>
#include <BWAPI/GameImpl.h>

#include "../../../Debug.h"
#include <Debug.h>

namespace BW
{
Expand Down
13 changes: 9 additions & 4 deletions bwapi/BWAPI/Source/BWAPI/AutoMenuManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//#include "../DLLMain.h"

#include <algorithm>
#include <random>
#include <sstream>
//#include <Util/Path.h>
#include <Util/StringUtil.h>
Expand All @@ -14,6 +15,11 @@

using namespace BWAPI;

namespace
{
std::mt19937 mt{static_cast<unsigned>(std::chrono::system_clock::now().time_since_epoch().count())};
}

AutoMenuManager::AutoMenuManager(BW::Game bwgame) : bwgame(bwgame)
{
this->reloadConfig();
Expand Down Expand Up @@ -149,19 +155,18 @@ void AutoMenuManager::chooseNewRandomMap()
{
if (!this->autoMapPool.empty())
{
int chosenEntry = 0;
std::string chosen;
if (this->autoMapIteration == "RANDOM")
{
// Obtain a random map file
chosenEntry = rand() % this->autoMapPool.size();
std::sample(autoMapPool.begin(), autoMapPool.end(), &chosen, 1, mt);
}
else if (this->autoMapIteration == "SEQUENCE")
{
if (this->lastAutoMapEntry >= this->autoMapPool.size())
this->lastAutoMapEntry = 0;
chosenEntry = this->lastAutoMapEntry++;
chosen = this->autoMapPool[this->lastAutoMapEntry++];
}
std::string chosen = this->autoMapPool[chosenEntry];
this->lastMapGen = this->autoMenuMapPath + chosen;
}
}
Expand Down
2 changes: 1 addition & 1 deletion bwapi/BWAPI/Source/BWAPI/AutoMenuManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace BWAPI
std::string lastMapGen;
std::vector<std::string> autoMapPool;
std::string autoMenuMapPath;
std::string autoMapIteration;
std::string autoMapIteration = "RANDOM";

std::string autoMenuRace;
std::array<std::string, BW::PLAYABLE_PLAYER_COUNT> autoMenuEnemyRace;
Expand Down
2 changes: 1 addition & 1 deletion bwapi/BWAPI/Source/BWAPI/BWtoBWAPI.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "BWtoBWAPI.h"

#include "../../../Debug.h"
#include <Debug.h>

namespace BWAPI
{
Expand Down
2 changes: 1 addition & 1 deletion bwapi/BWAPI/Source/BWAPI/BulletImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "PlayerImpl.h"
#include "UnitImpl.h"

#include "../../../Debug.h"
#include <Debug.h>

namespace BWAPI
{
Expand Down
9 changes: 3 additions & 6 deletions bwapi/BWAPI/Source/BWAPI/Command.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#pragma once
#include "CommandTemp.h"
class Command;
#include <BWAPI/Client/CommandTemp.h>
#include "UnitImpl.h"
#include "PlayerImpl.h"

namespace BWAPI
{
class Command : public CommandTemp<BWAPI::UnitImpl,BWAPI::PlayerImpl>
{
public:
Command(const UnitCommand& command) : CommandTemp<BWAPI::UnitImpl,BWAPI::PlayerImpl>(command) {}
};
using Command = CommandTemp<UnitImpl, PlayerImpl>;
}
Loading