jaynus
99008ac729
Merge pull request #332 from KoffeinFlummi/medicalBox
...
Added: Generic placeholder medical box.
2015-04-06 19:09:16 -07:00
jaynus
a744896b20
Fixed: jaynus fucked up.
2015-04-06 18:51:08 -07:00
jaynus
34444ebb32
Fixed: github merge error fixed.
2015-04-06 18:37:05 -07:00
jaynus
27caff5564
Fixed: Add platform velocity to FCS calculations; resolves #361
2015-04-06 18:36:39 -07:00
Glowbal
12493f8595
Improved wounds configuration (missing maxDamage values added)
2015-04-07 00:57:05 +02:00
Glowbal
c7549a13a4
Improved pain reduction
2015-04-07 00:41:53 +02:00
jaynus
446a30e4fc
Merge pull request #352 from KoffeinFlummi/comancheFixes
...
Goes along with FCS fixes, merging quickly due to overall fixes.
2015-04-06 15:07:09 -07:00
jaynus
4a8f24b59c
Merge pull request #356 from KoffeinFlummi/fcsMadness
...
Fcs madness
2015-04-06 15:00:24 -07:00
jaynus
e0605f9e81
Remove default hint for FCS but play sound, Resolves #317
2015-04-06 14:57:07 -07:00
jaynus
7fa8365d51
Remove debug, new Release build of extension.
2015-04-06 14:50:22 -07:00
esteldunedain
09461d94ef
Rewritten changeProjectileDirection
2015-04-06 18:10:17 -03:00
ulteq
26186e1ea4
Removed model = "";
2015-04-06 23:02:36 +02:00
esteldunedain
aec9962121
Fix changeProjectileDirection
2015-04-06 18:02:08 -03:00
ulteq
19cb19ab27
Finished merging ATragMX
...
*TODO: Replace EGVAR(advanced_ballistics,AdvancedBallistics)
*TODO: Replace EGVAR(advanced_ballistics,AdvancedAirDragEnabled)
2015-04-06 22:56:14 +02:00
esteldunedain
35129a7a41
Debug stuff for the velocity correction
2015-04-06 17:37:18 -03:00
Garth L-H de Wet
513ab25f54
Merge branch 'master' into explosiveInteraction
...
Conflicts:
addons/explosives/functions/fnc_placeExplosive.sqf
2015-04-06 22:30:27 +02:00
Garth L-H de Wet
9d7d71b1b1
Changed the tabs to 4 spaces. Hopefully.
2015-04-06 22:20:11 +02:00
Garth "L-H" de Wet
e0b4efd9f1
Merge pull request #280 from KoffeinFlummi/explosiveInteraction
...
Explosive interaction
2015-04-06 22:12:04 +02:00
ulteq
ec846b24f2
The ATragMX GUI (ctrlShow) relies on using execVM instead of call
2015-04-06 22:11:06 +02:00
Garth L-H de Wet
44c597f7c5
Explosives, 2 spaces to 4 space tab.
2015-04-06 22:10:00 +02:00
jaynus
acf683e621
Call every 10th of a second.
2015-04-06 12:58:53 -07:00
jaynus
906612f954
Fixed: Gunner FOV, explosive rounds and FPS drop.
2015-04-06 12:54:06 -07:00
ulteq
91be37c6f3
Replaced all execVM occurrences
2015-04-06 21:41:07 +02:00
esteldunedain
04e9f28734
Make function handle negative numbers
2015-04-06 16:12:38 -03:00
ulteq
cab8603db6
Fixed several typos
2015-04-06 21:11:02 +02:00
commy2
c1799616c7
add function to convert numbers to string
2015-04-06 20:47:11 +02:00
ulteq
6578ff4559
*Replaced call compile preprocessFile with FUNC macro
...
*Removed some unused files
*Fixed incorrect .paa filepath
*Fixed incorrect profileNamespace access
2015-04-06 20:46:33 +02:00
jaynus
d6cf07a3b6
Changed: FCS update was not being delayed for laser. Delay of 0.5s added.
2015-04-06 11:44:17 -07:00
Glowbal
bdb5c8e728
Merge pull request #349 from KoffeinFlummi/medicalBugFixes
...
Exit displayPatientInformation PFH when a different selection is selected.
2015-04-06 19:49:12 +02:00
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
ulteq
1320176c12
Initial merge of the ATragMX - Ballistics calculator WIP)
2015-04-06 15:51:59 +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
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
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
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
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
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
PabstMirror
75351f2a5b
TapShoulder - fix hint message
2015-04-04 17:54:15 -05:00
esteldunedain
f417fa2285
Add medical actions while boarded.
2015-04-04 19:41:12 -03:00
PabstMirror
e03d3ed619
Merge pull request #284 from KoffeinFlummi/beltRepacking
...
MagRepack - Belt Repacking / Child Actions
2015-04-04 17:18:53 -05:00
esteldunedain
848b5133ef
Remove debug chats for interact_menu
2015-04-04 19:15:29 -03:00
Glowbal
044d2551ce
Merge branch 'master' into serverConfig
2015-04-04 23:00:47 +02:00
Glowbal
b18d704686
Merge pull request #300 from KoffeinFlummi/medicalImprovements
...
Medical Litter & other additions
2015-04-04 22:52:05 +02:00
Glowbal
7f9043897c
wake up by epinephrine in revive state
2015-04-04 22:50:38 +02:00
