Commit Graph

2082 Commits

Author SHA1 Message Date
Glowbal
4c6dad69f9 Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error) 2015-04-06 19:43:27 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
jaynus
bdcec243a8 Changed: Comanche Gatling HEDP effects and dispersion. 2015-04-06 09:14:56 -07:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
jaynus
c3dbcf1351 increase frequency of laser update. 2015-04-06 07:40:20 -07:00
commy2
796a430292 Merge pull request #326 from KoffeinFlummi/VectorFOSfix
Fix for Vector Fall-of-Shot display
2015-04-06 16:20:13 +02:00
commy2
1e497c228c switch sides of add/drop left/right 2015-04-06 16:18:59 +02:00
Glowbal
1c28e82725 Merge pull request #341 from KoffeinFlummi/medicalFixes
Fixes for bodybag and support for radio mods in medical
2015-04-06 16:17:08 +02:00
commy2
ebd1e555a3 fix: derp when switching control numbers 2015-04-06 16:07:52 +02:00
Glowbal
76ad6b8294 Added missing main actions 2015-04-06 15:46:50 +02:00
Glowbal
ce4cdd3722 staged bodybag fixes 2015-04-06 15:11:54 +02:00
Glowbal
661d93e82c Working commit 2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55 Fixed treatment locations 2015-04-06 14:32:37 +02:00
Glowbal
43b3190202 config fix 2015-04-06 14:14:00 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
2657677bd8 Added support for TFR/ACRE on unconscious 2015-04-06 14:09:59 +02:00
esteldunedain
be81e16c71 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-06 09:07:20 -03:00
esteldunedain
4cf2410622 Fix duplicated laser designator actions 2015-04-06 09:06:56 -03:00
Glowbal
0bcb7f76dc This should not be here 2015-04-06 13:12:40 +02:00
Glowbal
83c670576b fixed typeOf instead of typeName 2015-04-06 11:58:52 +02:00
Glowbal
befb52e855 Merge pull request #260 from KoffeinFlummi/serverConfig
Server Config support
2015-04-06 01:42:33 +02:00
jaynus
e93e02c3ff Revert "Beginning of ACE test mission; please add your feature tests, items and equipment to this mission."
This reverts commit 8422ead980.
2015-04-05 16:14:33 -07:00
jaynus
8422ead980 Beginning of ACE test mission; please add your feature tests, items and equipment to this mission. 2015-04-05 16:12:34 -07:00
jaynus
c87f2f8bcc Added: Generic placeholder medical box. 2015-04-05 15:16:32 -07:00
jaynus
8fa6ab38fd Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig 2015-04-05 14:08:54 -07:00
jaynus
d6632a0e45 Module should default to true. 2015-04-05 14:08:42 -07:00
jaynus
e02c6305dc Merge pull request #296 from KoffeinFlummi/cmakefiles
Cmake framework for cross-platform extensions and building.
2015-04-05 13:27:33 -07:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
2015-04-05 13:26:54 -07:00
VKing
8255ff666d Fix long-standing typo (get it?) 2015-04-05 22:18:28 +02:00
Glowbal
52fa8df1fa Merge pull request #318 from KoffeinFlummi/medicalImprovements
Medical improvements and fixes round 2
2015-04-05 22:17:00 +02:00
VKing
8ad202b039 Fix Fall-of-Shot units being inverted 2015-04-05 22:16:47 +02:00
Glowbal
9e3bb8ac95 fixed triage card 2015-04-05 22:07:38 +02:00
jaynus
7d5fca3c5a DIR guidance on Javelin missiles/Titan. TODO: The guidance codes need re-works. 2015-04-05 12:55:17 -07:00
Glowbal
12d10b8bf7 Blood loss for basic (from AGM medical) 2015-04-05 21:38:15 +02:00
jaynus
788487baa5 Debug disable 2015-04-05 11:54:00 -07:00
jaynus
34b834e700 Rudimentary hold-tab lock on titan, sounds added, jink removed, state tracking. 2015-04-05 11:51:39 -07:00
Glowbal
147bb92541 Added setting to disable variable sync (recommended on) 2015-04-05 20:23:07 +02:00
Glowbal
7ffd690a71 Changed: IVs are now synced and medics can see a unit is receiving an IV 2015-04-05 20:11:54 +02:00
jaynus
278ffe7d65 save 2015-04-05 10:45:09 -07:00
Glowbal
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00
ViperMaul
26fb06f774 Now using the Arma3 tools path taking from the registry for CfgConvert 2015-04-05 10:40:37 -07:00
Glowbal
ae2adc17b9 changed all medical items to inherit from ACE_ItemCore 2015-04-05 19:37:07 +02:00
Glowbal
2c0bec2b07 disabled injury visualization for bandaged wounds 2015-04-05 19:36:40 +02:00
Glowbal
171ebf827a No litter created when in vehicle 2015-04-05 19:28:57 +02:00
Glowbal
a0bbbdb0b7 fixed place in bodybag 2015-04-05 19:27:53 +02:00
Glowbal
f52891436a oops 2015-04-05 19:27:40 +02:00
Glowbal
ecf84ae039 Updated module classname to be inline with others 2015-04-05 19:27:28 +02:00
Glowbal
0f52059249 Fixed CPR script error 2015-04-05 19:27:09 +02:00
Glowbal
dca75c5557 Implemented bandaged wounds setting (adv) 2015-04-05 19:26:33 +02:00
Glowbal
e3e17d8fcb Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-05 15:51:42 +02:00