Commit Graph

6232 Commits

Author SHA1 Message Date
fa49842c53 #1866 - Restore weapon mode after treatment 2015-08-03 19:57:49 -05:00
d1d9f521fe Merge pull request #1997 from acemod/someCSTRINGS
Switch to some already translated CSTRINGs
2015-08-03 16:27:00 -05:00
3aa60c70fc Merge pull request #1998 from alganthe/doc_typos
doc pass 9 typos fixed
2015-08-03 16:26:35 -05:00
9e91c1e042 doc pass 9 typos fixed
- Did some formatting.
- Fixed some typos
2015-08-03 23:03:22 +02:00
52130d5a45 Switch to some already translated CSTRINGs 2015-08-03 15:52:35 -05:00
98649e2bdf Additional output to dumpPerformanceCounters
For `[] call ace_common_fnc_dumpPerformanceCounters`   Requires `#define
ENABLE_PERFORMANCE_COUNTERS`
2015-08-03 13:53:44 -05:00
e7bf06fea2 Merge pull request #1944 from alganthe/documentation_pass_10
Documentation pass 10
2015-08-03 13:01:58 -05:00
aeb649624c Merge pull request #1850 from alganthe/documentation_pass_9
Documentation pass 9
2015-08-03 12:25:01 -05:00
b8829fd873 documentation pass 9 2015-08-02 22:55:48 +02:00
261cd42202 Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge 2015-08-02 17:14:41 +02:00
8f848947ac Merge https://github.com/Clon1998/ACE3 into german-merge 2015-08-02 17:11:06 +02:00
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
b33d377b9d Merge pull request #1940 from acemod/fixRemoveAction
#1939 - Fix Remove Action From Class
2015-08-01 11:54:41 +02:00
efb1f356db Cleanup stringtable phrasing 2015-08-01 01:30:54 -05:00
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
d4829626e0 Update event document table 2015-07-31 17:23:11 +01:00
a4d5d9cb27 Possible improvement for handling minor levels of pain in advanced medical 2015-07-30 17:43:52 +02:00
e92bfb3bc4 documentation pass 10 typos 3 2015-07-30 10:27:26 +02:00
ca4eb20f8f documentation pass 10 typos 2 2015-07-29 20:44:33 +02:00
a7e915c8a4 Documentation pass 10 typos 2015-07-29 20:42:11 +02:00
ef3f0b43ec Documentation pass 10
Updated the documentation for ACE 3.2.0
2015-07-29 20:14:33 +02:00
4f07d1c7ee add categories to feature docs 2015-07-29 19:11:50 +02:00
67e5e31394 Change zeus modules to run globally
Zeus modules were only running on the *server* rather than the local machine. This resulted in the variable used to cache the object zeus has its cursor over not existing and therefore the modules didn't work at all.
2015-07-29 12:25:04 +01:00
cd934770e4 Merge branch 'master' of https://github.com/acemod/ACE3 2015-07-28 15:42:29 -07:00
7827b86414 Arma3_workshop_addon.jpg 2015-07-28 15:42:09 -07:00
6f90185f18 #1939 - Fix Remove Action From Class 2015-07-28 17:26:23 -05:00
53112aa34b update file size 2015-07-28 23:39:35 +02:00
10cd627c80 Merge branch 'release' 2015-07-28 23:18:50 +02:00
63dd19825b moveInAny seems to work better than moveInDriver. WIP v3.2.0 2015-07-28 13:56:22 -07:00
bfd3aa71c4 Manual Fix #1931 2015-07-28 15:25:52 -05:00
626a9cf5f9 Disable headBugFix if unconscious 2015-07-28 13:06:58 -07:00
54e3804107 Merge branch 'english-strings' into release 2015-07-28 20:55:30 +01:00
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
74f8db5be7 Merge pull request #1938 from acemod/explosivesFixStrings
#1931 - Fix Explosives Module Strings
2015-07-28 14:44:39 -05:00
9b551e3fdf #1931 - Fix Explosives Module Strings 2015-07-28 14:42:23 -05:00
beae5c38bc Updated version number 2015-07-28 20:28:26 +02:00
6289601b4e Merge pull request #1935 from jokoho48/ParachuteFix
change form addBackpack to addBackpackGlobal
2015-07-28 20:11:42 +02:00
7a65af4926 Merge pull request #1928 from acemod/headbugfix
Headbugfix
2015-07-28 20:10:51 +02:00
1db7b0549b Merge pull request #1933 from jokoho48/ParachuteFix
Parachute fix for #1932
2015-07-28 20:08:54 +02:00
46531b916a change form addBackpack to addBackpackGlobal 2015-07-28 20:08:38 +02:00
baa1aab257 Fix Spelling 2015-07-28 19:24:34 +02:00
b2eeaacfc1 Fix Double Config Entry 2015-07-28 18:51:17 +02:00
55cac4b6d9 posible fix for #1932 2015-07-28 18:36:13 +02:00
92940ea1a9 Removed improper translations
#1738
2015-07-28 15:17:22 +01:00
675996d67b Adding HeadBugFix button to the ACE Options dialog (missing file)
#1738
2015-07-28 15:17:20 +01:00
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01:00
a31e5795be Merge branch 'remove-spectator' into release 2015-07-27 21:30:24 +01:00
c73eef28ed Pushing back ace_spectator to feature branch 2015-07-27 21:25:39 +01:00
5ec59045c1 Default disable sitting 2015-07-27 22:00:30 +02:00
7d30bc53ed Removed non chairs 2015-07-27 21:59:38 +02:00