Glowbal
6d4744b9ea
Increased duration of knock down for basic medical
2015-09-14 15:19:18 +02:00
Glowbal
032dd6c87c
Tweaked visual effects.
2015-09-14 15:18:56 +02:00
jokoho48
fb75f6ad9e
Fix Bandage Texture Path and UV
2015-09-13 18:57:07 +02:00
gienkov
530dfa041d
stringtable DAGR
2015-09-12 21:25:02 +02:00
jokoho48
b2b41ce8af
Merge branch 'release' of https://github.com/acemod/ACE3 into release
2015-09-12 18:13:12 +02:00
jokoho48
5feee53c69
Posible fix for #2407
2015-09-12 18:12:57 +02:00
SilentSpike
7c846502b5
Reset captive status on respawn for reliability
...
Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player.
To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.
2015-09-12 15:42:20 +01:00
SilentSpike
33a7340c8c
Merge branch 'spectatorRespawnTemplate' into release
2015-09-12 14:04:17 +01:00
SilentSpike
e6c2916a14
Fix spectator template for negligible respawnDelay
...
When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small.
2015-09-12 14:02:42 +01:00
Glowbal
e59a4163f7
Merge pull request #2404 from acemod/330bloodPressureReadoutFix
...
change order of BloodPressure readout, fix #2400
2015-09-12 11:01:23 +02:00
bux578
9748abdb48
change order of BloodPressure readout, fix #2400
2015-09-12 10:58:29 +02:00
SilentSpike
d3b6dd4b45
Merge pull request #2393 from jonpas/removeRedundantSittingBoundaries
...
Remove redundant rotation boundaries in Sitting
2015-09-11 17:09:48 +01:00
jonpas
6fb22ebd11
Added isNull check to PFH for explicity
2015-09-11 17:55:28 +02:00
jonpas
efa8252b45
Remove debug
2015-09-11 17:43:29 +02:00
jonpas
2d3a02085e
Improved comment
2015-09-11 17:27:08 +02:00
jonpas
d49798144c
Replaced hasChairMoved with isEqualTo, fixed missing variable
2015-09-11 17:25:46 +02:00
jokoho48
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
jonpas
c5f9f85d27
Updated comment
2015-09-11 16:53:09 +02:00
jonpas
0b9c6254e4
Removed redundant rotation control - changed to config
2015-09-11 16:46:51 +02:00
SilentSpike
edfb635631
Merge branch 'orbitalSpectator'
2015-09-11 14:48:50 +01:00
SilentSpike
bda41f2cd1
Merge branch 'orbitalSpectator' into release
2015-09-11 14:46:50 +01:00
SilentSpike
aa7b6cf39f
Improve angular behaviour of spectator camera
...
Changes the position calculation of the external spectator camera to correctly retain the pan and tilt of the free camera. Makes transitioning between the two less disorienting for the user.
2015-09-11 14:46:21 +01:00
SilentSpike
77c2b99ee5
Change spectator external camera behaviour
...
Using the "external" view is limited by the server difficulty setting. Instead the spectator external camera has been replaced with an oribtal camera as was originally planned to be added alongside the default views.
2015-09-11 14:46:21 +01:00
SilentSpike
af1634ca45
Merge branch 'healHitpointsString'
2015-09-11 12:35:06 +01:00
SilentSpike
17f9eab03a
Improve display name of medical heal hitpoints setting
...
ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing
2015-09-11 12:33:18 +01:00
Glowbal
f60954a49b
increased build number (3.3.0.1)
2015-09-10 22:18:13 +02:00
KoffeinFlummi
b96718dfa1
Merge branch 'release'
2015-09-10 22:11:36 +02:00
KoffeinFlummi
70dfbe2ec0
Fix some merging errors
2015-09-10 22:11:09 +02:00
KoffeinFlummi
7c011b6138
Merge branch 'release'
2015-09-10 22:01:27 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
jokoho48
cc9cdae972
Merge branch 'release' of https://github.com/acemod/ACE3 into FixHCPPE
2015-09-09 20:25:48 +02:00
Glowbal
82d9e70c88
Merge pull request #2385 from jokoho48/BackBlastEnhanced
...
Back blast enhanced
2015-09-09 19:39:32 +02:00
bux578
abd22644e1
Merge pull request #2384 from jonpas/slackToForeignReadmes
...
Added Slackin to DE and PL readmes
2015-09-09 18:59:54 +02:00
jonpas
6f3ed6488e
Added Slackin to DE and PL readmes
2015-09-09 18:56:02 +02:00
bux578
4639c5c4f9
Merge pull request #2377 from acemod/removeDocumentation
...
remove documentation from master
2015-09-09 18:48:26 +02:00
jokoho48
defbdf1b1a
fix that HC throw a issue if PPEffect was used/applyed
2015-09-09 17:05:48 +02:00
Michael Braun
a5fb09a7e1
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
jokoho48
1ed52e08bf
fix missing default
2015-09-08 19:45:46 +02:00
Glowbal
6a31140f7d
Version 3.3.0
2015-09-08 19:38:52 +02:00
Glowbal
d6b51b2138
Merge pull request #2374 from acemod/microDagr
...
Move MicroDAGR 3D model from BFT branch to microdagr module reopen #2373
2015-09-08 19:31:02 +02:00
Glowbal
0c371ddf37
disabled debug for medical
2015-09-08 19:06:01 +02:00
bux578
6da19a43df
remove documentation from master
2015-09-07 19:50:38 +02:00
bux578
74cb948323
Merge pull request #2177 from alganthe/documentation_pass_11
...
documentation pass 11
2015-09-07 18:49:24 +02:00
alganthe
b3da51c1c5
information center typo fix 2
...
THE FINAL COUNTDOOOOWN TADADA DAA DDADADA DA DA
2015-09-07 18:28:08 +02:00
ProfessorCZ
a28e9d96c7
Czech Translations - Update
2015-09-07 17:40:14 +02:00
alganthe
46b4c43911
reloadlauncher typo fix and sitting framework removed
2015-09-07 16:59:29 +02:00
