gienkov
ab02bed1c1
fixed duplicate stringtable entries
2015-09-11 23:42:03 +02:00
jonpas
3de783d3a7
Cleanup for branch release, picked from #2366
2015-09-11 19:57:21 +02:00
BaerMitUmlaut
ccf1bf1de7
Cleaned up canPassMagazine condition
2015-09-11 18:24:46 +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
BaerMitUmlaut
a29902ddb3
More use of params, event system, removed compile
2015-09-11 15:36:23 +02: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
BaerMitUmlaut
45bfa3eaf5
Fixed vanishing mags and localized hint
2015-09-10 22:23:37 +02: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
jonpas
e07b71faf0
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-09 19:13:04 +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
6622afb9cd
Updated location of foreign readmes per #2377
2015-09-09 18:57:34 +02:00
jonpas
daa4a868d2
Merge branch 'master' into make_versionFiles_subFolder_support
2015-09-09 18:56:38 +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
TheMagnetar
2b80285ad7
Removed pedantic errors. Mainly extra ';' in namespace definitions
2015-09-08 21:53:29 +02:00
TheMagnetar
dd76a67783
Added pedantic errors to compiling flags
2015-09-08 21:52:50 +02:00
TheMagnetar
4ad124d1fe
M_PI was redefined in extensions/common/shared.hpp
2015-09-08 21:47:16 +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
BaerMitUmlaut
c26107bc5c
Added ability to pass a magazine
2015-09-08 14:07:16 +02:00
BaerMitUmlaut
da423672cf
Merge branch 'master' of https://github.com/acemod/ACE3
2015-09-08 10:54:05 +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
