Commit Graph

10995 Commits

Author SHA1 Message Date
Josuan Albin
5ae0ef6bbe Replace remaining lineIntersects with lineIntersectsSurfaces (#6898)
* Fix explosive placement while underwater

* Apply suggestions from code review

Co-Authored-By: alganthe <alganthe@live.fr>

* Change placeApprove header to reflect changes

* Replace lineIntersectsWith in isInMedicalFacility

* Replace linesIntersects in isInRepairFacility, fix params

Public func, params should have an expected type.

* Replace linesIntersects in spallTrack

* Replace lineIntersects in getFirstObjectIntersection and findReflection

* Replace lineIntersects in advanced throwing

grenades can pass glass underwater now, I bet all of 0 person will be glad that horrendous bug is now fixed.

* Fix possible issue in pointing while underwater

* Fix possible issue while underwater in attach

* Replace count with isEqualTo in lineIntersectsSurfaces replacements

* Fix inverted conditions

* Fix drawArc

* Fix fnc_attach

* Reverse advanced_throwing and spallTrack lineIntersects changes

* Fix issues raised from code review
2019-12-07 14:58:21 -06:00
Elgin675
ec27cee1ac French translation Update / Added (#7213)
* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French MicroDAGR Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* Update French Explosives Translation Update

* Update addons/advanced_ballistics/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/cargo/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update frag/gestures/goggles/grenades/gunbag french translation

* Update hearing french translation

* Added French update translation and / or correction for :

- Frag Module
- Gestures Module
- Goggles Module
- Grenades Module
- Gunbag Module
- Hearing Module
- Hellfire Module
- Hitreactions Module
- Hot Module
- Interact_Menu Module
- Interaction Module
- Inventory Module
- Laser Module
- Laserpointer Module
- Magazinerepack Module
- Map Module
- Map_gesture Module
- Maptools Module
- Markers Module
- Maverick Module

* Added French update translation and / or correction for :

- Interaction Module
- Medical Module
- Medical_damage Module
- Medical_feedback Module
- Medical_gui Module
- Medical_statemachine Module
- Medical_treatment Module
- Microdagr Module

* Added French update translation and / or correction for :

- Missileguidance Module
- Missionmodules Module
- Nametags Module
- Nightvision Module
- Nlaw Module
- Noradio Module
- Optionsmenu Module

* Added French update translation and / or correction for :

- Overheating Module
- Overpressure Module
- Parachute Module
- Pylons Module
- Quickmount Module
- Rangecard Module
- Realisticnames Module
- Rearm Module
- Refuel Module
- Reload Module

* Adding French translation and correction for the Repair Module

* Correction typo mineure

* Adding French translation and / or correction for :

- Respawn Module
- Safemode Module
- Sandbag Module
- Scopes Module

* Minor corrections of the French translation for the ACE arsenal

* Minor corrections of the French translation for the Medical_treatment Module

* Correction de quelques anomalies dans les options ACE pour Eden.

Remplacement de la mention "Est infirmier" par "Qualification médicale", dans les options ACE de l'éditeur de mission.
En effet, il n'y a pas (plus ?) de case à cocher, mais un menu "direct", avec les choix "Par défaut/Aucune/Infirmier/Médecin.
Cela est donc bien plus approprié ;).

De même pour la mention "Est ingénieur", remplacée par "Qualification technique", là aussi bien plus appropriée.

Il a également fallu que je remplace la valeur "Ingénieur avancé" par "Ing. avancé" (Adv. Engineer en anglais), pour des raisons de place : la dénomination complète déborderait de la case / serait tronquée.

* Added French translation and / or correction for :

- Slideshow Module,
- Spectator Module,
- Spottingscope Module,
- Swichunits Module,

Minor correction on Nametags Module

* Correction ponctuation

* Added French translation and / or correction for :

- Tacticalladder Module,
- Tagging Module,
- Trenches Module,
- Tripod Module.

* Added French translation and / or correction for :

- UI Module,
- Vehiclelock Module,
- Vehicles Module.

Minor correction on Tacticalladder Module

* Added French update translation and / or correction for Viewdistance Module
2019-12-07 13:48:47 -06:00
Dedmen Miller
3333b41dfb Remove unused VRTraining class from Arsenal config (#7276) 2019-12-04 14:12:42 -06:00
Josuan Albin
b8fcd92536 Fix default loadout public func not checking base items (#7280) 2019-12-04 14:12:00 -06:00
dfr1238
8b526906cd
Update tchinese translate 2019-12-04 23:13:13 +08:00
dfr1238
46cae20da5
Update tchinese translate 2019-12-04 23:11:53 +08:00
commy2
76f0d76b83
Merge pull request #7277 from acemod/maglite
Add handheld maglite ML300L flashlight, clean up flashlight addon
2019-12-03 19:13:00 +01:00
bux
584d311dde add blender animation file 2019-12-03 15:32:27 +01:00
Filip Maciejewski
9bbbdf71aa
Polish translation for Maglite ML300L 2019-12-03 12:56:38 +01:00
commy2
6febaf33df fix recoil, remove magic reticle 2019-12-03 06:51:02 +01:00
bux
123095697c adjust light strength 2019-12-02 14:21:01 +01:00
bux
8133a539ef vastly reduced complexity of shadow meshes, fix warning with shadow lod 2019-12-02 13:55:44 +01:00
commy2
8e411bb53b sway and info box fixes 2019-11-30 19:56:14 +01:00
commy2
77e9cee1f7 sway and info box fixes 2019-11-30 19:56:01 +01:00
commy2
0f10d7f299 weapon config 2019-11-30 18:36:31 +01:00
commy2
bd52ff1c50 Merge branch 'maglite' of https://github.com/acemod/ACE3 into maglite 2019-11-30 18:05:17 +01:00
commy2
8435497fe6 fix vehicle config, add gwh 2019-11-30 18:05:02 +01:00
bux
0c516628e1 add back LodNoShadow to resolution lods 1 and 2 2019-11-30 17:58:51 +01:00
commy2
f8135b132d fix formatting material file 2019-11-30 17:36:03 +01:00
commy2
ef34ac71e3 fix formatting model.cfg 2019-11-30 17:30:51 +01:00
commy2
776335b5a7 improve the German translation 2019-11-30 17:25:21 +01:00
commy2
871495699e Merge remote-tracking branch 'origin' into maglite 2019-11-30 13:53:55 +01:00
dfr1238
00118445c1
Update Stringtable.xml
make it change from crlf to lf
2019-11-30 16:45:04 +08:00
dfr1238
318e931974
add final missing string on tchinese translate 2019-11-29 23:16:53 +08:00
dfr1238
2db6aa4f9a
Update stringtable.xml 2019-11-29 17:26:24 +08:00
dfr1238
eb4f76392d
Update /spectator/stringtable.xml
add missing string on tchinese
2019-11-29 17:22:28 +08:00
dfr1238
aa83c28b52
Add\update\fix /chemlights/stringtable.xml
add missing string on tchinese
and fix some wrong number on other language
2019-11-29 17:20:54 +08:00
dfr1238
ab99435bac
Update /common/stringtable.xml
fix dup string
2019-11-29 17:01:20 +08:00
dfr1238
bb0b531487
Update /realisticnames/stringtable.xml 2019-11-29 16:58:32 +08:00
dfr1238
ba8bd11dab
Update /common/stringtable.xml
add missing string on tchinese
2019-11-29 16:54:57 +08:00
dfr1238
23d5734c18
Update /cookoff/stringtable.xml
add missing string on tchinese
2019-11-29 16:50:27 +08:00
dfr1238
5b1b70643a
Update /flashsuppressors/stringtable.xml
translate unit to tchinese
2019-11-29 03:03:08 +08:00
dfr1238
c92430dd36
Update /ballistics/stringtable.xml
Translate unit and full ammo name to tchinese
2019-11-29 02:59:43 +08:00
dfr1238
243aff4f85
fix duplicate chinese string 2019-11-29 02:18:23 +08:00
dfr1238
364dde2f5c
Update /vehicles/stringtable.xml
Add missing string on tchinese
2019-11-29 02:10:16 +08:00
dfr1238
61dca5f0b0
Update /repair/stringtable.xml
Add missing string on tchinese
2019-11-29 02:02:47 +08:00
dfr1238
a52f8592d6
Update /addons/csw/stringtable.xml
make some weapon name same with /addons/realisticnames/stringtable.xml
2019-11-29 01:57:33 +08:00
dfr1238
9ae6815d1c
Update /quickmount/stringtable.xml
Add missing string on tchinese
2019-11-29 01:52:02 +08:00
dfr1238
f77b25014f
Update /mk6mortar/stringtable.xml
translate unit on tchinese
2019-11-29 01:47:58 +08:00
dfr1238
4bb6cb8a4d
Update /microdagr/stringtable.xml
Add\Update tchinese translate
2019-11-29 01:45:27 +08:00
dfr1238
59bc8b6dcc
Update /medical_treatment/stringtable.xml
Translate a lot string to tchinese
2019-11-29 01:42:54 +08:00
dfr1238
cf51bbdb6d
Update again
well chinese have many d-mn meaning,in one english word
2019-11-29 01:09:41 +08:00
dfr1238
d9b5d3c646
Update tchinese string
some medical string update from tchinese wiki
2019-11-29 00:59:23 +08:00
dfr1238
b973414fe9
Update /medical_status/stringtable.xml
Add missing string on tchinese
2019-11-29 00:51:01 +08:00
dfr1238
df1f51a95c
Update /medical_gui/stringtable.xml
Add missing string on tchinese
2019-11-29 00:47:31 +08:00
dfr1238
4f6867393f
Update /medical_feedback/stringtable.xml
Add missing string on tchinese
2019-11-29 00:40:56 +08:00
dfr1238
b358f2fa29
Update /medical_damage/stringtable.xml
Add tchinese translate
2019-11-29 00:38:03 +08:00
dfr1238
22d063d707
Update /medical_blood/stringtable.xml
Add missing string on tchinese
2019-11-29 00:24:51 +08:00
dfr1238
aa0898154d
Update /medical_ai/stringtable.xml
Add missing string on tchinese
2019-11-29 00:21:30 +08:00
dfr1238
9f6f838765
Update /interaction/stringtable.xml
Add missing string on tchinese
2019-11-29 00:17:58 +08:00