Commit Graph

6564 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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