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
9,383 Commits 73 Branches 88 Tags 752 MiB
8bcf24a9c9
Commit Graph

7744 Commits

Author SHA1 Message Date
BaerMitUmlaut
21d546ac1c Added note concerning BIS_fnc_guiMessage 2016-03-05 21:22:45 +01:00
PabstMirror
721aa94a29 Merge pull request #3536 from acemod/dediCaps 
Fix captivity system on dedicated
 2016-03-05 14:08:53 -06:00
BaerMitUmlaut
b8a4349c10 Added deployment API and waypoint 2016-03-05 20:25:35 +01:00
jonpas
9463b05218 targetEvent -> objectEvent 2016-03-05 18:16:09 +01:00
jonpas
881eaf951a Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local 2016-03-05 18:07:07 +01:00
jonpas
589ca27b60 Fix missing comma 2016-03-05 18:02:21 +01:00
jonpas
015a60e6c4 Increase fuel update to 1s 2016-03-05 17:44:03 +01:00
jonpas
401d457a46 Replace execRemoteFnc with global/targetEvent in refuel 2016-03-05 17:41:47 +01:00
jonpas
b37b1a39b2 Allow string input for isBackpack 2016-03-05 14:29:04 +01:00
PabstMirror
4826a89ef5 Fix captivity system on dedicated 
Fix #3532
 2016-03-04 11:45:38 -06:00
GitHawk
0b3abd55d3 Disallow refueling with running engine 2016-03-04 13:59:14 +01:00
PabstMirror
e3deebff7e Fix empty callback for hr adjustment 
Fix #3526
Same issue as #3384
 2016-03-03 13:23:53 -06:00
PabstMirror
53a36f8783 Add REQUIRED_CBA_VERSION macro to script_mod.hpp 2016-03-03 13:00:47 -06:00
PabstMirror
56c5343bd7 Set sandbag side to civ to show in 3den 
ref #3102 #2633
 2016-03-03 12:54:13 -06:00
jonpas
ef95e278f9 Fix Cancel Action by moving it to MouseButtonDown display EH 2016-03-03 17:35:43 +01:00
PabstMirror
137a512a9e close main display if using incompatible cba 2016-03-02 16:33:29 -06:00
commy2
e6c6e55968 Merge pull request #3507 from acemod/mouseZChangedEH 
Replace addScrollWheelEventHandler with MouseZChanged Display EH
 2016-03-02 23:15:50 +01:00
commy2
92fddff833 also fix modifier key 2016-03-02 23:14:23 +01:00
commy2
9a0c839ced Merge pull request #3508 from acemod/fix3504 
Make the FRIES inherit from Helicopter_Base_F. Fix #3504
 2016-03-02 22:28:01 +01:00
commy2
303f8d93b9 simplify inheritance 2016-03-02 22:16:40 +01:00
FFAAMOD
95007d8ccd Spanish translation of FastRope fixed 
Fixed wrong tag in Spanish Translation of Fast Rope module.
 2016-03-02 21:00:46 +01:00
esteldunedain
e0493458c0 Reduce interaction distance for defusing back to 1m 2016-03-02 16:19:38 -03:00
PabstMirror
e6a5d2dacd Add CBA 2.3.1 to versioning check 2016-03-02 13:19:20 -06:00
FFAAMOD
6b13ea287e Added Spanish Translation to fastroping module 
Added Spanish Translations, some of these can have multiple translations but according to the context, they match properly their meanings.
 2016-03-02 19:56:50 +01:00
esteldunedain
928a9b9485 Increase interaction distance with explosives from 1m to 1.5m. Fix #3379 2016-03-02 15:25:41 -03:00
esteldunedain
0399335a3f Make the FRIES inherit from Helicopter_Base_F. Fix #3504 2016-03-02 14:41:41 -03:00
jonpas
4918dbacb0 Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH 2016-03-02 17:33:46 +01:00
PabstMirror
8f620f2e61 Fix portable light floating / dir when carrying 
#3486
 2016-03-01 18:49:41 -06:00
looterz
b86e5d8ad6 Fixes player markers not showing up correctly when BFT_ShowPlayerNames is enabled in multiplayer 2016-03-01 18:23:33 -06:00
VKing
353b5e9ef4 Replace transportMax... with maximumLoad for mortar boxes. 
Fixes 3490
 2016-03-01 21:58:21 +01:00
Glowbal
e2c7576251 Remove headless client component from ACE. 
The component does not fit properly within the scope of the ACE project. In order to avoid difficulties at a later point in time, project management has decided to pull the HC component from the ACE 3.5.0 release. We are going to look into alternative options for the HC component, such as a separate repository maintained by the ACE team.
 2016-03-01 19:09:42 +01:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
esteldunedain
bafe714ab5 Remove spare barrels from starting equipment, as they make some grenades not fit in the uniforms. 2016-03-01 10:05:06 -03:00
PabstMirror
2bdeff1639 Fix for all missionVersions 2016-02-29 16:34:51 -06:00
PabstMirror
cb370c4f70 Merge branch 'release' into 3den_-1 2016-02-29 14:16:34 -06:00
PabstMirror
fe967ff2bd Don't read medic setting that is not in module 2016-02-29 14:07:15 -06:00
PabstMirror
2b3b6083cb Try to handle bad 3den mission modules 2016-02-29 14:06:14 -06:00
BaerMitUmlaut
5b4072bf50 Added vehicle existance check 2016-02-29 19:29:11 +01:00
BaerMitUmlaut
05c16a5dfb Removed TOH animations 2016-02-29 19:29:10 +01:00
BaerMitUmlaut
11a66d98e2 Cleanup & fix interaction conditions 2016-02-29 19:29:09 +01:00
PabstMirror
c0c6d3c52f Merge branch 'release' into fixFastropeRepairError 2016-02-29 12:10:34 -06:00
jonpas
7b96fe6c28 Disable logging in tagging - fix #3468 2016-02-29 16:37:19 +01:00
jonpas
f5ff593dea Revert "Convert fastroping animations to Arma 3, fix bone errors" 2016-02-28 23:16:44 +01:00
jonpas
8d326a0a1b Remove duplicate medical string 2016-02-28 22:54:24 +01:00
PabstMirror
e5b79d7b33 Don't try adding repair actions to fastrope helper 2016-02-28 14:17:14 -06:00
BaerMitUmlaut
75c2e3d032 Added QUOTE macros to fastroping configs 2016-02-28 18:56:45 +01:00
VKing
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. 
This prevents any possible confusion when the GVARs are used in code.
 2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
Thomas Kooi
6bfe86e91a Merge pull request #3455 from acemod/fix3450 
Fix #3450
 2016-02-28 13:07:03 +01:00
commy2
69f810f32b add missing pee 2016-02-28 07:25:11 +01:00
commy2
03b8e2b590 fix reloadMutex nil, fix#3450 2016-02-28 06:12:40 +01:00
PabstMirror
147cd1a5af Hide categories that have no user settable options 2016-02-27 18:06:02 -06:00
jonpas
0e606224c7 Convert fastroping animations to Arma 3, fix bone errors 2016-02-27 22:28:12 +01:00
jonpas
905586bddc Make unused medical strings be used 2016-02-27 21:04:04 +01:00
Glowbal
428b828c27 Increase version 3.5.0 2016-02-27 20:44:38 +01:00
Thomas Kooi
f758a90351 Merge pull request #3445 from acemod/preventSelfIMFromClosing 
Prevent Self Interact Menu from bugging out during animations
 2016-02-27 20:35:18 +01:00
Thomas Kooi
d0b1ac56ba Merge pull request #3440 from System98/Update-german-translations 
Update german translations
 2016-02-27 20:33:51 +01:00
esteldunedain
a86bbdb162 Prevent the interact menu from closing when moving the mouse during animations 2016-02-27 15:47:23 -03:00
ElTyranos
9d50812a65 Fastrope French translation 2016-02-27 19:46:15 +01:00
esteldunedain
121663226c Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases. 2016-02-27 15:44:53 -03:00
commy2
a7ec4d9d2f Merge pull request #3398 from acemod/fix3317 
Resync mine orientations in JIP.
 2016-02-27 16:52:53 +01:00
Thomas Kooi
a9fa3a99b8 Merge pull request #3441 from acemod/fixNametagsError 
Fix error in nametags when a player disconnects
 2016-02-27 15:17:15 +01:00
esteldunedain
30d62859dc Fix error in nametags when a player disconnects 2016-02-27 10:17:26 -03:00
esteldunedain
188941a9b7 Filter the GVAR(explosivesOrientations) list before sending it 2016-02-27 10:07:51 -03:00
esteldunedain
fba1a322ac Yet more fixes 2016-02-27 09:50:44 -03:00
esteldunedain
823eb116ae more fixes 2016-02-27 09:37:57 -03:00
esteldunedain
8280335d07 Fix event name typo 2016-02-27 09:26:42 -03:00
esteldunedain
b9e1028f23 Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317 2016-02-27 09:14:16 -03:00
esteldunedain
834cbb4d24 Debug stuff 2016-02-27 09:14:07 -03:00
esteldunedain
849fa4f1ee Redo markers, lost in the merge 2016-02-27 09:06:19 -03:00
System98
df3ec3a179 Fix length of a display name 
- Fix the length of a display name so it doesn't get cut off in the
settings.
 2016-02-27 12:51:32 +01:00
System98
a13b029b4a Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations 2016-02-27 12:50:07 +01:00
esteldunedain
db4974eae2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317 
Conflicts:
	addons/medical/CfgEden.hpp
	addons/repair/CfgEden.hpp
 2016-02-27 08:48:57 -03:00
Thomas Kooi
ae136af2d6 Merge pull request #3415 from looterz/bftplayernames 
Added Show Player Names option to Blue Force Tracking Module
 2016-02-27 12:43:15 +01:00
Thomas Kooi
a0ea724db4 Merge pull request #3436 from acemod/register-last-damage-source 
Add registering last damage source
 2016-02-27 12:42:11 +01:00
Thomas Kooi
adcfec6ff0 Merge pull request #3430 from GitHawk/refuel_ropeImprovement 
Refuel improvements
 2016-02-27 12:40:50 +01:00
Thomas Kooi
938c1f4c0a Merge pull request #2904 from BaerMitUmlaut/fastroping 
Fastroping
 2016-02-27 12:36:43 +01:00
System98
05575538e4 Fix format errors in "medical" addon 2016-02-27 12:10:40 +01:00
System98
f7253edec8 Update german translations 
- Fix some german translations
- Re-add strings in "medical" addon deleted in PR #3437
- Add german translations for previously deleted strings and update the
english texts so the purpose of the function gets clearer
 2016-02-27 12:07:57 +01:00
System98
110dd68736 Fix error in slideshow 
- Fix error in slideshow addon
 2016-02-27 10:37:52 +01:00
looterz
8b534bb4bf Fixed ACE_Settings.hpp GVAR's missing category 2016-02-26 19:00:55 -06:00
jonpas
0c79869d7a Fix duplicated English strings 2016-02-27 01:43:57 +01:00
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
Glowbal
e0a65aa543 Add registering last damage source 2016-02-26 22:58:49 +01:00
bux578
db71aa54b8 Merge pull request #3434 from NorXAengell/Traduction-Fr 
Traduction fr
 2016-02-26 21:18:40 +01:00
bux578
431b6f872c Merge pull request #3433 from licht-im-Norden87/patch-54 
German translation
 2016-02-26 21:16:54 +01:00
PabstMirror
6e29beefa1 Remove extra "(" in debug output 2016-02-26 12:48:40 -06:00
licht-im-Norden87
a5864c6f40 Merge pull request #42 from licht-im-Norden87/patch-55 
refuel
 2016-02-26 19:44:50 +01:00
licht-im-Norden87
6a6190b99d Merge pull request #43 from licht-im-Norden87/patch-57 
Update stringtable.xml
 2016-02-26 19:44:37 +01:00
NorXAengell
0006f72663 Minor correction in explosive 2016-02-26 19:38:51 +01:00
licht-im-Norden87
1c7a25cc38 Update stringtable.xml 2016-02-26 19:36:47 +01:00
licht-im-Norden87
cac13e2f4f refuel 2016-02-26 19:26:34 +01:00
licht-im-Norden87
21766e10c2 German translation 
Habe gerade Arma gestartet und dabei ist mir das ein oder andere Problem aufgefallen.
WIP
 2016-02-26 19:25:01 +01:00
NorXAengell
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
Githawk
c8e8a17111 Fixes 
- Fixed `isEngineOn` returning true on static objects
- Fixed `fnc_readFuelCounter` for objects with infinite fuel
 2016-02-26 16:35:34 +01:00
NorXAengell
8b9865b50d Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr 2016-02-26 16:33:04 +01:00
NorXAengell
212d8f45ff Merge remote-tracking branch 'refs/remotes/origin/master' into Traduction-Fr 2016-02-26 16:22:00 +01:00
System98
e587744b3e Fix text errors 
- Fix errors in "map_gestures, medical, overheating, slideshow and zeus"
addons
 2016-02-26 11:29:55 +01:00
GitHawk
7451d1ee5f Make setFuel and getFuel API 2016-02-26 10:50:02 +01:00
GitHawk
0b324336ee Initial pass 
Unified ropeDestruction
Added check before ropeCreate
 2016-02-26 10:46:12 +01:00