Commit Graph

6220 Commits

Author SHA1 Message Date
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
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
Glowbal
b33d377b9d Merge pull request #1940 from acemod/fixRemoveAction
#1939 - Fix Remove Action From Class
2015-08-01 11:54:41 +02:00
PabstMirror
efb1f356db Cleanup stringtable phrasing 2015-08-01 01:30:54 -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
a4d5d9cb27 Possible improvement for handling minor levels of pain in advanced medical 2015-07-30 17:43:52 +02:00
bux578
4f07d1c7ee add categories to feature docs 2015-07-29 19:11:50 +02:00
SilentSpike
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
ViperMaul
cd934770e4 Merge branch 'master' of https://github.com/acemod/ACE3 2015-07-28 15:42:29 -07:00
ViperMaul
7827b86414 Arma3_workshop_addon.jpg 2015-07-28 15:42:09 -07:00
PabstMirror
6f90185f18 #1939 - Fix Remove Action From Class 2015-07-28 17:26:23 -05:00
bux578
53112aa34b update file size 2015-07-28 23:39:35 +02:00
Glowbal
10cd627c80 Merge branch 'release' 2015-07-28 23:18:50 +02:00
ViperMaul
63dd19825b moveInAny seems to work better than moveInDriver. WIP 2015-07-28 13:56:22 -07:00
PabstMirror
bfd3aa71c4 Manual Fix #1931 2015-07-28 15:25:52 -05:00
ViperMaul
626a9cf5f9 Disable headBugFix if unconscious 2015-07-28 13:06:58 -07:00
SilentSpike
54e3804107 Merge branch 'english-strings' into release 2015-07-28 20:55:30 +01:00
SilentSpike
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
PabstMirror
74f8db5be7 Merge pull request #1938 from acemod/explosivesFixStrings
#1931 - Fix Explosives Module Strings
2015-07-28 14:44:39 -05:00
PabstMirror
9b551e3fdf #1931 - Fix Explosives Module Strings 2015-07-28 14:42:23 -05:00
Glowbal
beae5c38bc Updated version number 2015-07-28 20:28:26 +02:00
Glowbal
6289601b4e Merge pull request #1935 from jokoho48/ParachuteFix
change form addBackpack to addBackpackGlobal
2015-07-28 20:11:42 +02:00
Glowbal
7a65af4926 Merge pull request #1928 from acemod/headbugfix
Headbugfix
2015-07-28 20:10:51 +02:00
Glowbal
1db7b0549b Merge pull request #1933 from jokoho48/ParachuteFix
Parachute fix for #1932
2015-07-28 20:08:54 +02:00
Joko
46531b916a change form addBackpack to addBackpackGlobal 2015-07-28 20:08:38 +02:00
Joko
baa1aab257 Fix Spelling 2015-07-28 19:24:34 +02:00
Joko
b2eeaacfc1 Fix Double Config Entry 2015-07-28 18:51:17 +02:00
Joko
55cac4b6d9 posible fix for #1932 2015-07-28 18:36:13 +02:00
ViperMaul
92940ea1a9 Removed improper translations
#1738
2015-07-28 15:17:22 +01:00
ViperMaul
675996d67b Adding HeadBugFix button to the ACE Options dialog (missing file)
#1738
2015-07-28 15:17:20 +01:00
ViperMaul
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01:00
SilentSpike
a31e5795be Merge branch 'remove-spectator' into release 2015-07-27 21:30:24 +01:00
SilentSpike
c73eef28ed Pushing back ace_spectator to feature branch 2015-07-27 21:25:39 +01:00
Glowbal
5ec59045c1 Default disable sitting 2015-07-27 22:00:30 +02:00
Glowbal
7d30bc53ed Removed non chairs 2015-07-27 21:59:38 +02:00
SilentSpike
12dca2e684 Merge branch 'hotfix' 2015-07-27 18:34:51 +01:00
SilentSpike
302e476522 Merge branch 'hotfix' into release 2015-07-27 18:34:06 +01:00
SilentSpike
47d96835c6 Fix arrayIntersect oversight 2015-07-27 18:32:21 +01:00
SilentSpike
6197a63188 Turns out the formatting requires more newlines 2015-07-27 16:13:09 +01:00
SilentSpike
00684ccb64 Merge pull request #1918 from acemod/spect-doc
ace_spectator documentation
2015-07-27 15:57:48 +01:00
SilentSpike
ed06d00a41 Consistent formatting 2015-07-27 14:41:38 +01:00
SilentSpike
307703631b Fix typo
Add hyperlink
scenario designers -> mission makers
Formatting
2015-07-27 14:20:23 +01:00
SilentSpike
4bf80a7ba7 Better phrasing 2015-07-27 13:28:06 +01:00
SilentSpike
ae4eacdab4 Camera attributes details 2015-07-27 13:24:07 +01:00
SilentSpike
7fe6e71023 Vision mode details 2015-07-27 13:17:23 +01:00
SilentSpike
6f16cbb553 Camera mode details 2015-07-27 13:12:52 +01:00
SilentSpike
7c9ffa9f9f Spectator system details 2015-07-27 13:07:11 +01:00