Skip to content
Merged

5.0.1 #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
620 commits
Select commit Hold shift + click to select a range
c14c75c
* unidentified items show ??? gold value
Nov 8, 2025
f9df032
* add camera shake to generic magic damage
Nov 8, 2025
de18a41
* fix accursed spellbook spawning when player is disconnected but has…
Nov 9, 2025
e12c4cd
* fix hardware shopkeeper spawning over 20 items and overflowing into…
Nov 9, 2025
f9672ad
* adjust XP in multiplayer, shares are same regardless if dead
Nov 9, 2025
0fec3df
* touch spell post-swing allows holding cast to recast next spell ins…
Nov 9, 2025
795cde8
* update lang
Nov 9, 2025
a2069e5
* fix up poison/burning amulet proc to not spam, limit of 1 degrade /…
Nov 10, 2025
7a69a1b
* debug for magic levelling
Nov 17, 2025
9d06ca1
* duck item
Nov 17, 2025
994d6a3
* lower magic gain thresholds
Nov 17, 2025
c2c8faa
* PER ranged pierce from 0.5x to 1.0x
Nov 18, 2025
1f8dc06
* option to mute instrument tracks in background
Nov 18, 2025
15a5d40
* new weapons
Nov 19, 2025
5e491cb
* project spirit into duck, modify death ghost, can use follower wheel
Nov 24, 2025
b1529bf
* fix cutscene text scroll at <50fps
Nov 24, 2025
5a43672
* fix gate neighbours causing themselves to not lock and be impassable
Nov 24, 2025
613c9fa
* fix classic mode reporting on levels > 25
Nov 24, 2025
ed15906
* duck extra appearance, offhand throw
Nov 24, 2025
0ce8b19
* lang update
Nov 24, 2025
a6a57b0
* add control option for keyboard to stop hotbar selection changing o…
Nov 24, 2025
8c3e13a
* decrease xp penalty 0.7/0.6/0.5 to 0.9/0.8/0.7
Nov 25, 2025
65000c4
* lang update
Nov 25, 2025
6f75615
* fix spell panel hotkey scrolling to inconsistent spot
Nov 25, 2025
64c8f4f
* shorter character on preview draws lower
Nov 25, 2025
d87a335
* slight fix in portrait code
Nov 25, 2025
35fdb5d
* shillelagh unbreakable
Nov 26, 2025
cbc9171
* new race effects WIP
Nov 27, 2025
e2dcbb5
* INT gives magic RES
Nov 29, 2025
82e3119
* _s mana regen to 50%
Nov 29, 2025
92e70fb
* transmute spells selection GUI
Dec 2, 2025
5e2a34d
* mysticism spells
Dec 5, 2025
2db890d
* overdrawing HP reduces health from spells to 50% PWR no modifier
Dec 5, 2025
b8d5f1a
* editor fix
Dec 5, 2025
9cc75ae
* fix spell crash after death
Dec 7, 2025
524a305
* overcharge half mana for spells
Dec 7, 2025
e1a260f
* increase num status effects
Dec 7, 2025
a23fa97
* upgrade scores.dat to new json format
Dec 7, 2025
7ab3a07
* update race sex icons, texts
Dec 7, 2025
3e4501a
* fix memory leak with spells/books
Dec 8, 2025
d17f96b
* stop doors digging into treasure rooms
Dec 9, 2025
8b5d620
* new alchemy cooking station GUI with toggle
Dec 11, 2025
c5602f9
* touch spells final linetrace to check behind gates/iron doors
Dec 11, 2025
ba949d8
* monster_S tails
Dec 11, 2025
af1eae4
* more items.json hashes
Dec 11, 2025
c568b2b
* spell skills provide +2.5% stat bonus mult per skill over 60 (+60% …
Dec 11, 2025
b490aec
* monster_s mechanics
Dec 11, 2025
58312b1
* fix up foci collision
Dec 11, 2025
f2b2bc1
* fix playfab scores processing file path on some systems
Dec 11, 2025
48848e9
* clarify daedalus text minotaur
Dec 11, 2025
0a3dde3
* fix root spell copying for clients channeled spells / crash when fr…
Dec 13, 2025
4071286
* claymore attack
Dec 13, 2025
bf7dd6d
* lang update
Dec 13, 2025
ab698b0
* identifying items rerolls appearance, rework appearance change func…
Dec 13, 2025
a8f34cd
* fix race label at lobby too small
Dec 13, 2025
08b4bad
* thorns/heat mana cost convert to safeConsumeMP instead of modMP
Dec 13, 2025
89d8b72
* add charge foci message for light/dark for reaching max
Dec 14, 2025
096bdd6
* _s more hungry
Dec 14, 2025
64b602c
* player unique evasion rng, add to silken bow too
Dec 14, 2025
c5463e7
* fix crash
Dec 15, 2025
02e89dd
* vertical magic turn off vertical movement on reflection
Dec 15, 2025
1b77cf7
* status effects have 36 from 32 nominal size, spells drawn at 36, sm…
Dec 15, 2025
73f1013
* right align tier I - IV status effect text, push down numbers for s…
Dec 15, 2025
dce888b
* escalating rng into a map of different rolls
Dec 15, 2025
0d02451
* refactor items[].value into gold_value
Dec 18, 2025
c132334
* save appraisal progress of items to savefile, changing appraise tar…
Dec 21, 2025
96d7edc
* fix linetrace bug with enemies over pits not blocking tooltip inter…
Dec 21, 2025
25b0980
* litany of thaumaturgy spells
Dec 21, 2025
bf6ead2
* appraisal counter show mm:ss instead of percent by default
Dec 21, 2025
425d47a
* new thaum tier spell numbers
Dec 21, 2025
d4bc5ec
* add a cleanup to sustained spells, hopefully fine
Dec 21, 2025
35c02b4
* lang update
Dec 21, 2025
5d00895
* power strike hides weapon from hud and damage calc
Dec 21, 2025
9ef8b0c
* holy beam no +0 dmg
Dec 21, 2025
d397ec2
* melee / ranged destroying objects grants 5% skill up to 20
Dec 22, 2025
80169fe
* salamander XP to MP can be polymorphed
Dec 24, 2025
9f0a9e1
* steal weapon no work shopkeepers, can work on adorcised weapons
Dec 24, 2025
2945ceb
* tooltips inaccessible behind closed doors/iron doors
Dec 24, 2025
474ad24
* melee/ranged attacks for players scale of % stat rather than flat d…
Dec 24, 2025
3c6ecc0
* fix blessed meals not working on other players
Dec 25, 2025
dec6784
* skeleton key degrades first unlock on chests/wall locks, add some c…
Dec 25, 2025
20fddb7
* missed code from previous "armr" packet changes
Dec 25, 2025
036eff8
* enchant scrolls have gold cost per bless now, max 10k cap
Dec 25, 2025
3e7417b
* shop no sell readable books
Dec 25, 2025
5daa30e
* dominate creature limit based on PWR, new sprite
Dec 27, 2025
809809b
* fix earth sprite load game losing monsterAllySummonRank
Dec 27, 2025
2dd4be0
* remove /foci commands release build
Dec 27, 2025
5ebf027
* boulder spawns gib on impact for clients
Dec 27, 2025
b2709ae
* rename new monster and races, new class growths
Dec 28, 2025
50bb7fa
* lang update
Dec 28, 2025
1312e5c
* remove some debug keys
Dec 28, 2025
083499b
* arcanist remove light, starts with windgate
Dec 28, 2025
a0b4b78
* updateSustainedSpellEvent takes in target entity to exclude allies
Dec 28, 2025
4cb2c92
* shaman spells exclude mention of included spells in tooltips if not…
Dec 28, 2025
afb4684
* update spell tag tooltip strings
Dec 28, 2025
8851ed8
* scarabs inflict weakness on hit, greater in caves
Dec 28, 2025
01e7921
* caves arcane boulders
Dec 28, 2025
4fd303e
* magic trap stronger in caves
Dec 28, 2025
1957645
* polymorph adjust chances
Dec 28, 2025
3b74a18
* appraise only raise skill beyond 50 if value >=300
Dec 28, 2025
1378b7f
* update lang
Dec 28, 2025
95889e8
* fix editor, class growth updates
Dec 29, 2025
159bd49
* rich presence update
Dec 29, 2025
bb65b3a
* fix crash
Dec 29, 2025
cdbfaf8
* pot
Dec 29, 2025
de02369
* fix conjured skeleton HP
Dec 29, 2025
96840e7
* disarm monsters only
Dec 29, 2025
ee97ce5
* fix low PER and appraisal not starting
Dec 29, 2025
c165b82
* dyrnwyn now 0.25-0.5x smite from 0.5 to 1.0x
Dec 30, 2025
2749a59
* cowardice no work on bosses, add fear to minotaur resist
Dec 30, 2025
9085a63
* appraisal above 50 also reduces fast time
Dec 30, 2025
a3e3681
* heal faster levelling
Dec 30, 2025
e8d7992
* use short thauma name for spell tooltips in desc
Dec 30, 2025
40eaac5
* fire sprite no block enemy pathing or pushes enemies
Dec 30, 2025
5b39eaf
* update lang
Dec 30, 2025
fa4297a
* spellbooks adjust spawn rates, tier 1 more common and all sources c…
Dec 30, 2025
b89a6f7
* salamander hunger is innate to race
Dec 30, 2025
d069aa1
* clear secret treasure rooms, fix desync underworld?
Dec 31, 2025
91ac2bf
* fix compel on players, xp not awarding
Dec 31, 2025
499ff70
* magicstaffs can level up to skills difficulty, reduced chances past 20
Jan 1, 2026
ce8542e
* fix void chest crash
Jan 1, 2026
5d4fc5b
* compel no target items for monster selection
Jan 2, 2026
d72b0b1
* sexton less STR more CHR
Jan 2, 2026
f45b5c6
* compel timer from 15 to 30 seconds
Jan 2, 2026
b135d66
* compel cant interact items
Jan 2, 2026
7fbd7f0
* jewel recruits on dungeon lvl, spawn ? when unsuccessful
Jan 2, 2026
69250da
* forge key has transmute menu, can go directly to key
Jan 2, 2026
01a3029
* add message relay for jewel too many followers
Jan 2, 2026
79d9df8
* cursed enchant scrolls eat gold too
Jan 2, 2026
2becf5d
* garbage chest now 50% scroll, and 50% scroll overriding mouth rose …
Jan 2, 2026
79f9a33
* gold value breakpoints for appraisal can be equal to, pushes artifa…
Jan 2, 2026
07b3625
* insectoid increase hunger for misc MP sources to match MP amounts
Jan 2, 2026
5132462
* duck inflicts visible status effect nearby
Jan 2, 2026
809f95a
* earth sprite lower STR gain
Jan 2, 2026
e694820
* fix high evasion not proccing back to back
Jan 3, 2026
d1373ed
* start new spell tooltip formatting support
Jan 3, 2026
16b601c
* give revenant skulls some stats
Jan 3, 2026
f1897f4
* lang update
Jan 3, 2026
00e2f05
* stop arrows with crossbow sticking out on casting anim
Jan 4, 2026
542487c
* fix arcane mark duration
Jan 4, 2026
d615035
* appraisal timer changes as skill/PER/effects change
Jan 4, 2026
592ba56
* fix insectoid MP gain on level up hunger
Jan 4, 2026
4e0983a
* cleats dont stop dash
Jan 4, 2026
5a287f3
* no level on reflected spells
Jan 4, 2026
77f310e
* fix was_connected variable not being reset on endgame, causing load…
Jan 16, 2026
6fca9aa
* update eos
Jan 16, 2026
3af2ffb
* fix envenom weapon proc being rarer than intended (was inside a 25%…
Jan 18, 2026
9eb844f
* acid spray damage numbers correct display
Jan 18, 2026
002ff52
* tinkering non-robot/trap creations move to 1 scrap for salvage
Jan 19, 2026
4904640
* mailbox wip
Jan 20, 2026
641993b
* ration CON effects can stack
Jan 20, 2026
ffa175b
* new spell/spellbook tooltip support
Jan 20, 2026
55805c4
* shaman forms give some base +ATK values
Jan 20, 2026
12dbaa7
* beartrap energize punisher hood
Jan 20, 2026
fd920b9
* germinate drops 1-3 based on growth
Jan 20, 2026
b2f222c
* rocks don't show unappraised value of ???
Jan 20, 2026
f280cbc
* fix monocle on all items
Jan 20, 2026
21d5041
* fix myconid losing health with hunger off and rotten food
Jan 20, 2026
ca9872a
* fix insectoid mp not restoring hunger with HP +MP effect active (no…
Jan 20, 2026
9ec795d
* whip can increase on breakables
Jan 20, 2026
11b6857
* lang update
Jan 20, 2026
260fb73
* arcane boulder entry for compendium
Jan 22, 2026
5b4874f
* gold tracker for player dropped gold
Jan 25, 2026
7f567c1
* fix saveScore appearance
Jan 25, 2026
565d148
* clear overcharge on new game/entity removal
Jan 25, 2026
c45124c
* fix counsel PWR buff
Jan 25, 2026
e7b4f38
* slop balls can blind, thrown balls hit multiple targets
Jan 25, 2026
d657ca0
* lang update
Jan 25, 2026
d799797
* last of tooltips / compendium?
Jan 26, 2026
952b7cb
* sorcery foci to chest/shop droptables
Jan 26, 2026
bb1ce33
* steam stat updates
Jan 26, 2026
bb2e5f3
Merge remote-tracking branch 'origin/master' into dev25-rc
Jan 26, 2026
e5889a9
* mergey
Jan 26, 2026
cc03cd8
* update .cpp files for cmake
Jan 26, 2026
16b404c
Merge pull request #901 from TurningWheel/master
WALLOFJUSTICE Jan 26, 2026
9ac4f32
Merge pull request #902 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 26, 2026
a2c3fc7
* arbalest lower ATK, reduce ranged multiplier from 6 to 5.5%
Jan 26, 2026
66fffd1
* achievements done
Jan 27, 2026
5983bbc
* lang update
Jan 27, 2026
0883a56
* fix human hp not scaling with stats
Jan 27, 2026
2ac308b
* reflect magic add extra 5 - 10 MP on redirect
Jan 28, 2026
8733e72
* player gnomes hostile to gnomes
Jan 28, 2026
00f9a22
* myconid cap adds germinate DMG, poison speed, spores utility
Jan 28, 2026
70a33cd
* cursed cooking food applies blessing rules as potions do
Jan 28, 2026
f2ec7d1
* gnome wealth tier rescale
Jan 28, 2026
04cd094
* prevent exits spawning treaasure room tiles
Jan 28, 2026
af37c60
* ghost can use buttons, no make player monster noises
Jan 28, 2026
e4a1b10
* map hash update
Jan 28, 2026
1b1e35a
* update hash
Jan 29, 2026
4a22a10
* blindfold now doesn't appraise spellbooks on read attempt
Jan 29, 2026
918eb3b
* parry tank achievement maybe improve
Jan 29, 2026
1953684
* compendium new magic skills reset existing data to 0 on upgrade
Jan 29, 2026
5297d3d
* fix compilation
Jan 29, 2026
d7af145
* lang update
Jan 29, 2026
aee14c8
Merge pull request #904 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 29, 2026
fc2aca1
minor changes to fix compilation on macOS
SheridanR Jan 29, 2026
fd79b2d
update xcode project
SheridanR Jan 29, 2026
c93f5f9
Merge pull request #181 from TurningWheel/develop
WALLOFJUSTICE Jan 29, 2026
4e013c1
* workbench/cauldron spawns
Jan 29, 2026
67568f3
* tooltip for growth instruments update
Jan 29, 2026
98b8488
Merge pull request #905 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 29, 2026
53ab16b
* fix shopkeeper crash
Jan 29, 2026
b28ee33
* update spell hashing to be sequential no json defined
Jan 29, 2026
82ac9f3
Merge pull request #906 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 29, 2026
055c7fa
* tooltip fixes for bard
Jan 29, 2026
dc6ad8e
Merge pull request #907 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 29, 2026
c5dc089
* no backstab on rooted since AI is paused in pathing state
Jan 29, 2026
040cf26
Merge pull request #908 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 29, 2026
c34a66d
* fix earth sprite not commanding for clients
Jan 29, 2026
9284c62
Merge pull request #909 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 29, 2026
8647aa0
* update map hashes
Jan 30, 2026
602cd26
* fix bolder boulder on friendlies
Jan 30, 2026
eb7598b
* racial < 20% stats occur after 5 or more in stat
Jan 30, 2026
7ffe446
* fix spellbook drop tables on compendium
Jan 30, 2026
673a722
* mysterious shopkeep allow player clipping
Jan 30, 2026
717fe01
* deface on workbench/cauldron
Jan 30, 2026
df0c745
Merge pull request #913 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 30, 2026
1dec4a0
* crossbow reduce swift arrow modifier by half
Jan 31, 2026
1366876
* fix aesthetic option short race heights and equipment models
Jan 31, 2026
24cf0da
* fix collision on grease puddles/bells edge case
Jan 31, 2026
0eca8d3
* fix modded music reload
Jan 31, 2026
a8e57b6
Merge pull request #914 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 31, 2026
5b8d0b9
* prevent clients warping back to dungeon floor 0 (breaks /jumplevel)
Jan 31, 2026
a22d1f6
Merge pull request #915 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 31, 2026
4cd3144
* auto appraise fix not checking for existing appraisal time remaining
Jan 31, 2026
0fc5bfb
Merge pull request #916 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 31, 2026
bbf02e1
* reduce scion recharge from spells from 20% to 5% per tier
Jan 31, 2026
224146a
Merge pull request #917 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 31, 2026
3f9e4bf
* skills page lore fix numeric totals for capstone
Jan 31, 2026
261e264
Merge pull request #918 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Jan 31, 2026
78eb549
* spell level ups to escalating rng
Feb 1, 2026
122c73c
* preserve for reflect amulets/cloaks x3
Feb 1, 2026
38b8f7d
* /appraisal_auto_switch command, lock on to lowest appraisal item au…
Feb 2, 2026
18f0cc8
* fix
Feb 2, 2026
54ba3a0
* fix one who knocks achievement when parrying
Feb 2, 2026
0c31b42
* preserve 2x mult reflection
Feb 2, 2026
de35ce7
* leaderboards upload effects data
Feb 2, 2026
01a6ac1
* appraise boxes for manual mode
Feb 2, 2026
1cbef0a
* lang update
Feb 2, 2026
ebab5f6
* appraise prompt x to select manual if current item
Feb 2, 2026
c420582
Merge pull request #919 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Feb 2, 2026
69efc62
* set player head sprite to default based on player race
Feb 2, 2026
15d0bdb
Merge pull request #920 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Feb 2, 2026
7244e5d
* toggle appraise manual lock on click
Feb 2, 2026
2176bd4
Merge pull request #921 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Feb 2, 2026
d557a29
* hold ALT to quickcast from hotbar or right click
Feb 2, 2026
0cec067
* all character swim speed 25 swimming (12.5%) human/rat (25%) faster…
Feb 2, 2026
2ab5b9c
Merge pull request #922 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Feb 2, 2026
053014a
* bump game version
Feb 2, 2026
d9b9c0c
Merge pull request #923 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Feb 2, 2026
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,9 @@ xcode/Barony/Barony.xcodeproj/xcuserdata/*
*.ps1
!LICENSE.nativefiledialog.txt
/VS.2015/Barony/x64/Debug
*.sarif
*.i
*.enc
*.ilk
/VS.2015/x64
*.sqlite-journal
3 changes: 2 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ You will need the following libraries to build Barony:
* CMake (on Windows, use versions at least as new as 3.8.0)

OPTIONAL dependencies:
* One of FMOD Core API 2.00.08 or OpenAL for audio support.
* FMOD Core API 2.02.14.

FMOD Studio API can be downloaded at https://www.fmod.com/download (you do need an account to download it).
You can disable FMOD by running cmake with -DFMOD_ENABLED=OFF (it's also disabled if not found).

OpenAL can be used with -DOPENAL_ENABLED
* Note - OpenAL support has been deprecated and is currently unmaintained.

You will also need the following tools:

Expand Down
9 changes: 9 additions & 0 deletions VS.2015/Barony.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Global
EOS Debug|x64 = EOS Debug|x64
EOS|Win32 = EOS|Win32
EOS|x64 = EOS|x64
EOSDebugInstrumentation|Win32 = EOSDebugInstrumentation|Win32
EOSDebugInstrumentation|x64 = EOSDebugInstrumentation|x64
NODRM|Win32 = NODRM|Win32
NODRM|x64 = NODRM|x64
Release|Win32 = Release|Win32
Expand Down Expand Up @@ -55,6 +57,10 @@ Global
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.EOS|Win32.Build.0 = EOS|Win32
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.EOS|x64.ActiveCfg = EOS|x64
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.EOS|x64.Build.0 = EOS|x64
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.EOSDebugInstrumentation|Win32.ActiveCfg = EOSDebugInstrumentation|Win32
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.EOSDebugInstrumentation|Win32.Build.0 = EOSDebugInstrumentation|Win32
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.EOSDebugInstrumentation|x64.ActiveCfg = EOSDebugInstrumentation|x64
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.EOSDebugInstrumentation|x64.Build.0 = EOSDebugInstrumentation|x64
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.NODRM|Win32.ActiveCfg = NODRM|Win32
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.NODRM|Win32.Build.0 = NODRM|Win32
{A4A170FF-C081-4F33-94FE-5C60E89C5990}.NODRM|x64.ActiveCfg = NODRM|x64
Expand Down Expand Up @@ -92,6 +98,8 @@ Global
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOS|Win32.Build.0 = EOS|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOS|x64.ActiveCfg = EOS|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOS|x64.Build.0 = EOS|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOSDebugInstrumentation|Win32.ActiveCfg = EOSDebugInstrumentation|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.EOSDebugInstrumentation|x64.ActiveCfg = EOSDebugInstrumentation|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.NODRM|Win32.ActiveCfg = NODRM|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.NODRM|Win32.Build.0 = NODRM|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.NODRM|x64.ActiveCfg = NODRM|x64
Expand All @@ -103,6 +111,7 @@ Global
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Steam Crossplay|Win32.ActiveCfg = Steam Crossplay|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Steam Crossplay|Win32.Build.0 = Steam Crossplay|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Steam Crossplay|x64.ActiveCfg = Steam Crossplay|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Steam Crossplay|x64.Build.0 = Steam Crossplay|x64
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Steam Debug|Win32.ActiveCfg = Steam Debug|Win32
{8D0CEB30-DFEC-462D-B107-1EA02D317151}.Steam Debug|x64.ActiveCfg = Steam Debug|x64
EndGlobalSection
Expand Down
150 changes: 145 additions & 5 deletions VS.2015/Barony/Barony.vcxproj

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions VS.2015/Barony/Barony.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,27 @@
<ClCompile Include="..\..\src\monster_bugbear.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_d.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_m.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_s.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_g.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_summons.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_moth.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\monster_duck.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\book.hpp">
Expand Down Expand Up @@ -683,6 +704,9 @@
<ClInclude Include="..\..\src\draw.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\files.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\src\game.ico">
Expand Down
102 changes: 100 additions & 2 deletions VS.2015/editor/editor.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@
<Configuration>EOS Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="EOSDebugInstrumentation|Win32">
<Configuration>EOSDebugInstrumentation</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="EOSDebugInstrumentation|x64">
<Configuration>EOSDebugInstrumentation</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="EOS|Win32">
<Configuration>EOS</Configuration>
<Platform>Win32</Platform>
Expand Down Expand Up @@ -177,6 +185,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
Expand All @@ -191,6 +206,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
Expand Down Expand Up @@ -268,12 +290,18 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='EOS Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='EOS Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
Expand Down Expand Up @@ -357,6 +385,13 @@
<CodeAnalysisRuleSet>P:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|Win32'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files (x86)\FMOD SoundSystem\FMOD Programmers API Windows\api\inc;C:\programming\turning_wheel\GameLibs\SDL2-2.0.4\include;C:\programming\turning_wheel\GameLibs\SDL2_image-2.0.0\include;C:\programming\turning_wheel\GameLibs\SDL2_net-2.0.0\include;C:\programming\turning_wheel\GameLibs\libpng-1.2.37-lib\include;C:\programming\turning_wheel\GameLibs\zlib-1.2.3-lib\include;C:\programming\turning_wheel\GameLibs\steamworks_sdk_138a\sdk\public;C:\programming\turning_wheel\GameLibs\SDL2_ttf-2.0.14\include;C:\programming\turning_wheel\GameLibs\missing_windows_includes;P:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\SDL2;P:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\physfs</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);C:\Program Files (x86)\FMOD SoundSystem\FMOD Programmers API Windows\api\lib;C:\programming\turning_wheel\GameLibs\SDL2-2.0.4\lib\x86;C:\programming\turning_wheel\GameLibs\SDL2_image-2.0.0\lib\x86;C:\programming\turning_wheel\GameLibs\SDL2_net-2.0.0\lib\x86;C:\programming\turning_wheel\GameLibs\libpng-1.2.37-lib\lib;C:\programming\turning_wheel\GameLibs\zlib-1.2.3-lib\lib;C:\programming\turning_wheel\GameLibs\steamworks_sdk_138a\sdk\redistributable_bin;C:\programming\turning_wheel\GameLibs\SDL2_ttf-2.0.14\lib\x86;P:\Ben\Documents\Visual Studio 2015\Projects\libphysfs;$(SolutionDir)..\VS-libs</LibraryPath>
<TargetName>$(ProjectName)</TargetName>
<CodeAnalysisRuleSet>P:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|Win32'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\Program Files (x86)\FMOD SoundSystem\FMOD Programmers API Windows\api\inc;C:\programming\turning_wheel\GameLibs\SDL2-2.0.4\include;C:\programming\turning_wheel\GameLibs\SDL2_image-2.0.0\include;C:\programming\turning_wheel\GameLibs\SDL2_net-2.0.0\include;C:\programming\turning_wheel\GameLibs\libpng-1.2.37-lib\include;C:\programming\turning_wheel\GameLibs\zlib-1.2.3-lib\include;C:\programming\turning_wheel\GameLibs\steamworks_sdk_138a\sdk\public;C:\programming\turning_wheel\GameLibs\SDL2_ttf-2.0.14\include;C:\programming\turning_wheel\GameLibs\missing_windows_includes;P:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\SDL2;P:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\include\physfs</IncludePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);C:\Program Files (x86)\FMOD SoundSystem\FMOD Programmers API Windows\api\lib;C:\programming\turning_wheel\GameLibs\SDL2-2.0.4\lib\x86;C:\programming\turning_wheel\GameLibs\SDL2_image-2.0.0\lib\x86;C:\programming\turning_wheel\GameLibs\SDL2_net-2.0.0\lib\x86;C:\programming\turning_wheel\GameLibs\libpng-1.2.37-lib\lib;C:\programming\turning_wheel\GameLibs\zlib-1.2.3-lib\lib;C:\programming\turning_wheel\GameLibs\steamworks_sdk_138a\sdk\redistributable_bin;C:\programming\turning_wheel\GameLibs\SDL2_ttf-2.0.14\lib\x86;P:\Ben\Documents\Visual Studio 2015\Projects\libphysfs;$(SolutionDir)..\VS-libs</LibraryPath>
Expand All @@ -369,6 +404,11 @@
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)..\VS-libs</LibraryPath>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|x64'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)..\VS-libs</LibraryPath>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|x64'">
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)..\VS-libs</LibraryPath>
Expand Down Expand Up @@ -681,6 +721,31 @@
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;EDITOR;BARONY_DRM_FREE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AdditionalIncludeDirectories>"$(SolutionDir)\..\VS-includes"</AdditionalIncludeDirectories>
<AdditionalOptions>
</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<ObjectFileName>$(IntDir)%(RelativeDir)</ObjectFileName>
<EnablePREfast>false</EnablePREfast>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmod_vc.lib;libpng.lib;zlib.lib;steam_api.lib;SDL2_ttf.lib;physfs.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Steam Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand Down Expand Up @@ -720,13 +785,46 @@
</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>false</EnableCOMDATFolding>
<OptimizeReferences>false</OptimizeReferences>
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmod_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
<Manifest>
<EnableDpiAwareness>
</EnableDpiAwareness>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='EOSDebugInstrumentation|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING;BARONY_DRM_FREE;EDITOR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>"$(SolutionDir)\..\VS-includes"</AdditionalIncludeDirectories>
<AdditionalOptions>
</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp17</LanguageStandard>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>false</EnableCOMDATFolding>
<OptimizeReferences>false</OptimizeReferences>
<AdditionalDependencies>OpenGL32.lib;glu32.lib;SDL2.lib;SDL2main.lib;SDL2_net.lib;SDL2_image.lib;fmod_vc.lib;libpng16.lib;zlib.lib;SDL2_ttf.lib;physfs.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
<Manifest>
<EnableDpiAwareness>
Expand Down
20 changes: 12 additions & 8 deletions lang/compendium_lang/contents_codex.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{"LEVELING UP": "leveling up"},
{"STATS & METASTATS": "stats metastats"},
{"SKILLS": "skills"},
{"GOLD": "gold"},
{" ACTIONS": "-"},
{"MELEE ATTACKS": "melee"},
{"CRITICAL STRIKES": "crits"},
Expand All @@ -17,6 +18,7 @@
{"SNEAKING": "sneaking"},
{"LEGENDARY STRIKES": "legendary strikes"},
{"BLOCKING": "blocking"},
{"OFF-HAND CASTING": "offhand casting"},
{"STRAFE & BACKPEDAL": "strafing"},
{"MEMORIZED CASTING": "memorized"},
{"SPELLBOOK CASTING": "spellbook casting"},
Expand Down Expand Up @@ -47,25 +49,23 @@
{"STEALTH SKILL": "stealth skill"},
{"BLOCKING SKILL": "blocking skill"},
{"RANGED SKILL": "ranged skill"},
{"MAGIC SKILL": "magic skill"},
{"CASTING SKILL": "casting skill"},
{"APPRAISAL SKILL": "appraisal skill"},
{"SWIMMING SKILL": "swimming skill"},
{"SORCERY SKILL": "sorcery skill"},
{"MYSTICISM SKILL": "mysticism skill"},
{"THAUMATURGY SKILL": "thaumaturgy skill"},
{"LORE SKILL": "lore skill"},
{"LEADERSHIP SKILL": "leadership skill"},
{"TRADING SKILL": "trading skill"},
{"ALCHEMY SKILL": "alchemy skill"},
{"TINKERING SKILL": "tinkering skill"}
],
"contents_alphabetical": [
{"ALCHEMY SKILL": "alchemy skill"},
{"APPRAISAL SKILL": "appraisal skill"},
{"ARMOR CLASS (AC)": "ac"},
{"AXE SKILL": "axe skill"},
{"BACKSTABBING": "backstabs"},
{"BLOCKING SKILL": "blocking skill"},
{"BLOCKING": "blocking"},
{"CASTING MEMORIZED SPELLS": "memorized"},
{"CASTING SKILL": "casting skill"},
{"CHARISMA (CHR)": "chr"},
{"CLASS": "class"},
{"CLASSES LIST": "classes list"},
Expand All @@ -74,33 +74,37 @@
{"DEXTERITY (DEX)": "dex"},
{"EXPERIENCE POINTS (XP)": "xp"},
{"FLANKING STRIKES": "flanking"},
{"GOLD": "gold"},
{"HEALTH POINTS (HP)": "hp"},
{"INTELLIGENCE (INT)": "int"},
{"ITEM DURABILITY": "equipment degradation"},
{"LEADERSHIP SKILL": "leadership skill"},
{"LEGENDARY STRIKES": "legendary strikes"},
{"LEVELING UP": "leveling up"},
{"LORE SKILL": "lore skill"},
{"MACE SKILL": "mace skill"},
{"MAGIC POINTS (MP)": "mp"},
{"MAGIC POWER (PWR)": "pwr"},
{"MAGIC RESIST (RES)": "res"},
{"MAGIC SKILL": "magic skill"},
{"MELEE ATTACKS": "melee"},
{"MISSILE ATTACKS": "missiles"},
{"MYSTICISM SKILL": "mysticism skill"},
{"OFF-HAND CASTING": "offhand casting"},
{"PERCEPTION (PER)": "per"},
{"POLEARM SKILL": "polearm skill"},
{"RACE & ALIGNMENT": "races"},
{"RANGED SKILL": "ranged skill"},
{"REGENERATION (RGN)": "rgn"},
{"SKILLS": "skills"},
{"SNEAKING": "sneaking"},
{"SORCERY SKILL": "sorcery skill"},
{"SPELLBOOK CASTING": "spellbook casting"},
{"STATS & METASTATS": "stats metastats"},
{"STEALTH SKILL": "stealth skill"},
{"STRAFE & BACKPEDAL": "strafing"},
{"STRENGTH (STR)": "str"},
{"SWIMMING SKILL": "swimming skill"},
{"SWORD SKILL": "sword skill"},
{"THAUMATURGY SKILL": "thaumaturgy skill"},
{"THROWN ATTACKS": "thrown"},
{"TINKERING SKILL": "tinkering skill"},
{"TRADING SKILL": "trading skill"},
Expand Down
Loading
Loading