Glowbal
1ba4de7520
Merge pull request #1994 from acemod/improveHeadbugfix
...
Improve headbugfix
2015-08-04 21:13:03 +02:00
Glowbal
43f8c87387
Merge pull request #1972 from jokoho48/MedicalModelUpdate
...
Medical Litter model update
2015-08-04 20:06:51 +02:00
ViperMaul
8ac98ed950
Better immersion through using hideUnit
2015-08-04 07:43:42 -07:00
PabstMirror
b3741f4036
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
bux
3281998c44
remove old information center file
2015-08-04 09:11:38 +02:00
bux
ac393ebf2f
rename information center
2015-08-04 09:10:08 +02:00
PabstMirror
710135ae3f
Opps
2015-08-03 21:49:16 -05:00
PabstMirror
fa49842c53
#1866 - Restore weapon mode after treatment
2015-08-03 19:57:49 -05:00
PabstMirror
d1d9f521fe
Merge pull request #1997 from acemod/someCSTRINGS
...
Switch to some already translated CSTRINGs
2015-08-03 16:27:00 -05:00
PabstMirror
3aa60c70fc
Merge pull request #1998 from alganthe/doc_typos
...
doc pass 9 typos fixed
2015-08-03 16:26:35 -05:00
Josuan Albin
9e91c1e042
doc pass 9 typos fixed
...
- Did some formatting.
- Fixed some typos
2015-08-03 23:03:22 +02:00
PabstMirror
52130d5a45
Switch to some already translated CSTRINGs
2015-08-03 15:52:35 -05:00
PabstMirror
98649e2bdf
Additional output to dumpPerformanceCounters
...
For `[] call ace_common_fnc_dumpPerformanceCounters` Requires `#define
ENABLE_PERFORMANCE_COUNTERS`
2015-08-03 13:53:44 -05:00
PabstMirror
e7bf06fea2
Merge pull request #1944 from alganthe/documentation_pass_10
...
Documentation pass 10
2015-08-03 13:01:58 -05:00
PabstMirror
aeb649624c
Merge pull request #1850 from alganthe/documentation_pass_9
...
Documentation pass 9
2015-08-03 12:25:01 -05:00
SilentSpike
5bfa4e5971
Improve spectator camera vision mode on start
...
The spectator camera should start in night vision mode if the sun to moon transition state is appropriate
2015-08-03 15:18:09 +01:00
SilentSpike
17e6aca0c8
Fix ace_map changes to compass display object
...
1. RscDisplayDiary doesn't even have a compass object that needs to be changed
2. The briefing displays (RscDisplayGetReady, RscDisplayClientGetReady, RscDisplayServerGetReady) were all inheriting from base class RscDisplayMainMap and re-defined the compass object subclasses was overriding that subclass inheritance chain (producing missing idc errors in the .rpt).
2015-08-03 13:30:08 +01:00
SilentSpike
f5e7185aec
Fix spectator camera exiting mechanism
...
When using ACE_Player the camera would return to the dead body. It makes sense to simply pass the reset unit by reference to the camera exit code.
2015-08-03 13:04:36 +01:00
SilentSpike
98b088f26f
Fix pre-spectator position saving
...
When staging a spectator (physically applying the spectator state) the unit position is saved for potential later restoration. This shouldn't be done multiple times since the function can be called again to reset staged units.
2015-08-03 00:24:36 +01:00
SilentSpike
b87b4ea16a
Improve spectator GUI reopening prevention
...
Using boolean instead of simply checking for the display. Checking for diplay was unreliable since it can be technically closed while theoretically open during the escape menu and such.
2015-08-03 00:22:50 +01:00
Josuan Albin
b8829fd873
documentation pass 9
2015-08-02 22:55:48 +02:00
PabstMirror
93d2035fed
#1984 - Always make sure ACE_MainActions exists
...
Also add debuging output when adding action with no parent
2015-08-02 15:33:16 -05:00
ViperMaul
59a3e62d69
Attempt to improve the immersion of the magic
2015-08-02 10:44:49 -07:00
PabstMirror
f99e8ba5bc
Don't allow forcing the tinnitus effect
2015-08-02 12:30:35 -05:00
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
