PabstMirror
c0fb2e1b65
Add Ear Ringing setting to module (Ref #1981 )
2015-08-02 12:15:26 -05:00
SilentSpike
9b764bbba4
Preserve Polish translations from master branch
...
Since spectator was pushed back to a feature branch from the release branch these translations from a PR were also lost (as the commits were prior to the removal commit) when it was merged after the fact.
2015-08-02 17:27:32 +01:00
SilentSpike
52460182c9
Enable spectator on death system
...
New spectator on death system should enter spectator mode upon dying and exit upon respawning. Only virtual spectator state is suitable for this system since the body should remain as is.
2015-08-02 16:42:24 +01:00
KoffeinFlummi
261cd42202
Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge
2015-08-02 17:14:41 +02:00
KoffeinFlummi
8f848947ac
Merge https://github.com/Clon1998/ACE3 into german-merge
2015-08-02 17:11:06 +02:00
Glowbal
4dfef8025b
Medical menu port from CSE
2015-08-02 16:56:27 +02:00
SilentSpike
63c034e348
Differentiate between staged and set spectators
...
Existing variable "ace_spectator_isSpectator" split into counterparts "ace_spectator_isSet" and "ace_spectator_isStaged" in order to better manage spectator events
2015-08-02 12:51:42 +01:00
SilentSpike
38e08d513a
Clear spectator display variable at preInit
...
uiNamespace persists between missions and should be reset on mission start
2015-08-02 12:34:35 +01:00
PabstMirror
eb5ac22b8d
Cleanup
2015-08-02 01:05:28 -05:00
Michael Braun
bd79a7b8f5
Updated AUTHOR file
2015-08-02 03:30:19 +02:00
Michael Braun
f3e8a8ae42
Updated wind indicator to use head direction instead of player direction. Fixes #1892 .
2015-08-02 03:29:53 +02:00
ViperMaul
876a039e36
Disable headbugfix for Handcuffed/Surrender,unconscious,water surface and log the situation locally and on server.
2015-08-01 18:01:35 -07:00
PabstMirror
5bcc867bac
#1785 - Handle option for all "deploy" actions
2015-08-01 18:26:38 -05:00
PabstMirror
c5a371e9b6
#1965 - Mouse cooldown for click to interact option
2015-08-01 15:07:09 -05:00
jokoho48
d0d585d0f5
Fix that Parachute can get in Arsenal or in Crate
2015-08-01 20:47:40 +02:00
SilentSpike
612aa2d679
Separate spectator physical and virtual states
...
With the changes planned to allow spectator in the true death state, physical changes aren't applicable in all of the possible usage cases. This separates the physical process into new function ace_spectator_fnc_stageSpectator
2015-08-01 18:10:11 +01:00
Glowbal
19a4f3fbb1
Merge pull request #1954 from acemod/improve-adv-med-pain
...
Improvement for handling minor levels of pain in advanced medical
2015-08-01 19:05:47 +02:00
jokoho48
ee11622cd5
Fix Position
2015-08-01 16:10:08 +02:00
jokoho48
9d8daf84a4
add New Medical Models
2015-08-01 15:46:25 +02:00
Harakhti
861119f22f
Sync rephrasing with upstream
...
The humor wilts quickly.
2015-08-01 14:54:29 +02:00
SilentSpike
07845d5a89
Merge branch 'fixmodules' into release
2015-08-01 12:55:43 +01:00
SilentSpike
f6d8625fcb
Transfer zeus module fixes from master into hotfix
2015-08-01 12:55:33 +01:00
Glowbal
02cfbeda8c
Updated version to 3.2.1
2015-08-01 12:10:42 +02:00
Glowbal
b33d377b9d
Merge pull request #1940 from acemod/fixRemoveAction
...
#1939 - Fix Remove Action From Class
2015-08-01 11:54:41 +02:00
PabstMirror
6ea1b95179
#1939 - Fix Remove Action From Class
2015-08-01 11:53:49 +02:00
Glowbal
45191d0d1e
Merge pull request #1970 from acemod/PointingInstOfFinger
...
PointingInsteadOfFinger
2015-08-01 11:51:24 +02:00
bux578
1ad1a4b561
rename fingering to pointing
2015-08-01 11:49:28 +02:00
PabstMirror
fb34efdd04
Cleanup stringtable phrasing
2015-08-01 11:48:41 +02:00
Glowbal
a2eeff53a8
Merge pull request #1960 from acemod/laserHandleWeirdData
...
Laser - Handle Bad Data Returns
2015-08-01 11:41:04 +02:00
Glowbal
1878d448ae
Merge pull request #1968 from acemod/fixBftModule321
...
Fix BFT Module / Settings (for 3.2.1)
2015-08-01 11:39:01 +02:00
Glowbal
d86bf458fc
Merge pull request #1967 from acemod/fixWindDeflection-AB
...
Fix Changes in Wind Deflection s in AB
2015-08-01 11:38:07 +02:00
PabstMirror
efb1f356db
Cleanup stringtable phrasing
2015-08-01 01:30:54 -05:00
PabstMirror
2d051188a7
#1957 - Fix BFT Module / Settings (for 3.2.1)
2015-08-01 00:01:33 -05:00
PabstMirror
1d82a3c193
#1962 - Fix Changes in Wind Deflection s in AB
2015-07-31 23:39:05 -05:00
SilentSpike
777d8f6d43
Merge branch 'master' into spectator
...
Restores spectator that was removed from release branch
2015-07-31 23:35:45 +01:00
SilentSpike
33314f8a9e
Adjust spectator camera boom speed
...
Vertical camera movement (boom) was previously at a constant speed. However this felt too slow at times, half the horizontal (dolly) speed should improve this.
2015-07-31 23:32:25 +01:00
SilentSpike
e147138274
Update setUnconscious module with to be indefinite
...
The zeus toggle unconscious module was using the default value for minimum unconscious time when it should have been indefinite (to act as a toggle)
2015-07-31 17:32:13 +01:00
SilentSpike
d4829626e0
Update event document table
2015-07-31 17:23:11 +01:00
Glowbal
b449e4cab8
Merge pull request #1955 from acemod/fix-return-damage
...
Fix incorrect damage value return when prevent death is enabled
2015-07-31 11:20:51 +02:00
PabstMirror
822115214f
Laser - Handle Bad Data Returns
2015-07-31 03:06:27 -05:00
SzwedzikPL
eb6abd69b8
default laser code down keybind fix
2015-07-30 22:37:08 +02:00
Glowbal
ca2a16af02
fix #1946
2015-07-30 18:21:24 +02:00
Glowbal
a4d5d9cb27
Possible improvement for handling minor levels of pain in advanced medical
2015-07-30 17:43:52 +02:00
Harakhti
b2aa5eee45
Row 3
...
BINGO FUEL
2015-07-30 16:28:50 +02:00
Harakhti
2b23958fd1
Row 2
...
It gets tedious after a while, especially if your language lacks
technical terms. That or my B2 language exam isn't good enough.
2015-07-30 16:06:32 +02:00
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
Josuan Albin
e92bfb3bc4
documentation pass 10 typos 3
2015-07-30 10:27:26 +02:00
Josuan Albin
ca4eb20f8f
documentation pass 10 typos 2
2015-07-29 20:44:33 +02:00
Josuan Albin
a7e915c8a4
Documentation pass 10 typos
2015-07-29 20:42:11 +02:00
Josuan Albin
ef3f0b43ec
Documentation pass 10
...
Updated the documentation for ACE 3.2.0
2015-07-29 20:14:33 +02:00