Glowbal
4b6082d836
Merge pull request #2424 from acemod/medical-tweaks
...
Medical tweaks
2015-09-14 23:20:50 +02:00
Glowbal
7b7ad6eea8
fixed tweak to basic bandage
2015-09-14 23:18:20 +02:00
PabstMirror
f7bd557a30
Fix some stringtable weirdness
2015-09-14 16:11:43 -05:00
PabstMirror
cbc86a1280
Merge pull request #2408 from acemod/FixRTPinMDAGR
...
Posible fix for #2407
2015-09-14 16:01:55 -05:00
Glowbal
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
Glowbal
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
Glowbal
8c60e76979
Tweaks made to improve determine if fatal algorithm
2015-09-14 21:13:58 +02:00
Glowbal
37639066c2
Include missing frame in the caching execution
2015-09-14 15:19:58 +02:00
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
alganthe
024f95968c
line about debug to added
2015-09-12 19:13:56 +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
alganthe
c947cb09f1
Typo fixed in CONTRIBUTING.md
2015-09-12 16:06:28 +02: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
alganthe
165ed90db6
CONTRIBUTING.md updated
2015-09-12 14:36:26 +02: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
alganthe
cc59ac625b
links updated for the guides and how to
...
- Added the installation guide
- Getting started (deprecated) replaced by the information center page
2015-09-12 03:36:09 +02:00
alganthe
11738a964d
contributing.md added
2015-09-12 02:55:48 +02:00
BaerMitUmlaut
8ee1136758
Rewrite canPassMagazine condition
2015-09-11 23:52:00 +02:00
gienkov
ef36b27fe2
medical pl translation
2015-09-11 23:49:41 +02:00
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
