Commit Graph

214 Commits

Author SHA1 Message Date
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
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
27c6934ff2 Merge pull request #2230 from SzwedzikPL/interactions_lamps
Interaction with portable lamps
2016-02-20 16:47:28 +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
c456e1a631 Merge pull request #3214 from acemod/cba23
Changes for CBA 2.3
2016-02-17 15:33:42 -06:00
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
388b00f58c remove unnecessary code, aesthetic tweak 2016-02-10 01:38:14 +01:00
5f0a2b1945 use event system, polish translation 2016-02-05 04:26:54 +01:00
7b8be590b4 Merge branch 'acemod/master' into interactions_lamps 2016-02-05 01:43:06 +01:00
a3f80dbc30 Merge pull request #3230 from acemod/draggingStuff
Fix dragging moving object to random location
2016-02-04 19:58:56 +01:00
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
af6b084ba3 Don't allow carrying with injured legs
Fix #2644
2016-01-28 23:05:55 -06:00
3f1d6ffeb7 Fix dragging sending objects to random location
attachTo seems to have weird getpos results for a few frames.
also don't show mouse wheel option for carrying man
and always use 0 offset for dragging man
2016-01-28 17:11:05 -06:00
d9eafbdf0f Privates / Headers 2016-01-28 12:52:53 -06:00
276aea04c1 Changes for CBA 2.3 2016-01-24 11:41:10 -06:00
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
9a3972de76 Unified Status Effect Handler 2016-01-19 09:39:05 -06:00
3854a5c989 Merge pull request #3109 from acemod/ThingX
fix ThingX capitalization, fix #3076
2016-01-05 21:52:42 +01:00
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
2d152675fc Add: IT small translations, DE removed duplicate 2016-01-03 13:02:01 +01:00
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
ced94d73a7 Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
2015-11-28 20:51:39 +01:00
e2763dde27 Russian Translations - Update 2015-11-05 03:28:53 +03:00
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
03b82e5859 Adjusted interaction nod, changed carrying height for he barrier. 2015-11-01 22:38:55 +01:00
100c20fc83 Fixed missing strings
XEH_ENABLED
carryPosition
carryDirection
dragPosition
dragDirection
2015-11-01 20:33:18 +01:00
b82350baa2 Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable.
I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.
2015-10-28 21:33:00 +01:00
ce5364d7af Added PT-BR translations
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
f57eb08ce5 Merge pull request #2620 from jonpas/sittingFramework
Sitting Framework
2015-10-18 12:26:53 +02:00
98f6bb3589 Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps
Conflicts:
	addons/cargo/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/interaction/XEH_preInit.sqf
	addons/interaction/stringtable.xml
2015-10-15 11:49:08 +02:00
ba42e3e295 pl string for dragging, tactical ladder 2015-09-29 22:12:11 +02:00
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
2ab58ab9ce Replaced common,isAlive function with alive command 2015-09-27 02:23:56 +02:00
ae07a71b0d Minimized XEH to ThingX config level 2015-09-27 02:13:32 +02:00
cd510c8ff7 Added carrying to chairs 2015-09-27 02:05:38 +02:00
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
19bfa478d1 Revert use of param in action string 2015-08-26 10:13:30 +02:00