Marc Zinnschlag
|
362798bd90
|
updated changelog
|
7 years ago |
|
Marc Zinnschlag
|
2ea85d0bb6
|
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
|
7 years ago |
Bret Curtis
|
af75c1e909
|
Update before_script.msvc.sh
reverting back to what works
|
7 years ago |
|
Bret Curtis
|
dcb2ab80f5
|
Merge pull request #1788 from Capostrophic/armorcond
Make unarmed creature attacks not affect armor condition (bug #2455)
|
7 years ago |
|
Bret Curtis
|
4d60fe5a76
|
reverting back
|
7 years ago |
Finbar Crago
|
09c9bd34c3
|
cleanup more unnecessary struct keywords...
|
7 years ago |
|
Bret Curtis
|
b8b07b52f0
|
try this...
|
7 years ago |
|
Bret Curtis
|
4177fd04eb
|
Update before_script.msvc.sh
Does it blend?
|
7 years ago |
|
Bret Curtis
|
209359bbc3
|
Try this on for size...
|
7 years ago |
|
Bret Curtis
|
78a3f95ee4
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
2bf0d598cf
|
Update before_script.msvc.sh
Wrap in quites
|
7 years ago |
Capostrophic
|
6e9c08083d
|
Add missing empty attacker checks
|
7 years ago |
|
Capostrophic
|
bccba24c40
|
Make unarmed creature attacks not affect armor condition (fixes #2455)
|
7 years ago |
|
Bret Curtis
|
9b6ea0e89f
|
# because our CI VMs are not public, MRs can't use them and timeout
|
7 years ago |
|
Bret Curtis
|
d3dfe17441
|
try limiting scope
|
7 years ago |
|
Finbar Crago
|
69cd7031e7
|
Merge branch 'master' into fix_quickkey_segfalt
|
7 years ago |
|
Finbar Crago
|
596be205c1
|
cleanup unnecessary struct keywords...
|
7 years ago |
|
Bret Curtis
|
06216aa124
|
Update .gitlab-ci.yml
|
7 years ago |
|
Finbar Crago
|
2722ca50fb
|
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
|
7 years ago |
|
Bret Curtis
|
c474709127
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
ca0f6fff4a
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
dc48a46e50
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
a6d6dd5995
|
updating for the nits
|
7 years ago |
|
Bret Curtis
|
8811c7141a
|
Update before_script.msvc.sh
taking nits into account :)
|
7 years ago |
|
Marc Zinnschlag
|
a45d86bdf3
|
Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2'
|
7 years ago |
|
Marc Zinnschlag
|
f06dd39892
|
Merge remote-tracking branch 'upstream/master'
|
7 years ago |
|
Bret Curtis
|
c2ff30c4d7
|
correcting from GH/AV feedback, testing on GL.
|
7 years ago |
|
Bret Curtis
|
a532aef935
|
Update before_script.msvc.sh
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
|
7 years ago |
|
Bret Curtis
|
4c0e475092
|
Update before_script.msvc.sh
Use powershell trick with boost_temp so there is little chance of collision.
|
7 years ago |
|
Bret Curtis
|
bccd83c656
|
Use 1.67
|
7 years ago |
|
Bret Curtis
|
bc830a9c45
|
use boost_temp
|
7 years ago |
|
Bret Curtis
|
63bbc77ee7
|
try using the powershell trick from AnyOldName3
|
7 years ago |
|
Finbar Crago
|
7ae388086b
|
Merge branch 'master' into fix_quickkey_segfalt
|
7 years ago |
Thunderforge
|
72f6b1a693
|
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
|
7 years ago |
|
Bret Curtis
|
3379eafd33
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
3ceb9116de
|
Give pwd -W a try
|
7 years ago |
|
Finbar Crago
|
ed71656ea6
|
fix updateActivatedQuickKey() crash
keyboard numbers don't start at zero...
|
7 years ago |
|
Bret Curtis
|
c4a4111b2e
|
Update before_script.msvc.sh
|
7 years ago |
|
Bret Curtis
|
fb6ad9faec
|
try %TMP% ?
|
7 years ago |
|
Bret Curtis
|
4ad3d66629
|
try using just ${TMP}
|
7 years ago |
|
Bret Curtis
|
8be52d228e
|
Update before_script.msvc.sh
small fixes
|
7 years ago |
|
Finbar Crago
|
24d5fb09da
|
fix crash on simultaneous key presses
|
7 years ago |
|
Bret Curtis
|
60ec340fa3
|
remove toolset_real, use just toolset, do proper comparison
|
7 years ago |
|
Bret Curtis
|
71314f0c3a
|
Use boost 1.67 instead of 1.61
|
7 years ago |
|
Bret Curtis
|
46575d8de7
|
Update before_script.msvc.sh
1.61 -> 1.67
|
7 years ago |
|
Bret Curtis
|
660193ae1b
|
Update before_script.msvc.sh
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
|
7 years ago |
|
Bret Curtis
|
1c4363eaa6
|
Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd.
|
7 years ago |
|
Bret Curtis
|
7bf502dd02
|
Bash it out!
|
7 years ago |
|
Bret Curtis
|
1061270ac0
|
Try using @TEMP@ instead of hard coding it.
|
7 years ago |
|
Bret Curtis
|
45d77372a0
|
with 260 char path fixed, this should work.
|
7 years ago |