Commit Graph

523 Commits

Author SHA1 Message Date
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
17f647f341 PL translation 2015-08-30 01:42:42 +02:00
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
05925ad7c2 Merge pull request #1902 from acemod/virtualExplosivesPlace
Virtual explosives place
2015-08-23 16:57:24 -05:00
cf585790db fixes done 2015-08-22 11:41:15 +02:00
cc9eee5609 Typo 2015-08-21 09:42:23 -05:00
4c14dc7684 #2208 - Use ACE Message Display instead of sideChat 2015-08-19 17:25:45 -05:00
61bc40a650 Opps 2015-08-16 02:05:34 -05:00
b9638f749b SetPosition Event - Fix digging down (#1991) 2015-08-16 01:51:44 -05:00
fc6cd34d33 params, cleanup 2015-08-15 14:35:33 -05:00
7203bb2a3d Cleanup Debug, Limit Satchel Mass 2015-08-05 12:22:43 -05:00
a6292db1e8 #2018 - Dead Mans Switch / unconscious 2015-08-05 11:54:45 -05:00
72273c5ad0 Merge branch 'master' into virtualExplosivesPlace 2015-08-05 11:36:58 -05:00
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
214fda074a Merge branch 'master' into virtualExplosivesPlace 2015-07-28 15:48:37 -05:00
bfd3aa71c4 Manual Fix #1931 2015-07-28 15:25:52 -05:00
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
9b551e3fdf #1931 - Fix Explosives Module Strings 2015-07-28 14:42:23 -05:00
9f078d405b Tweak Place when Prone 2015-07-25 02:10:33 -05:00
bff629be9c Fix PositionAsl / Update mouse hints 2015-07-25 01:42:17 -05:00
bc953b32bc More Stuff 2015-07-18 00:36:47 -05:00
0154dfc51e Merge pull request #1799 from jokoho48/3DModelUpdate
Add and Update Some 3D Object and Textures
2015-07-17 08:17:42 +02:00
df90c4b88e More Attach Stuff 2015-07-16 23:59:31 -05:00
1f4488253d Only attach some triggers 2015-07-15 23:52:47 -05:00
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
fd4d4abb73 Move UAV Battery form models to data
change LoD Distance
Fix IVBag names(my issue)
2015-07-15 20:51:06 +02:00
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
2015-07-15 20:34:35 +02:00
7cc2628c53 Stuff 2015-07-15 03:18:19 -05:00
104d1a1cc7 Attaching (Rotate to verticle) 2015-07-15 02:54:38 -05:00
6130b5b373 Working Demo 2015-07-14 00:24:55 -05:00
78529af60c Update spanish translation 2015-07-08 20:57:46 +02:00
240b26b9ac Add IRStrobe 3D Object to attach
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
f4a51d57ef Translation to Brazilian Portuguese (PT-BR)
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
241e8acdd9 Merge pull request #1541 from jonpas/sitting
Sitting
2015-06-26 21:34:34 +02:00
474e694309 Enable interaction with explosives while swimming 2015-06-19 11:49:38 +02:00
c027db2e0e final fixes 2015-06-15 20:55:49 +01:00
5915e24f5d some fixes 2015-06-14 16:09:01 +01:00
0690e6f745 fixed conflicts 2015-06-14 09:36:03 +01:00
670d23e14c Fixed Black Cellphone Display after 1.46 2015-06-13 22:12:32 +02:00