Commit Graph

2063 Commits

Author SHA1 Message Date
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
Glowbal
c210efcef0 fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle. 2015-04-05 15:51:28 +02:00
Glowbal
c514fde5d3 Not necessary here. Makes it only work once. 2015-04-05 15:13:34 +02:00
Glowbal
bae3826bdf Polished server config export 2015-04-05 14:48:23 +02:00
Felix Wiegand
46dadd2fa6 Merge pull request #307 from KoffeinFlummi/setup-script
Add setup script and CBA includes
2015-04-05 14:36:49 +02:00
Glowbal
b6b880fba0 Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded
Add medical actions while boarded.
2015-04-05 14:36:17 +02:00
Glowbal
92bdae9321 Removed diag_log spam 2015-04-05 13:25:53 +02:00
Glowbal
32625b446b fixed animation being reset even when inside a vehicle 2015-04-05 13:03:09 +02:00
Glowbal
cf1f641424 Moved selfActions to a separate hpp file 2015-04-05 13:02:55 +02:00
Glowbal
f1a3d588ba Changed initialization order of config settings.
ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used.

This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description
2015-04-05 12:38:10 +02:00
Glowbal
279641787d Added checks for enforce usage only in SP with settings enabled 2015-04-05 11:11:54 +02:00
Glowbal
202904f1f9 Using 1 and 0 instead of true and false for config export 2015-04-05 10:32:40 +02:00
jaynus
6288a809f7 actually final terminal decent. woops. 2015-04-04 22:36:09 -07:00
Glowbal
d487092d84 formatting 2015-04-05 02:33:45 +02:00
Glowbal
110635df7b improved formatting 2015-04-05 02:33:11 +02:00
Glowbal
a0af055917 export config should force the settings 2015-04-05 02:22:24 +02:00
Glowbal
7928ca71a5 Server side config export 2015-04-05 02:17:43 +02:00
jaynus
583acf6558 ctrlShow is not operational on ControlGroups in RscOptics. 2015-04-04 17:15:59 -07:00
jaynus
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
jaynus
aee7eb9406 Working save. 2015-04-04 16:55:53 -07:00