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
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
bux578
9748abdb48
change order of BloodPressure readout, fix #2400
2015-09-12 10:58:29 +02: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
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
70dfbe2ec0
Fix some merging errors
2015-09-10 22:11:09 +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
Glowbal
82d9e70c88
Merge pull request #2385 from jokoho48/BackBlastEnhanced
...
Back blast enhanced
2015-09-09 19:39:32 +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
ProfessorCZ
a28e9d96c7
Czech Translations - Update
2015-09-07 17:40:14 +02:00
gienkov
ad50c1ab4b
medical and repair translation
2015-09-07 16:15:18 +02:00
jokoho48
7f6e7de68c
Add LoD
...
Lower Poly in Shadow LoD
2015-09-07 16:10:55 +02:00
gienkov
c4475ff5be
Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7
2015-09-07 16:06:17 +02:00
gienkov
1edcc320d1
Merge remote-tracking branch 'origin' into pl-translation-7
2015-09-07 16:05:45 +02:00
Glowbal
7b349ab388
Merge pull request #2361 from acemod/medical-adjustments2
...
Medical adjustments2
2015-09-07 15:51:27 +02:00
nsgundy
eee5664ec5
Move MicroDAGR 3D model from BFT branch to microdagr module
2015-09-07 11:05:18 +02:00
ViperMaul
2fc35338d5
Build number for Release Candidate
2015-09-06 21:37:20 -07:00
jokoho48
45eb8c4822
Add Code for CBA update 2.1
2015-09-06 19:34:46 +02:00
commy2
adb1a11211
increase leg and arm armor value, more TRACE debug
2015-09-06 11:49:08 +02:00
[OMCB]kaban
78084f271a
Changed "Effect Zeus RC" to "Affects Zeus RC"
2015-09-06 07:11:27 +03:00
ViperMaul
98202f4f38
Additional debug statements for caching and wounds.
2015-09-05 15:31:14 -07:00
Glowbal
a745b07cb6
Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay
...
Used new setting init delay function in addSpareParts
2015-09-05 21:18:25 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
jonpas
a8412361bd
Use setting init delay function for addSpareParts
2015-09-05 19:33:25 +02:00
TheMagnetar
27a0e8f639
Repair: Fix possible out of bounds setting
...
Setting "engineerSetting_fullRepair" had an out of bounds default value.
2015-09-05 16:30:00 +02:00
Glowbal
315f46c6c6
Merge branch 'master' into medical-adjustments2
2015-09-05 14:41:25 +02:00
Glowbal
0a6b77b902
Removed more deprecated wound sync code
2015-09-05 14:10:28 +02:00
Glowbal
e4c246984f
Removed another debug trace that should not be there
2015-09-05 14:10:04 +02:00
Glowbal
d9af19df28
properly fixes unconscious weird behavior. Because it never registered any unconscious conditions.
2015-09-05 14:08:46 +02:00
Glowbal
41db78b52b
Merge pull request #2341 from acemod/323tracers
...
better scaling for tracer sizes, fix #1008
2015-09-05 13:47:37 +02:00
commy2
46d741281b
Merge pull request #2358 from acemod/322flashbangexplosive
...
sort flashbang under explosive grenades, not misc grenades
2015-09-05 13:40:24 +02:00
Glowbal
a4b4c5d2a3
Merge pull request #2187 from jonpas/trackToTrackedVehicles
...
Added Spare Parts module handling
2015-09-05 13:36:42 +02:00
Glowbal
dad96822be
Only add 1/4 of the new damage to pain instead of everything.
2015-09-05 13:27:02 +02:00
Glowbal
6405ef7d91
Merge branch 'master' into medical-adjustments2
2015-09-05 13:22:44 +02:00
Glowbal
f15a1c033d
Added allowSelfTreatment attribute to treatment actions
2015-09-05 13:20:19 +02:00
Glowbal
f0a074072f
Merge pull request #2329 from acemod/323medicalstrcturaldamage
...
setStructuralDamage function
2015-09-05 13:16:13 +02:00
Glowbal
446f367f8b
Merge pull request #2359 from acemod/fixRestoreGear
...
fix restore gear
2015-09-05 13:09:21 +02:00
Glowbal
9c7f7429d1
Merge pull request #2350 from jonpas/cargoHideActionOnLocked
...
Prevent Cargo opening if vehicle is locked
2015-09-05 13:09:14 +02:00
Glowbal
a4e406658f
Reduced initial knockdown time for basic medical
2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c
replaced diag_logs by trace
2015-09-05 12:59:09 +02:00
