Commit Graph

347 Commits

Author SHA1 Message Date
9bd66bc40f Cleanup scopeCurator 2016-04-21 15:07:13 -05:00
c432ce714e Make explosives helpers hidden in eden. 2016-04-21 13:56:32 -05:00
076803951d Merge pull request #3628 from alef/translation/15bn/alef
Italian translation
2016-03-31 06:54:31 +02:00
666a4030b5 make FUNC(scriptedExplosive) work in scheduled env, ref #3621 2016-03-29 13:21:13 +02:00
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
a9578ab473 Merge pull request #3524 from acemod/fixCancelAction
Fix Cancel (RMB) Action
2016-03-06 19:16:40 +01:00
858c68f8d7 Don't use modifier for rotation where not needed 2016-03-06 16:54:27 +01:00
52007fab6a Add sanity checks, fix explosives checks 2016-03-06 12:06:17 +01:00
9f205b4a54 Merge pull request #3509 from acemod/fix3379
Increase interaction distance with explosives from 1m to 1.5m.
2016-03-05 22:08:31 -03:00
ef95e278f9 Fix Cancel Action by moving it to MouseButtonDown display EH 2016-03-03 17:35:43 +01:00
e0493458c0 Reduce interaction distance for defusing back to 1m 2016-03-02 16:19:38 -03:00
928a9b9485 Increase interaction distance with explosives from 1m to 1.5m. Fix #3379 2016-03-02 15:25:41 -03:00
4918dbacb0 Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH 2016-03-02 17:33:46 +01:00
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
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
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
188941a9b7 Filter the GVAR(explosivesOrientations) list before sending it 2016-02-27 10:07:51 -03:00
fba1a322ac Yet more fixes 2016-02-27 09:50:44 -03:00
823eb116ae more fixes 2016-02-27 09:37:57 -03:00
8280335d07 Fix event name typo 2016-02-27 09:26:42 -03:00
b9e1028f23 Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317 2016-02-27 09:14:16 -03:00
834cbb4d24 Debug stuff 2016-02-27 09:14:07 -03:00
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
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
0006f72663 Minor correction in explosive 2016-02-26 19:38:51 +01:00
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
48d312cb8e Add german translations
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
2016-02-25 18:10:26 +01:00
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
5af4e1ca25 Fix trace 2016-02-24 12:17:48 -03:00
c6f6e4e9f7 Let this finally fix it please 2016-02-24 12:14:47 -03:00
b32732cad0 Delete the logic and group after used 2016-02-23 19:29:18 -03:00
66fa18888e Use the logic directly to determine client 2016-02-23 18:53:33 -03:00
f9ef100fad Broadcast client 2016-02-23 11:56:46 -03:00
056244602d Get the client ID from a new logic object 2016-02-23 10:09:55 -03:00
645ed3e63d Resync mine orientations in JIP. Fix #3317 2016-02-23 09:53:38 -03:00
0f7bfc0f66 Merge pull request #3389 from acemod/precompileongamestart
precompile on game start
2016-02-22 16:00:19 +01:00
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
d4cca14929 explosives 2016-02-20 23:19:51 +01:00
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
14b526d417 Merge pull request #3272 from acemod/deadmanBombVest
Deadman switch - trigger explosives in inventory
2016-02-20 17:11:06 +01:00
ed653456e5 Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
93e655588b Merge pull request #3294 from gienkov/pltranslations
pl translation
2016-02-18 19:38:43 +01:00
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
f92b798586 Switch to select (is even slightly faster) 2016-02-07 13:09:01 +01:00