Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,877 Commits 73 Branches 88 Tags 752 MiB
b0d68b1011
Commit Graph

9763 Commits

Author SHA1 Message Date
PabstMirror
58b15e4aa1 AdvThrow - Handle bugged currentThrowable (#5216) 2017-05-29 12:55:00 -05:00
Phyma
5145b89405 Linking belt refactoring (#5206) 
* Linking belt refatoring

startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position.

* Fixed requested change

Fixed requested change
 2017-05-27 11:16:34 -05:00
PabstMirror
d615cf27fc Adv Throw - Handle getShotParents being [] (#5210) 2017-05-27 09:46:31 -05:00
SilentSpike
2ca3716277 Fix Zeus teleport players module (#5175) 
* Add dummy function to zeus UI modules

This removes the message about the module having no function when in SP.

* Fix zeus teleport module for non-local units

BI made a change to the function this module was using. So now it has to
be ran local to the player in question.
 2017-05-26 16:07:33 +01:00
SilentSpike
24966281e7 Add realistic names to dynamic loadout classes (#5185) 2017-05-26 07:57:46 +01:00
Andrea Verano
ca14b7f4b2 Zeus updated (#5198) 
Fixes and adds in the zeus section
 2017-05-24 23:38:58 -05:00
PabstMirror
114f402c58 Merge branch 'master' into medical-rewrite 2017-05-23 13:44:57 -05:00
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193) 
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
 2017-05-23 13:44:17 -05:00
PabstMirror
d4a6caf2b1 Just warn for old compat pbos (#5177) 
* Just warn for old compat pbos

* Use CBA_fnc_error big warning box

* fix caps
 2017-05-22 13:19:43 -05:00
PabstMirror
cd5dcf56fe Use correct TransportX type for ace items (#5168) 
* Use correct TransportX type for ace items

* Fix messing with flare colors
 2017-05-18 17:23:01 -05:00
PabstMirror
b192be0b70 Fix merge, cbaEvents, macros, cleanup 2017-05-18 12:42:02 -05:00
PabstMirror
46c041e6bc Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply 
Conflicts:
	addons/attach/functions/fnc_getChildrenAttachActions.sqf
	addons/common/functions/fnc_dumpArray.sqf
	addons/common/functions/fnc_removeAllEventHandlers.sqf
	addons/common/functions/fnc_removeEventHandler.sqf
	addons/common/functions/fnc_serverEvent.sqf
	addons/common/functions/fnc_waitUntilAndExecute.sqf
	addons/explosives/functions/fnc_scriptedExplosive.sqf
	addons/finger/config.cpp
	addons/frag/config.cpp
	addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
	addons/laser/functions/fnc_laserOn.sqf
	addons/laser/functions/fnc_seekerFindLaserSpot.sqf
	addons/laser/functions/fnc_unitTurretCanLockLaser.sqf
	addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf
	addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf
	addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf
	addons/main/config.cpp
	addons/main/script_mod.hpp
	addons/map/functions/fnc_flashlightGlow.sqf
	addons/maptools/functions/fnc_addLineMarker.sqf
	addons/maptools/functions/fnc_canDraw.sqf
	addons/maptools/functions/fnc_cancelDrawing.sqf
	addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf
	addons/maptools/functions/fnc_copyMapRemoteSend.sqf
	addons/maptools/functions/fnc_copyMapStart.sqf
	addons/maptools/functions/fnc_handleKeyDown.sqf
	addons/maptools/functions/fnc_handleMouseZChanged.sqf
	addons/maptools/functions/fnc_removeLineMarker.sqf
	addons/maptools/functions/fnc_updateLineMarker.sqf
	addons/missileguidance/functions/fnc_checkLos.sqf
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
	addons/overheating/CfgWeapons.hpp
	addons/overheating/functions/fnc_swapBarrelCallback.sqf
	addons/rearm/XEH_postInit.sqf
	addons/rearm/XEH_respawn.sqf
	addons/rearm/functions/fnc_canRearm.sqf
	addons/rearm/functions/fnc_dropAmmo.sqf
	addons/rearm/functions/fnc_getMaxMagazines.sqf
	addons/rearm/functions/fnc_grabAmmo.sqf
	addons/rearm/functions/fnc_pickUpAmmo.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf
	addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf
	addons/rearm/functions/fnc_rearmSuccess.sqf
	addons/rearm/functions/fnc_rearmSuccessLocal.sqf
	addons/rearm/functions/fnc_storeAmmo.sqf
	addons/repair/functions/fnc_useItem.sqf
	addons/tagging/CfgVehicles.hpp
	addons/ui/ACE_UI.hpp
	optionals/tracers/config.cpp
 2017-05-17 18:21:11 -05:00
PabstMirror
f7d9a165f6 Disable aircraft flightmodel changes (#5167) 
* Disable aircraft flightmodel changes

* Remove files
 2017-05-16 21:40:24 -05:00
PabstMirror
9ba3b5aa6a Update helmet hearing protection for RHS-US (#5146) 
* Update helmet hearing protection for RHS-US

* Hearing - Add standardized helmet protection macros

* Tweak peltor vol
 2017-05-16 21:40:07 -05:00
Glowbal
c490fcbc5a Merge branch 'release' 2017-05-16 22:51:28 +02:00
jonpas
5f0e6b7112 Update required Arma 3 version to 1.70 2017-05-16 14:05:23 +02:00
PabstMirror
6034a13d42 Prep 3.9.2 (version numbers) 2017-05-15 18:00:09 -05:00
PabstMirror
5da5a7cc3e Fix gatling_30mm UBC for 1.70 (#5125) 
* Fix gatling_30mm UBC for 1.70

* Fix verEsion
 2017-05-16 00:46:02 +02:00
PabstMirror
225c8d7975 Fix gatling_30mm UBC for 1.70 (#5125) 
* Fix gatling_30mm UBC for 1.70

* Fix verEsion
 2017-05-16 00:45:31 +02:00
PabstMirror
941502af46 Realistic names for 1.70 pylon magazines (#5165) 2017-05-16 00:37:58 +02:00
PabstMirror
cd0609b28d Realistic names for 1.70 pylon magazines (#5165) 2017-05-16 00:37:36 +02:00
PabstMirror
0498e3bae1 1.70 FCS - Remove ACE_FCS from most vics (#5152) 
* Handle 1.70 FCS

* Cleanup CfgWeapons

* Add warning for discreteDistance
 2017-05-16 00:36:22 +02:00
jonpas
406db1928b 1.70 CMs - Remove countermeasure mode switching (#5163) 2017-05-16 00:36:12 +02:00
PabstMirror
305c5a7be7 1.70 FCS - Remove ACE_FCS from most vics (#5152) 
* Handle 1.70 FCS

* Cleanup CfgWeapons

* Add warning for discreteDistance
 2017-05-16 00:30:47 +02:00
jonpas
7ddb5383f3 1.70 CMs - Remove countermeasure mode switching (#5163) 2017-05-16 00:29:52 +02:00
PabstMirror
9e1a9b9af9 Fix bad var names 2017-05-14 15:14:22 -05:00
PabstMirror
1aebae32c5 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
 2017-05-14 14:50:36 -05:00
PabstMirror
bfd3695868 SQF Lint Cleanup Pass (#5157) 
* SQF Lint Cleanup Pass

* Fix var in TRACE

* Add basic python tool

* Simplify

* Hit space key 6 times

* Fix error in dropNozzle

* handle error message exceptions

* Fix py
 2017-05-14 14:48:05 -05:00
PabstMirror
f69148bdc0 Disable rearm,refuel on dead vehicles (#5158) 2017-05-13 17:36:53 -05:00
PabstMirror
0cdb2ce238 Increase max weapon index for large modsets (#5054) 2017-05-12 13:12:39 -05:00
PabstMirror
b8a6a602f3 Disable g-forces for UAV AI (#5094) 2017-05-12 13:12:17 -05:00
PabstMirror
3a69019c33 MapGesutres - Fix dependency on maptools (#5154) 
* MapGesutres - Use getVariable to remove dependency

* Use isModLoaded
 2017-05-11 14:02:21 -05:00
PabstMirror
12f42ab39a Jerry Can - only set global var on server (#5131) 2017-05-10 13:13:15 -05:00
Laid3acK
7c7d779250 AtragMx: BC G1 .338LM API526 (#5069) 
* Update fnc_initGunList.sqf

* Update fnc_initGunList.sqf

* C1 coefficient 0.58
 2017-05-10 19:28:43 +02:00
Laid3acK
457461efbe AB: Lythium latitude (#5109) 
* Update fnc_getMapData.sqf

* bump1

* bump2
 2017-05-10 19:28:05 +02:00
PabstMirror
c26008ad29 hitreactions - Close map on hit (#5099) 2017-05-10 11:29:26 -05:00
Jo David
b3f03d5ffb Zeus Suppression Module (#4977) 
* add base structure

* Add getModuleDestination

* Add 2d map support, debug

* Cleanup, handle weapon max range

* Handle non-local units

* Use new showMessage func

* Run on groups when placed on leader

* Support for Indirect Fire Vehicles

* Cleanup

* Use doArtilleryFire which was fixed in 1.68
 2017-05-10 11:29:04 -05:00
PabstMirror
08217f460e Explosives - Add code handler for detonation (#5115) 
* Explosives - Add code handler for detonation

* Add info to wiki

* Fix cellphone in demo code, move example to wiki
 2017-05-10 11:28:44 -05:00
PabstMirror
68a6782078 Switch 2 perm PFEH to everyFrame (#5140) 2017-05-10 11:28:26 -05:00
PabstMirror
f1ee7756d4 Fix Spotting Scope Interaction Point (#5132) 2017-05-07 16:51:34 -05:00
PabstMirror
31a81c4407 Merge branch 'master' into medical-rewrite 2017-05-06 12:01:58 -05:00
classic
777d0e6fb0 Improve Japanese translation (#5133) 
* Add the Japanese translation for cargo

Add the Japanese translation for cargo, fix to html tag and few improvement

* fix the Japanese transltion

Fix the Japanese translation for attach. it was used wrong html tag.

* changed The Japanese translation

Changed the Japanese translation of azimuth angle

* fix The Japanese translation

Fix the Japanese translation for chemlights. it was used wrong html tag.

* fix The Japanese translation

Fix the Japanese translation for laserpointer. it was used wrong html tag.

* Fix the Japanese translation

Fix the Japanese translation for medical_blood. it was used wrong translation.

* Fix the Japanese translation

Fix the Japanese translation for rearm. it was used wrong translation.

* add The Japanese translation

add The Japanese translation to new words

* Improve The Japanese translation

Improve, fix and change The Japanese translation

* minor fix to Japanese translation

minor fix to Japanese translation. see b1b07c5
 2017-05-06 12:01:31 -05:00
SilentSpike
6394f2b975 Fix #5081 
The default values of the arrays manipulated by these functions overwrite
any changes applied before settings have finished initalising. This won't
be an issue after #4456 is merged in future.
 2017-05-05 23:02:19 +01:00
SilentSpike
1ff6e820b2 Add 3den info to spectator template 
- A `displayName` shown in the 3DEN multiplayer attributes display
- A `respawnTypes` array to define which respawn types the template is compatible with (currently only includes `2,3` - need to investigate compatibility with other types further).
 2017-05-05 23:02:19 +01:00
SilentSpike
74399be109 Optimize spectator unit list function 
Making good use of the new `select` CODE syntax.
 2017-05-05 23:02:19 +01:00
SilentSpike
9ee2f10f63 Simplify spectator compass code 2017-05-05 23:02:19 +01:00
SilentSpike
ec2a90f62c Disable search on spectator unit tree 
Finally found out how to do this. Having search enabled on the unit tree might seem useful, but it doesn't interact well with keyboard shortcuts used for other purposes like camera control as it causes the tree to jump around unexpectedly.
 2017-05-05 23:02:19 +01:00
Ozan Eğitmen
ea4a159cd2 Add Paradrop Time Coefficient Setting (#5116) 
* Add coef

* Show cargo paradrop time in menu

* Unary command, not a function call

* If drop time is 0 don't show a progress bar

* Add the setting to cargo's editor module

* Swap values

* Remove extra comma

* Move unload message to paradrop event

This way the message will show up on all paradrops, not just immidiate
ones.
 2017-05-05 14:02:59 -05:00
PabstMirror
c001be5b09 Add keybind to toggle interaction menu (#5095) 2017-05-05 13:20:54 -05:00
jonpas
8dde674105 Fix jerry can refuel interaction overlapping (#5107) 2017-05-05 13:10:50 -05:00
PabstMirror
a08ed0e307 Fix refuel nozzle dropping to ground (#5119) 2017-05-01 18:06:34 -05:00
Zakant
79047bd2e7 Add player event handler to fix zeus problems with effects (#5022) 2017-04-30 01:46:51 -05:00
PabstMirror
dab9772d03 Don't let flumi see these 2017-04-29 14:18:31 -05:00
PabstMirror
fdb14cea20 Fix IvBags in displayPatientInformation 2017-04-29 13:05:39 -05:00
PabstMirror
e667931626 More debug monitor stuff 2017-04-29 12:58:35 -05:00
PabstMirror
c6fc4d0a13 Clenaup / Debug 2017-04-26 10:16:09 -05:00
PabstMirror
9139a52a38 Add more debug 2017-04-22 13:45:56 -05:00
PabstMirror
604ba50a4a Make medical menu default enabled 2017-04-22 12:22:51 -05:00
PabstMirror
0a7033a186 Remove CfgAiSkill config changes (#5091) 
* Remove CfgAiSkill config changes

* Add note to wiki about removal
 2017-04-22 11:18:56 -05:00
PabstMirror
6464883852 misc cleanup, 1 sec min delay for vital loop 2017-04-22 10:57:32 -05:00
PabstMirror
d93269304d Merge branch 'master' into medical-rewrite 2017-04-15 10:09:50 -05:00
11RDP-LoupVert
bcd73edaba French localization complete (#5079) 
* French localization complete

* STR_ACE_MapTools_drawStaightLines_description fix

"l'on doit survoler le milieu du trait pour pouvoir le supprimer"

* Space management

alganthe :
Espace en trop après référence.

* Diapo

alganthe :
Slideshow -> diaporama
Slide -> diapo

* Cohesion fix

alganthe :
Vous avez traduit le nom du module juste au dessus (displayname).
Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux.

Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them.

* Caisses de munitions

caisse de mun -> caisses de munitions

* STR_ACE_Scopes_Description

Oops, forgot that one.
 2017-04-12 10:39:41 +02:00
11RDP-LoupVert
a0e1205e54 (Medical) French text - minor changes (#5043) 
Minor changes due to users feedback
 2017-04-12 08:40:31 +02:00
PabstMirror
8d43b899e6 Frag - Cleanup and Performance (#5010) 
* Frag - Cleanup and Performance

* Add dots
 2017-04-11 10:33:56 -05:00
PabstMirror
f44da354d5 Fix tagging model cache (#5055) 2017-04-11 10:12:03 -05:00
PabstMirror
6c592e5a10 Virtual units - skip goggles/hearing effects (#4988) 
* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler
 2017-04-11 10:06:29 -05:00
PabstMirror
fb73286242 Tweak overheating (#4969) 
* Tweak overheating

* Add define for constant magic num
 2017-04-11 10:04:57 -05:00
PabstMirror
f0c8d5ad95 Fix FCS Vehicle Init (#5063) 2017-04-11 10:02:59 -05:00
jonpas
fd139abb42 Use setShotParents in Advanced Throwing (#5052) 
* Use setShotParents in Advanced Throwing - close #5034

* Execute setShotParents on server (server-only command)
 2017-04-11 16:59:32 +02:00
Cuel
53943c7503 Filter headless clients from zeus teleportation (#5070) 2017-04-11 16:59:06 +02:00
commy2
a16fafd697 fix highlighted info box color (#5075) 2017-04-11 09:41:32 -05:00
commy2
a9d562e5f7 use https for main men 2017-04-11 12:03:47 +02:00
commy2
0a0929cdc5 use https for main menu 2017-04-11 12:00:34 +02:00
commy2
8a25cd9c0c tweak ACE main menu info box 2017-04-11 02:37:53 +02:00
Dystopian
83d2183f61 Fix cargo loading to locked vehicle (#5049) 2017-04-01 00:33:36 -05:00
PabstMirror
4a24759650 Fix dagr not showing bearing in mils (#5047) 2017-03-30 10:02:13 -05:00
11RDP-LoupVert
94826cc8d6 French loc fixes (ballistics) (#5041) 
Minor French loc fixes
 2017-03-26 19:39:05 -05:00
11RDP-LoupVert
33dd0b5707 French additions (Cargo) (#5040) 
Minor French text additions
 2017-03-26 19:38:18 -05:00
PabstMirror
690e415ffe Minor cleanup 2017-03-25 11:36:37 -05:00
PabstMirror
80d7ef5b67 blood effects moved to UI 2017-03-25 11:27:18 -05:00
Zakant
1fb6521021 Added checkItem on loadout change (#5021) 2017-03-25 11:08:47 -05:00
PabstMirror
169df1ed3b Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/stringtable.xml
 2017-03-25 11:03:50 -05:00
11RDP-LoupVert
fc860e7b43 French loc improvement (#5017) 
* French loc improvement

(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png

Hopefully suggested changes fixes that.

There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.

* Pull 5017 with spaces instead of tabs

https://github.com/acemod/ACE3/pull/5017

* Fixes a minor typo

Selectioner -> Sélectionner

* Duplicate entry (French)

Removes a duplicate entry, didn't saw first time
 2017-03-25 10:52:37 -05:00
PabstMirror
d47ea1d25a Merge pull request #4754 from acemod/medical-rewrite-effects 
Medical Rewrite - Post Process Effects
 2017-03-25 10:50:48 -05:00
11RDP-LoupVert
fcd57a9492 Duplicate French entry (#5032) 
Removes a duplicate French entry, didn't saw it :/
 2017-03-25 10:46:23 -05:00
PabstMirror
15346d0919 Add custom CfgUIGrids for microDagr (#5014) 2017-03-23 11:15:42 -05:00
11RDP-LoupVert
5d8cf43199 Dupplicate Polish entry (#5018) 
https://i.gyazo.com/c7557980d7d4c36709be78ef1f2c2a8f.png
 2017-03-22 11:05:43 -05:00
Glowbal
bb228fa2b3 Merge branch 'release' 2017-03-21 20:49:11 +01:00
Glowbal
b143af0b8c Prep 3.9.1 release 2017-03-21 20:42:39 +01:00
classic
67a4e4e5ab Jpn translate to v391 (#5011) 
* jpn translate slideshow

Add the Japanese translation for slideshow for v3.9.1

* jpn translate for cookoff

Add the Japanese translation for cookoff of the v3.9.1
 2017-03-20 12:20:45 -05:00
simpo
c162739d4f Translation: Missing 3 strings in Polish (#5008) 2017-03-19 23:37:36 -05:00
PabstMirror
ecbca20c3a Recompile medical dll for x64 2017-03-18 14:03:30 -05:00
PabstMirror
46be89eda6 Cleanup 2017-03-18 11:55:40 -05:00
PabstMirror
2e61cc32e1 Locailzation, tweak fast heart rate 2017-03-18 11:53:57 -05:00
PabstMirror
e3af1b55a5 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-18 09:56:42 -05:00
PabstMirror
5f9f672f7f Fix russian translation for avulsion wounds 
Ref #4994
 2017-03-18 09:36:42 -05:00
PabstMirror
15d62ca27f Add #4941 for rewrite 2017-03-18 09:13:08 -05:00
PabstMirror
672be73bae Merge branch 'master' into medical-rewrite 
Conflicts:
    addons/medical/XEH_preInit.sqf
 2017-03-18 09:09:45 -05:00
PabstMirror
1208e441ac Fix unarmed sprint->prone + minor perf improvments (#4887) 2017-03-15 10:12:07 -05:00
jonpas
b31abee4fd Sandbags surfaces update (#4971) 
* Use private keyword, move surface blacklist to script_component.hpp

* Check height above terrain

* Add Tanoa surfaces, Check if in water

* Use 'dust' config entry to determine surface, Add common canDig (checks dustyness)

* Re-enable compile cache

* Revert to surface blacklist with dust as fallback

* Move surface blacklist to script_component because SQF validator complains
 2017-03-15 10:11:37 -05:00
PabstMirror
9e27960b86 Add rearm config for Nemmera (#4992) 2017-03-15 10:10:53 -05:00
commy2
c51b755770 also fix cooking off ammo boxes 2017-03-15 09:09:42 +01:00
commy2
371caaa623 Fix cookoff desynch, fix #4900 
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
 2017-03-15 09:09:02 +01:00
commy2
81f3387dbb Merge pull request #4991 from acemod/fix-cookoff-2 
also fix cooking off ammo boxes
 2017-03-14 10:09:13 +01:00
commy2
2c4f286593 also fix cooking off ammo boxes 2017-03-14 10:08:06 +01:00
commy2
2334d501d0 Fix cookoff desynch, fix #4900 
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
 2017-03-14 10:04:56 +01:00
Glowbal
71d9694eb6 Prep 3.9.1 release 2017-03-13 20:48:02 +01:00
jonpas
27ef320542 Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) 2017-03-13 20:43:55 +01:00
Mark Ruffner
6403132a9b Add validation on group id for map gesture color mapping (#4976) 2017-03-13 20:43:06 +01:00
PabstMirror
11de1326ef Cleanup use of ACE_HashLocation (#4975) 2017-03-13 20:42:43 +01:00
PabstMirror
d18ad0c087 Give options menu list focus (#4965) 2017-03-13 20:42:25 +01:00
PabstMirror
d9be3c0ffc Fix rangecard not showing wind/lead (#4964) 2017-03-13 20:42:05 +01:00
J3aLeiNe
ca5f3fa1cf Update maps' latitude (#4961) 
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
 2017-03-13 20:41:37 +01:00
PabstMirror
43786786de Fix gforce avg on switching to aircraft (#4955) 
* Fix gforce avg on switching to aircraft

* Dont use for-loop for neutral g-forces array
 2017-03-13 20:41:14 +01:00
jonpas
ca4060b852 Require CBA v3.2.1 (#4954) 
Conflicts:
	addons/main/script_mod.hpp
 2017-03-13 20:40:52 +01:00
PabstMirror
a1853e0d52 Fix intergrated scopes (#4945) 2017-03-13 20:40:11 +01:00
PabstMirror
76e9b132d7 Add RHS GREF compat for RKG-3 grenade (#4944) 2017-03-13 20:39:42 +01:00
PabstMirror
bda09296ed Fix lost magazines when restoring gunbag mags (#4942) 2017-03-13 20:39:24 +01:00
PabstMirror
1952dc5798 Reload medical configs into extension on save load (#4941) 2017-03-13 20:39:01 +01:00
PabstMirror
2c7a5fee76 Fix setVariablePublic reseting to old values (#4938) 
* Fix setVariablePublic reseting to old values

* Don't drop delay time
 2017-03-13 20:38:41 +01:00
PabstMirror
863d54973d Verify params in atragmx profile gunlist (#4917) 2017-03-13 20:38:12 +01:00
PabstMirror
19e1a1f4c5 Pass map gestures draw by reference (#4914) 2017-03-13 20:37:47 +01:00
PabstMirror
0c479859af Hide earplug actions if setting disabled (#4913) 
* Hide earplug actions if setting disabled

* Add lines that are new
 2017-03-13 20:37:29 +01:00
Mark Ruffner
cd526b7f5e Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) 
* Update medical/repair 3den away from missionNamespace

* Simplify save
 2017-03-13 20:37:11 +01:00
Glowbal
5240c225e6 Update CBA required version (#4899) 
* prep v3.9.0

* Update required CBA version
 2017-03-13 20:36:49 +01:00
PabstMirror
f3d6a4d90d Use createSimpleObject to create tags (#4892) 2017-03-13 20:35:39 +01:00
PabstMirror
b0741f48d7 Fix getPos order (#4889) 2017-03-13 20:35:15 +01:00
PabstMirror
2e8651deac Fix passenger actions - Ensure order of MainActions (#4883) 2017-03-13 20:34:42 +01:00
commy2
bd7c8ce409 Optimize Laserpointer (#4859) 
* only process one unit every 0.1 seconds

* exitWith to keep indentation low

* use event to determine isIR and isTI

* correctly remove units with turned on lights from their arrays

* handle weaponAccessories command reporting nil

Conflicts:
	addons/laserpointer/XEH_postInit.sqf
 2017-03-13 20:33:32 +01:00
PabstMirror
e8418f6df0 Fix Javelin for AI (#4857) 2017-03-13 20:31:16 +01:00
Dedmen Miller
1b951231da Cache Nametags onDraw3D flags. (#4847) 
* Cache Nametag flags

* Remove unused privates

* Fix fading, cursorOnly mode, improve cache reset

* Fix header
 2017-03-13 20:30:53 +01:00
Ozan Eğitmen
d3af5f0e64 New Function to Show BIS Style Curator Messages (#4844) 
* Add showMessage fnc that shows BIS curator messages

* Add documentation

* Make function simpler

* Modify to fir new syntax

* Handle non-string args
 2017-03-13 20:29:39 +01:00
Ozan Eğitmen
2554aba559 Frag Superanal Cleanup (#4803) 
* Minimal frag cleanup

* Why did this even happen in the first place

Conflicts:
	addons/frag/functions/fnc_frago.sqf
 2017-03-13 20:28:58 +01:00
PabstMirror
a2f1a4684e Generic cycle attack profile key for missile guidance (#4787) 
* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Fix Korean strings

* Cleanup
 2017-03-13 20:25:30 +01:00
NorXAengell
e20666ba9a French translation to "Advanced throwing" and "Advanced fatigue" (#4415) 
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
 2017-03-13 20:25:09 +01:00
PabstMirror
a3750b3160 Pass functions by "reference" to bis event handlers (#4898) 
* Pass functions by "reference" to bis event handlers

* Add Doc

* Fix

Conflicts:
	addons/laserpointer/XEH_postInit.sqf
 2017-03-13 20:24:27 +01:00
Dedmen Miller
5105394f29 Prevent starting additional vital loops on full heal (#4885) 2017-03-13 20:21:57 +01:00
J3aLeiNe
9733ddc1c0 Update CfgWeapons.hpp (#4893) 2017-03-13 20:21:10 +01:00
sbng-PAPA
11b4a4a2bc More accurate Korean translate for medical (#4897) 2017-03-13 20:20:46 +01:00
jonpas
f0977a18ac Fix multiple slideshows sub-actions, Add set name setting (#4904) 
* Fix all slides being in multiple slideshows setup, Use private keyword

* Add setting for slides main interaction name

* Update Slideshow documentation

* Add not about new argument added in version
 2017-03-13 20:20:23 +01:00
PabstMirror
32c5d1c80c Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-03-13 20:19:51 +01:00
PabstMirror
d3bfcf0aa9 Fix MUL macros (#4888) 
Conflicts:
	addons/frag/functions/fnc_frago.sqf
 2017-03-13 20:19:16 +01:00
jonpas
5ef06590cc Fix double single quote to single double quote (#4876) 2017-03-13 20:16:56 +01:00
PabstMirror
796eba5297 Handle changes to CBA_fnc_addPlayerEventHandler (#4878) 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
 2017-03-13 20:16:35 +01:00
commy2
d2bcfe02b5 fix HK416 name, fix #4873 (#4874) 2017-03-13 20:15:40 +01:00
jonpas
43dc1f020e Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) 2017-03-11 22:49:54 -06:00
PabstMirror
d313d53b02 Fix gforce avg on switching to aircraft (#4955) 
* Fix gforce avg on switching to aircraft

* Dont use for-loop for neutral g-forces array
 2017-03-09 16:49:50 -06:00
PabstMirror
f3d2833b28 Fix rangecard not showing wind/lead (#4964) 2017-03-08 19:40:48 +01:00
PabstMirror
d900871da4 Pass map gestures draw by reference (#4914) 2017-03-08 19:34:58 +01:00
PabstMirror
c49e5bcfa0 Reload medical configs into extension on save load (#4941) 2017-03-08 19:33:28 +01:00
PabstMirror
110bce763f Fix intergrated scopes (#4945) 2017-03-08 19:31:26 +01:00
PabstMirror
19af072c99 Give options menu list focus (#4965) 2017-03-08 19:26:05 +01:00
Mark Ruffner
acf422b774 Add validation on group id for map gesture color mapping (#4976) 2017-03-08 09:58:29 -06:00
PabstMirror
0841c05a6d Cleanup use of ACE_HashLocation (#4975) 2017-03-08 10:15:15 +01:00
PabstMirror
d403f20d71 Adjust addDamageToUnit for rewrite 2017-03-06 15:06:01 -06:00
PabstMirror
2e47bad280 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-02 18:01:40 -06:00
PabstMirror
8ad3571d19 Merge branch 'master' into medical-rewrite 2017-03-02 18:00:34 -06:00
sbng-PAPA
e2c04a80c4 More accurate Korean translate for medical (#4897) 2017-03-02 17:48:48 -06:00
Ozan Eğitmen
3aa55b1452 New Function to Show BIS Style Curator Messages (#4844) 
* Add showMessage fnc that shows BIS curator messages

* Add documentation

* Make function simpler

* Modify to fir new syntax

* Handle non-string args
 2017-03-02 17:47:49 -06:00
Dedmen Miller
512592b79d Prevent starting additional vital loops on full heal (#4885) 2017-03-02 17:22:16 -06:00
J3aLeiNe
6ce9ede1b5 Update maps' latitude (#4961) 
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
 2017-03-02 14:00:18 -06:00
J3aLeiNe
dd76a91844 Update CfgWeapons.hpp (#4893) 2017-02-28 19:14:01 -06:00
jonpas
b9fa3e404d Require CBA v3.2.1 (#4954) 2017-02-27 14:22:45 -06:00
jonpas
bc70571765 Use CBA Accessory Functions for Laser mode switching (#4855) 
* Use CBA Accessory Functions for Laser mode switching

* Use CBA ACC EH to prevent switching to unusable lzr (#4860)

* Use CBA ACC EH to prevent switching to unusable lzr

* Re-call CBA_accessory_fnc_switchAttachment

* Require CBA 3.2.0
 2017-02-25 17:16:40 +01:00
PabstMirror
287d3b475b Add RHS GREF compat for RKG-3 grenade (#4944) 2017-02-24 19:21:42 -06:00
PabstMirror
0bc1e12775 Verify params in atragmx profile gunlist (#4917) 2017-02-24 19:20:27 -06:00
PabstMirror
02ea214ade Fix setVariablePublic reseting to old values (#4938) 
* Fix setVariablePublic reseting to old values

* Don't drop delay time
 2017-02-24 19:19:39 -06:00
PabstMirror
e41fbcb0fd Fix lost magazines when restoring gunbag mags (#4942) 2017-02-24 19:19:05 -06:00
jonpas
1590948b92 Fix multiple slideshows sub-actions, Add set name setting (#4904) 
* Fix all slides being in multiple slideshows setup, Use private keyword

* Add setting for slides main interaction name

* Update Slideshow documentation

* Add not about new argument added in version
 2017-02-24 14:08:18 +01:00
PabstMirror
97ec22bd9a Switch heartbeat to waitAndExec, allow switching pain settings 2017-02-18 22:11:40 -06:00
PabstMirror
34f87f89bb Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-02-18 18:24:03 -06:00
PabstMirror
0d4aa8197a Fix moved KR wounds strings 2017-02-18 18:22:23 -06:00
PabstMirror
c7b60d1777 Merge branch 'master' into medical-rewrite 2017-02-18 18:17:37 -06:00
Mark Ruffner
0900bf964b Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) 
* Update medical/repair 3den away from missionNamespace

* Simplify save
 2017-02-18 12:27:36 -06:00
PabstMirror
9d128152a3 Hide earplug actions if setting disabled (#4913) 
* Hide earplug actions if setting disabled

* Add lines that are new
 2017-02-16 10:16:46 -06:00
Glowbal
19d5fa0a4e Update CBA required version (#4899) 
* prep v3.9.0

* Update required CBA version
 2017-02-14 16:53:35 -06:00
Glowbal
283c372291 Merge branch 'release' 2017-02-14 22:43:31 +01:00
Glowbal
df693d69b6 Prepare v3.9.0 release 2017-02-14 21:25:22 +01:00
PabstMirror
dfca4fdcf8 Pass functions by "reference" to bis event handlers (#4898) 
* Pass functions by "reference" to bis event handlers

* Add Doc

* Fix
 2017-02-14 10:54:37 -06:00
PabstMirror
036bb0ecd4 Use createSimpleObject to create tags (#4892) 2017-02-14 10:54:21 -06:00
NorXAengell
1be278fbda French translation to "Advanced throwing" and "Advanced fatigue" (#4415) 
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
 2017-02-11 15:16:56 -06:00
PabstMirror
33b19f7b4c Fix MUL macros (#4888) 2017-02-11 15:07:10 -06:00
PabstMirror
f678f4a3b1 Fix getPos order (#4889) 2017-02-10 21:23:33 -06:00
PabstMirror
159e762576 Handle changes to CBA_fnc_addPlayerEventHandler (#4878) 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
 2017-02-10 13:03:12 -06:00
PabstMirror
78a55d4436 Generic cycle attack profile key for missile guidance (#4787) 
* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Fix Korean strings

* Cleanup
 2017-02-10 13:01:17 -06:00
PabstMirror
70f4dd3e6b Fix passenger actions - Ensure order of MainActions (#4883) 2017-02-10 12:49:10 -06:00
commy2
97a0624375 Optimize Laserpointer (#4859) 
* only process one unit every 0.1 seconds

* exitWith to keep indentation low

* use event to determine isIR and isTI

* correctly remove units with turned on lights from their arrays

* handle weaponAccessories command reporting nil
 2017-02-10 12:47:08 -06:00
PabstMirror
3ce0865913 Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-02-10 12:34:51 -06:00
Ozan Eğitmen
d2ee1e987a Frag Superanal Cleanup (#4803) 
* Minimal frag cleanup

* Why did this even happen in the first place
 2017-02-10 12:28:27 -06:00
Dedmen Miller
5351b43ff3 Cache Nametags onDraw3D flags. (#4847) 
* Cache Nametag flags

* Remove unused privates

* Fix fading, cursorOnly mode, improve cache reset

* Fix header
 2017-02-10 12:19:14 -06:00
PabstMirror
4433f6eb38 Merge branch 'master' into medical-rewrite 2017-02-08 10:32:22 -06:00
PabstMirror
231346a199 Fix Javelin for AI (#4857) 2017-02-05 23:01:48 +01:00
commy2
10756ff02d fix HK416 name, fix #4873 (#4874) 2017-02-05 23:01:06 +01:00
jonpas
4d872b84b7 Fix double single quote to single double quote (#4876) 2017-02-05 23:00:35 +01:00
Glowbal
c0c41667e7 prep v3.9.0 2017-02-05 13:48:09 +01:00
Dystopian
06f99f044c Fix deprecated AW159 and CH-47I config (#4726) 2017-02-02 17:45:32 -06:00
commy2
9d68fbf987 fix script error caused by new arguments passed to handleDamage (#4866) 
* fix script error caused by new arguments passed to handleDamage

* Copy array to not break other handleDamage ehs

* Resize to 7
 2017-02-02 13:03:13 -06:00
BaerMitUmlaut
0c6eec8485 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-01-30 21:34:51 +01:00
BaerMitUmlaut
60c57a7f20 Fix unconscious state in cardiac arrest 2017-01-30 21:22:10 +01:00
BaerMitUmlaut
9d3807e7c2 Fixed div by zero 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
7ff753c3c2 Fixed missing semicolon 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
20cf30a7c6 Moved heart beat sounds to medical ui 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
ecbe429f9d Fixed missing private 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
e447d5c222 Added bleeding effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
9cef8ea591 Save pain next tick in GVAR instead of on unit 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
1dc301e023 Added ACE2 like repeated eye opening when unconscious, fixed going into Zeus while waking up 2017-01-29 21:59:24 +01:00
ulteq
04b720f5bc Make use of EFUNC(medical,getPainLevel) 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
57cacf63fa Rewrote unconscious effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
26627a451e Tweaked pain effect (longer flashes/pulses) 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
13ef6b0d29 Fixed blood volume effect 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
751c7ff959 Fixed default blood volume 2017-01-29 21:59:24 +01:00
BaerMitUmlaut
9eba2bd448 Added visual effects 2017-01-29 21:59:24 +01:00
Dorbedo
aa393ccf92 typo in ace_interaction_fnc_getDoorAnimations (#4854) 2017-01-28 13:43:42 -06:00
Dystopian
b30705661c add real name for civilian kamaz trucks (#4851) 2017-01-23 12:14:55 -06:00
Neviothr
9b36ccadcc Aircraft cleanup (#4818) 
* Cleanup

* Returned lines between classes

* Add files via upload
 2017-01-23 12:13:37 -06:00
PabstMirror
e9b5bde371 Add ace_setting for scaling cookoff effect length (#4842) 
* Add getVar for scaling cookoff effect length

* Switch to ace_setting

* Add notes about merging settings
 2017-01-23 12:13:02 -06:00
Dystopian
7cdf2d75a3 fix win newline in repo (#4849) 2017-01-23 00:56:52 +01:00
Dystopian
d5d8413ee9 fix kamaz medical can repair (#4850) 2017-01-22 10:39:02 -06:00
ViperMaul
ba810a22e6 Tab clean up. 2017-01-19 18:38:51 -06:00
ViperMaul
ad2e3719b4 Adding Normal to Common stringtable 2017-01-19 17:31:29 -06:00
ViperMaul
567c9129b2 cleanup 2017-01-19 17:23:54 -06:00
ViperMaul
59c58b1269 Add settings function handler 2017-01-19 17:19:54 -06:00
ViperMaul
8db5d8f2ae Change Setting from Basic to Normal and Stringtable moves 2017-01-19 15:46:44 -06:00
ViperMaul
6972af9d0b Settings and string changes 2017-01-19 15:30:27 -06:00
ViperMaul
1078913d2a Stringtable changes. 2017-01-19 15:29:33 -06:00
ViperMaul
69dc3ba12e Add Settings to Medical Settings Module 2017-01-19 11:48:34 -06:00
jonpas
b7f36ffd12 Add orange map chemlight entry (#4839) 2017-01-18 18:18:28 -06:00
PabstMirror
120ddd94de Merge branch 'master' into medical-rewrite 2017-01-17 18:03:28 -06:00
ViperMaul
5deb305906 Fix ace_gunbag track named properties (#4838) 2017-01-17 18:03:27 -06:00
Grzegorz
15f2e6b2fe PL translation 3.9.0 (#4821) 
* translate/fix cookoff PL translation

* translate/fix laser/map PL translation

* fix/translate maptools PL translation

* fix/translate medical_blood PL translation

* fix scopes PL translation

* fix zeus PL translation

* translate overpressure
 2017-01-17 15:33:22 -06:00
PabstMirror
4f3f847930 Fix ace_track named properties (#4837) 
* Fix ace_track named properties

* Fix 4 more
 2017-01-17 15:32:14 -06:00
jonpas
3ac00f2e21 Fix medical typo 'to' -> 'too' (#4824) 2017-01-17 15:26:07 -06:00
PabstMirror
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -06:00
Neviothr
ade87adf46 Modules Cleanup (#4813) 
* Cleanup

* Added newlines
 2017-01-14 15:47:03 -06:00
bux
3f00da7365 decrease concertina "dismount" time, use ace checks (#4812) 
IRL it’s just pushing them together again
 2017-01-13 13:43:54 -06:00
Dedmen Miller
6c12444d85 Fixes #4814 (#4815) 
Doesn't fix the core issue behind #4814 but it fixes the issue that bothered me so much that i reported this.
 2017-01-11 15:54:03 -06:00
PabstMirror
39181fdea5 Simplify huntIR configs using += (#4521) 
* Add huntIR magazine to GL_3GL_F via sub config

* Cleanup RHS 40mm huntIR GL config

* Add huntir to standalone m320 - #4199
 2017-01-09 12:11:31 -06:00
PabstMirror
8752b03c12 Hearing - player only event handlers (#4727) 2017-01-09 12:10:52 -06:00
PabstMirror
bce0913019 Cookoff - add function to get ammo (#4779) 
* Cookoff - add function to get ammo

Fix #4565 - Function adds virtual ammo for rearm vehicles
Remove FUNC(secondaryExplosions) - which duplicatd detonateAmunition
Tweak timeBetweenAmmoDetonation calculation to use all ammo, not just
the current mag
Allow GVAR(enableAmmoCookoff) effect to work with GVAR(enable)=false

* Fix header

* Cleanup getting ammo from turrets
 2017-01-04 15:35:54 -06:00
classic
0046ba4bbb fix Japanese translation for #4785 (#4804) 
"j" is replace by a "J"
 2017-01-04 16:37:00 +01:00
J3aLeiNe
2dcd79fd1d Update MapData (#4786) 
* Update Map data

 - Add IFA3LITE maps
 - Add CSA38 map
 - Add Beketov map
 - Add Winter Panthera map
 - Add Nam and Mogadishu maps
 - Add Uhao island map

* Update fnc_getMapData.sqf

 - Add X-Cam-Taunus map
 - Add Unsung 3.1 Delta maps
 2017-01-02 21:32:58 -06:00
BaerMitUmlaut
0a05401e74 Fix cookoff locality issues (#4799) 
* Fix locality issue with box cookoff

* Add grenade fired EHs on hcs and dedis
 2017-01-02 17:55:44 -06:00
classic
9d37d91c71 Jpn translation for overpressure #4770 (#4785) 
Japanese translation for #4770
 2017-01-02 17:54:51 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794) 
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
 2017-01-02 17:52:01 -06:00
jonpas
e296c12b30 Remove duplicated Zeus strings 2017-01-02 16:16:37 +01:00
Skully71
9b22f94374 Ensure movingToInjured is false whenever _target no longer needs healing, fixes #4797 (#4800) 2017-01-02 14:02:43 +01:00
markooff
0c069a6bd2 polish translations (#4734) 
* some extra polish translations

for details see polish_translations_readme_markooff.txt

* file was deleted as it wasn't the part of the mod (only for information reason)
 2017-01-02 13:21:47 +01:00
PabstMirror
3cd80a42d7 Fix cruise heigh on close shots (#4795) 2016-12-29 15:04:19 -06:00
PabstMirror
c22fce273f Overpressure changes (#4770) 
* Add setting to overpressure

* Change overpressure on 2a70 cannon

Close #4691
Also fix gl smoke causing frag

* Handle 2a28 cannon

* Fix base class
 2016-12-22 13:29:05 -06:00
bux578
886e23791f Merge pull request #4774 from classicarma/fix-jpn-translate-v383 
Fix jpn translate v383
 2016-12-17 15:59:50 +01:00