Commit Graph

339 Commits

Author SHA1 Message Date
Thomas Kooi
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
commy2
a9578ab473 Merge pull request #3524 from acemod/fixCancelAction
Fix Cancel (RMB) Action
2016-03-06 19:16:40 +01:00
jonpas
858c68f8d7 Don't use modifier for rotation where not needed 2016-03-06 16:54:27 +01:00
jonpas
52007fab6a Add sanity checks, fix explosives checks 2016-03-06 12:06:17 +01:00
Nicolás Badano
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
jonpas
ef95e278f9 Fix Cancel Action by moving it to MouseButtonDown display EH 2016-03-03 17:35:43 +01:00
esteldunedain
e0493458c0 Reduce interaction distance for defusing back to 1m 2016-03-02 16:19:38 -03:00
esteldunedain
928a9b9485 Increase interaction distance with explosives from 1m to 1.5m. Fix #3379 2016-03-02 15:25:41 -03:00
jonpas
4918dbacb0 Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH 2016-03-02 17:33:46 +01:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +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
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
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
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
NorXAengell
0006f72663 Minor correction in explosive 2016-02-26 19:38:51 +01:00
NorXAengell
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
System98
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
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
Nicolas Diego Badano
5af4e1ca25 Fix trace 2016-02-24 12:17:48 -03:00
Nicolas Diego Badano
c6f6e4e9f7 Let this finally fix it please 2016-02-24 12:14:47 -03:00
esteldunedain
b32732cad0 Delete the logic and group after used 2016-02-23 19:29:18 -03:00
esteldunedain
66fa18888e Use the logic directly to determine client 2016-02-23 18:53:33 -03:00
esteldunedain
f9ef100fad Broadcast client 2016-02-23 11:56:46 -03:00
esteldunedain
056244602d Get the client ID from a new logic object 2016-02-23 10:09:55 -03:00
esteldunedain
645ed3e63d Resync mine orientations in JIP. Fix #3317 2016-02-23 09:53:38 -03:00
commy2
0f7bfc0f66 Merge pull request #3389 from acemod/precompileongamestart
precompile on game start
2016-02-22 16:00:19 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
licht-im-Norden87
d4cca14929 explosives 2016-02-20 23:19:51 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
Thomas Kooi
14b526d417 Merge pull request #3272 from acemod/deadmanBombVest
Deadman switch - trigger explosives in inventory
2016-02-20 17:11:06 +01:00
PabstMirror
ed653456e5 Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
bux578
93e655588b Merge pull request #3294 from gienkov/pltranslations
pl translation
2016-02-18 19:38:43 +01:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
gienkov
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
VKing
f92b798586 Switch to select (is even slightly faster) 2016-02-07 13:09:01 +01:00
PabstMirror
9b3ca2822f Change german stringtable 2016-02-05 14:46:30 -06:00
PabstMirror
deac4395c1 Deadman switch - trigger explosives in inventory
Also allow manual triggering of the deadman device
2016-02-05 11:40:11 -06:00
Thomas Kooi
8c9523e36b Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers
Various explosives enhancements
2016-02-04 19:56:27 +01:00
Thomas Kooi
e0946c3fc5 Merge pull request #3106 from acemod/explEvents
Explosive events, fix #3104
2016-02-04 19:52:10 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
78729e96ff Fix bad forceWalk params 2016-01-24 11:39:59 -06:00
VKing
9501c54530 Fix #3203 IEDs magically changing shape 2016-01-22 14:21:25 +01:00