commy2
|
ef83a667c1
|
Merge pull request #3633 from acemod/fixdetonatescriptedexplosive
make FUNC(scriptedExplosive) work in scheduled env, ref #3621
|
2016-03-29 15:48:10 +02:00 |
|
jonpas
|
c24c1b9dc0
|
Fix inverted Stop and Freeze - prone Stop will still be freeze due to BI animation being wrong
|
2016-03-29 15:39:32 +02:00 |
|
commy2
|
4e1b2dd24a
|
just delay setName one frame
|
2016-03-29 15:32:05 +02:00 |
|
commy2
|
1f6f90a5b2
|
fixerrornoname
|
2016-03-29 13:59:07 +02:00 |
|
commy2
|
666a4030b5
|
make FUNC(scriptedExplosive) work in scheduled env, ref #3621
|
2016-03-29 13:21:13 +02:00 |
|
Thomas Kooi
|
4e3b342a7f
|
Merge pull request #3629 from acemod/basicFallingDmg
Filter minor falling damage to non-leg hitpoints
|
2016-03-28 14:11:09 +02:00 |
|
PabstMirror
|
bcde9f8ed6
|
Filter minor falling damage to non-leg hitpoints
|
2016-03-28 01:15:58 -05:00 |
|
Alessandro Foresi
|
e97c7c0f65
|
Translation: IT completed (with BOM)
|
2016-03-27 21:22:15 +02:00 |
|
Alessandro Foresi
|
e5a7578f92
|
Translation: IT completed (no BOM)
|
2016-03-27 21:20:15 +02:00 |
|
PabstMirror
|
e90609d043
|
Fix AB Terrain Extension
|
2016-03-24 12:23:48 -05:00 |
|
PabstMirror
|
86ad2ab415
|
Only warn for weapon compat if AB is on
|
2016-03-24 11:53:55 -05:00 |
|
PabstMirror
|
b0df31783d
|
Merge branch 'master' into compatPboWarnings
|
2016-03-24 11:23:29 -05:00 |
|
Nicolás Badano
|
03f3b1084d
|
Merge pull request #3615 from SzwedzikPL/fixdoubledisplayname
Fix double displayName in medical settings
|
2016-03-22 09:08:06 -03:00 |
|
SzwedzikPL
|
cdcde46a7d
|
Fix double displayName in medical settings
|
2016-03-22 13:05:47 +01:00 |
|
Nicolás Badano
|
b4f6dbbc18
|
Merge pull request #3568 from acemod/settingsNameDescp
Ace_Settings - add name,descption,categories
|
2016-03-21 21:24:22 -03:00 |
|
Nicolás Badano
|
faa2b26cc1
|
Merge pull request #3611 from acemod/fixProtractor
Greatly improve the accuracy of the protractor display
|
2016-03-20 22:29:00 -03:00 |
|
esteldunedain
|
ec2920ed35
|
Improve protractor accuracy. Close #3606
|
2016-03-20 22:24:30 -03:00 |
|
commy2
|
5aeb19312b
|
fix script error in tagging
|
2016-03-20 17:09:03 +01:00 |
|
jonpas
|
a9256b6587
|
Merge branch 'release'
|
2016-03-19 20:39:20 +01:00 |
|
bux578
|
0add236986
|
Merge pull request #3602 from acemod/fixbaer
don't overwrite helicopter sub class self actions
|
2016-03-19 20:10:48 +01:00 |
|
commy2
|
a841839aa6
|
don't overwrite helicopter sub class self actions
|
2016-03-19 19:37:26 +01:00 |
|
commy2
|
c76d1cb368
|
Merge pull request #3596 from SzwedzikPL/remtolower
Remove needless tolower from mortarinit
|
2016-03-18 17:32:28 +01:00 |
|
SzwedzikPL
|
8555f00889
|
remove needless tolower from mortarinit
|
2016-03-18 17:26:37 +01:00 |
|
Thomas Kooi
|
daceaa9dd8
|
Merge branch 'master' into settingsNameDescp
|
2016-03-18 14:48:11 +01:00 |
|
Thomas Kooi
|
e8b26a7a14
|
Merge pull request #3593 from BaerMitUmlaut/release
Fixed fastroping race condition
|
2016-03-18 12:07:43 +01:00 |
|
bux578
|
0fc7525cbd
|
Update CONTRIBUTING.md
|
2016-03-18 09:27:06 +01:00 |
|
PabstMirror
|
0b02bd1a5a
|
Merge pull request #3592 from acemod/fixNametagsRank
Fix nametag error when rank is empty string
|
2016-03-17 20:45:05 -05:00 |
|
BaerMitUmlaut
|
fc06782256
|
Fixed broken ropeDetach
|
2016-03-18 00:16:31 +01:00 |
|
BaerMitUmlaut
|
b25ffdb54f
|
Fixed network race condition
|
2016-03-18 00:15:57 +01:00 |
|
commy2
|
5e52e22e81
|
Merge branch 'release' into fixNametagsRank
|
2016-03-17 20:14:40 +01:00 |
|
PabstMirror
|
218d333738
|
Fix nametag error when rank is empty string
|
2016-03-17 11:56:20 -05:00 |
|
Glowbal
|
485900dce8
|
increment patch version
|
2016-03-16 22:59:28 +01:00 |
|
PabstMirror
|
8ffcc7378f
|
Merge branch 'release'
|
2016-03-16 16:50:04 -05:00 |
|
Thomas Kooi
|
559d111e66
|
Merge pull request #3584 from SzwedzikPL/fixmk6mortarinit
Fix mortar ammo handling init on dedicated
|
2016-03-16 22:48:49 +01:00 |
|
commy2
|
d9437a982a
|
Merge pull request #3585 from acemod/revc65656a0
Revert the "Improve rope glitchyness" commit
|
2016-03-16 22:46:24 +01:00 |
|
commy2
|
0c42bb5345
|
Merge branch 'release' into revc65656a0
|
2016-03-16 22:44:19 +01:00 |
|
commy2
|
1945230af8
|
Merge pull request #3589 from acemod/fncFilterToSelect
Replace usage of filter to select in tagging
|
2016-03-16 22:07:51 +01:00 |
|
jonpas
|
72c9e9da39
|
Replace usage of filter to select in tagging
|
2016-03-16 20:17:23 +01:00 |
|
Nicolás Badano
|
8ff4fb8851
|
Merge branch 'release' into revc65656a0
|
2016-03-14 12:21:11 -03:00 |
|
esteldunedain
|
14183470bc
|
Revert "Improved rope glitchyness"
This reverts commit c65656a016.
|
2016-03-14 12:16:23 -03:00 |
|
SzwedzikPL
|
32846014a1
|
fix ammo handling init on dedicated
|
2016-03-14 14:21:02 +01:00 |
|
PabstMirror
|
1ffd23c193
|
Merge pull request #3581 from acemod/FixTrue
Fix versioning true when compiled
|
2016-03-12 13:47:59 -06:00 |
|
PabstMirror
|
e96c1a7dc6
|
Merge branch 'release'
|
2016-03-12 13:47:57 -06:00 |
|
PabstMirror
|
2ab169eb73
|
Merge branch 'release' into FixTrue
|
2016-03-12 13:46:44 -06:00 |
|
PabstMirror
|
1985e7e20a
|
Fix versioning true when compiled
|
2016-03-12 13:42:52 -06:00 |
|
Thomas Kooi
|
61f1959109
|
Fix morphine increasing viscosity
Morphine should decrease viscosity instead of increase. Closes #3579
|
2016-03-12 18:55:42 +01:00 |
|
commy2
|
7067292a0e
|
Merge pull request #3578 from acemod/fixinteractmenusavegamecherry
reset interaction menu time variables on save game load
|
2016-03-12 17:16:03 +01:00 |
|
commy2
|
fca8b51bb2
|
reset interaction menu time variables on save game load
|
2016-03-12 17:08:08 +01:00 |
|
commy2
|
bf902da3ec
|
Merge pull request #3575 from acemod/cantInteractIfDead
Add alive _unit to the conditions required for interaction
|
2016-03-12 16:19:34 +01:00 |
|
esteldunedain
|
aad79eda85
|
The dead shouldn't interact (it's not TWD)
|
2016-03-12 10:06:45 -03:00 |
|