a124b05672
Revert "disable a10 tracers, commanche tracers only nvg"
2015-09-15 21:25:01 +02:00
c6c51af548
Updated build version
2015-09-15 21:13:36 +02:00
7e5ab07e32
Merge pull request #2387 from acemod/FixHCPPE
...
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
b2b221db20
Merge pull request #2441 from SzwedzikPL/air_no_tracers
...
disable a10 tracers, commanche tracers only nvg
2015-09-15 21:02:40 +02:00
88f89b8d76
also check allDeadMen
2015-09-15 13:30:04 -05:00
a8688609d7
Typo
2015-09-15 13:10:06 -05:00
3cc2ccf025
Merge pull request #2438 from acemod/wheelRepairSettingToolkit
...
Add Setting for toolkit requirement for wheel repair
2015-09-15 20:04:38 +02:00
0e32c28552
#2437 - Warn users when mods break XEH
2015-09-15 12:55:08 -05:00
db37fa0e04
Update stringtable.xml
2015-09-15 11:45:02 -05:00
c50c53e5bb
remove debug
2015-09-15 09:57:53 -05:00
9cd470b849
Add Setting for toolkit requirement for wheel repair
2015-09-15 09:54:55 -05:00
2c7a2b4140
Merge pull request #2406 from acemod/captiveOnRespawn
...
Reset captive status on respawn for reliability
2015-09-15 16:37:01 +02:00
6588237e8c
stringtable DAGR
2015-09-15 15:05:30 +02:00
5a76fec895
Merge pull request #2412 from gienkov/DAGRstringtable
...
stringtable DAGR
2015-09-15 15:05:15 +02:00
17fdce7196
Cleanup preInit
2015-09-15 08:03:56 -05:00
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
d6d64b58b0
Merge pull request #2430 from acemod/microDagr-customDrawEvents
...
microDagr - Add ability to access draw event for minimap
2015-09-14 23:36:07 -05:00
f419762653
Fix time of flight display
2015-09-14 23:33:32 -05:00
61cbe543ee
Fix #2432 - Don't check for null attached when mounted
2015-09-14 18:06:46 -05:00
e029e8318f
microDagr - Add ability to access draw event for minimap
2015-09-14 16:37:39 -05:00
16b7bb389c
Merge pull request #2428 from acemod/FixMainMenuInfo151
...
Fix main menu info151
2015-09-14 23:30:00 +02:00
d52cc917ea
Merge pull request #2419 from acemod/FixBBTexturePath2
...
Fix Bandage Texture Path and UV
2015-09-14 23:26:00 +02:00
4b6082d836
Merge pull request #2424 from acemod/medical-tweaks
...
Medical tweaks
2015-09-14 23:20:50 +02:00
7b7ad6eea8
fixed tweak to basic bandage
2015-09-14 23:18:20 +02:00
f7bd557a30
Fix some stringtable weirdness
2015-09-14 16:11:43 -05:00
cbc86a1280
Merge pull request #2408 from acemod/FixRTPinMDAGR
...
Posible fix for #2407
2015-09-14 16:01:55 -05:00
10ac127159
Fixed incorrect new damage value in handleDamage advanced.
...
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
2015-09-14 21:15:57 +02:00
33ac78dbac
Addresses the large amount of bandages required in basic medical
...
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
2015-09-14 21:14:56 +02:00
8c60e76979
Tweaks made to improve determine if fatal algorithm
2015-09-14 21:13:58 +02:00
37639066c2
Include missing frame in the caching execution
2015-09-14 15:19:58 +02:00
6d4744b9ea
Increased duration of knock down for basic medical
2015-09-14 15:19:18 +02:00
032dd6c87c
Tweaked visual effects.
2015-09-14 15:18:56 +02:00
fb75f6ad9e
Fix Bandage Texture Path and UV
2015-09-13 18:57:07 +02:00
530dfa041d
stringtable DAGR
2015-09-12 21:25:02 +02:00
b2b41ce8af
Merge branch 'release' of https://github.com/acemod/ACE3 into release
2015-09-12 18:13:12 +02:00
5feee53c69
Posible fix for #2407
2015-09-12 18:12:57 +02:00
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
33a7340c8c
Merge branch 'spectatorRespawnTemplate' into release
2015-09-12 14:04:17 +01:00
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
e59a4163f7
Merge pull request #2404 from acemod/330bloodPressureReadoutFix
...
change order of BloodPressure readout, fix #2400
2015-09-12 11:01:23 +02:00
9748abdb48
change order of BloodPressure readout, fix #2400
2015-09-12 10:58:29 +02:00
ef36b27fe2
medical pl translation
2015-09-11 23:49:41 +02:00
ab02bed1c1
fixed duplicate stringtable entries
2015-09-11 23:42:03 +02:00
d3b6dd4b45
Merge pull request #2393 from jonpas/removeRedundantSittingBoundaries
...
Remove redundant rotation boundaries in Sitting
2015-09-11 17:09:48 +01:00
6fb22ebd11
Added isNull check to PFH for explicity
2015-09-11 17:55:28 +02:00
efa8252b45
Remove debug
2015-09-11 17:43:29 +02:00
2d3a02085e
Improved comment
2015-09-11 17:27:08 +02:00
d49798144c
Replaced hasChairMoved with isEqualTo, fixed missing variable
2015-09-11 17:25:46 +02:00
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
c5f9f85d27
Updated comment
2015-09-11 16:53:09 +02:00
