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
15,878 Commits 73 Branches 88 Tags 752 MiB
missile_guidance_mclos
Commit Graph

126 Commits

Author SHA1 Message Date
Filip Maciejewski
5e07d894f8 Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407) 
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
 2018-09-17 14:19:29 -05:00
Dedmen Miller
7a0a00ea09 Cleanup using SQFLint (#6485) 
* Use private
* Fix wrong spacing
* Fix wrong variable being used
* Cleanup empty line after header
* ace_common_fnc_getCountOfItem
* Remove useless _return variable
* Naming
 2018-08-02 15:02:10 +01:00
Dedmen Miller
6bd8542eed Move #includes before function headers (#6484) 2018-07-30 10:22:14 +01:00
Thomas Kooi
c9ad92e92d
Disable debugging (#6482) 2018-07-30 00:07:30 +02:00
Thomas Kooi
604fa0e4cb
Fix some script errors on medical rewrite (#6450) 2018-07-18 22:50:03 +02:00
SilentSpike
6497f6c9d4 Fix missing include 2018-07-18 21:17:44 +01:00
SilentSpike
ec7a9a133e
Fix required addons in medical restructure (#6441) 2018-07-18 19:19:28 +01:00
SilentSpike
4466f9e785
Strip medical component (#6442) 
* Move litter to `treatment`
* Move eden object attributes to `treatment`
* Move treatment items to `treatment`
* Move bodybag handling to `treatment`
* Move state conditions to `statemachine`
* Move radio addon handling to `feedback`
* Move medical macros to `engine`
* Move medical extension to `damage`
* Fix texture and material paths after move
* Remove duplicate medical menu config
* Remove old faction class
* Remove a bunch of old code
 2018-07-18 19:13:25 +01:00
Glowbal
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
SilentSpike
c9e11e62a1 Use macros for status state variables 2018-05-22 18:06:28 +01:00
SilentSpike
6559665b8b Use more status macros 2018-04-27 16:03:55 +01:00
PabstMirror
80e5088013 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/CfgVehicles.hpp
	addons/medical/XEH_PREP.hpp
	addons/medical/stringtable.xml
 2017-09-27 15:48:22 -05:00
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
PabstMirror
ddf72d5878 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/CfgWeapons.hpp
	addons/medical/data/model.cfg
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/stringtable.xml
 2017-09-23 11:25:58 -05:00
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375) 
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
 2017-07-19 20:57:20 +02:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295) 
Add Chinese Traditional & Simplified Localization
 2017-06-22 16:46:00 +02:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255) 
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
 2017-06-08 15:31:51 +02: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
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
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
PabstMirror
120ddd94de Merge branch 'master' into medical-rewrite 2017-01-17 18:03:28 -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
a32478adfb Merge branch 'master' into medical-rewrite 2017-01-17 13:10:18 -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
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
commy2
9cba0baade manual merge 2016-12-05 20:18:15 +01:00
commy2
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
PabstMirror
4eba77f328 Fix blood drop selection if blood loss is high 
close #4739
 2016-12-01 20:36:10 -06:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
PabstMirror
5463e9dff8 Merge branch 'master' into medical-rewrite 2016-11-09 13:12:42 -06:00
PabstMirror
20f40f8c55 Use single queue for blood cleanup (#4586) 2016-11-09 13:00:18 -06:00
System98
7efe752f3c Update german translation 
- Add missing german translations
 2016-11-05 13:42:55 +01:00
PabstMirror
ebd31168f4 Fix bleeding hit logic for enabledFor = 1 2016-10-30 20:45:02 -05:00
PabstMirror
866612b974 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical_blood/XEH_postInit.sqf
 2016-10-30 20:38:30 -05:00
PabstMirror
70439aaa9d Fix bleeding hit logic for enabledFor = 1 (#4585) 
* Fix bleeding hit logic for enabledFor = 1

* Handle RC

* fix
 2016-10-28 22:12:37 +02:00
PabstMirror
f2746891af Sanatize damage value used for blood creation (#4574) 
Fix #4571
 2016-10-20 19:43:52 +02:00
commy2
576a63c27e Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2016-10-20 13:56:56 +02:00
classicarma
d33219b9ba Japanese translations (#4553) 2016-10-18 20:19:27 +02:00
commy2
e9586ebccc use common header file for medical components 2016-10-06 22:40:36 +02:00
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
commy2
bad01c3126 simplify blood splatter by using woundReceived event 2016-10-02 19:13:56 +02:00
commy2
6082020056 simplify blood splatter by using woundReceived event 2016-10-02 18:35:40 +02:00
commy2
f4d4c521d7 manual merge 2016-10-02 13:02:17 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
commy2
5da11d5f79 remove obsolete macro 2016-10-02 12:17:48 +02:00
PabstMirror
bfc5af32f3 Add model.cfg for medical blood (#4489) 2016-09-30 16:29:48 -05:00
commy2
a54aec72bc Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-30 21:19:16 +02:00
PabstMirror
3c7ac5a3e4 Fix medical blood locality / bleeding in vehicles (#4469) 
* Fix medical blood locality / bleeding in vehicles

- Fix ace_setting
- Don't run on headless if enabledFor = 1
- Don't create blood for non-local units
- Don't create blood when mounted (except static weapons)

* Add readme
 2016-09-29 10:42:56 -05:00
commy2
20d00d7cd9 make units scream when they're hit 2016-09-27 21:21:44 +02:00
commy2
a913054b57 fix error with out of bounds blood loss 2016-09-27 20:00:58 +02:00
Glowbal
c7e16210c3 fix pboprefix path 2016-09-19 23:17:10 +02:00
commy2
5b42dd8616 remove deleted models 2016-09-19 15:47:51 +02:00
commy2
9a9d547893 this variable was meant to be used here... 2016-09-19 15:38:03 +02:00
commy2
226742088b remove unused variables 2016-09-19 15:36:08 +02:00
commy2
00964bd007 add a comment 2016-09-19 15:31:53 +02:00
commy2
d9b670f45f switch to SuperShader for SMDI and NoHQ, rename blood textures 2016-09-19 15:30:12 +02:00
commy2
b1f726a1fe get rid of config and use namespace for blood models 2016-09-19 15:08:38 +02:00
commy2
f60b368c65 precompile and cache functions at game start 2016-09-19 14:41:02 +02:00
commy2
a2805fad53 fix undefined variable, synch splat direction correctly 2016-09-19 14:38:47 +02:00
commy2
70512db0e3 simplifying and fixing offset 2016-09-19 13:26:32 +02:00
commy2
bc3260c8fc convert magic numbers into macros, simplify a waitAndExecute 2016-09-19 12:27:02 +02:00
commy2
d86ceef484 use ASL instead of ATL when z isn't used anyway 2016-09-19 12:18:24 +02:00
commy2
4de8ed0f10 delete unused blood splat configs and models 2016-09-19 12:11:37 +02:00
commy2
edfc33d297 simplify serverEvent call 2016-09-19 12:06:13 +02:00
commy2
86f6a5db73 move model files into data folder 2016-09-19 12:03:05 +02:00
commy2
022e8b52d0 remove unused CBA macro from blood config, disable A3 canBeShot 2016-09-19 11:38:29 +02:00
commy2
0cf6094875 rename spawnBlood to createBlood for consistency 2016-09-19 11:21:05 +02:00
commy2
26caafdab3 fix wrong function used in a example/header 2016-09-19 11:19:16 +02:00
Glowbal
e8f55348d8 Add ACE2 sys_Blood port 2016-09-17 16:52:25 +02:00