KoffeinFlummi
|
a1e709047e
|
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-29 12:52:55 +02:00 |
|
commy2
|
aabe532829
|
manual merge
|
2015-04-26 21:26:57 +02:00 |
|
VyMajoris
|
523cb49ff1
|
Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
|
2015-04-26 03:09:16 -03:00 |
|
commy2
|
9cb27c8fb2
|
fix: error when getting killed with FF-messages module, fix #745
|
2015-04-19 07:08:57 +02:00 |
|
KoffeinFlummi
|
65fd6b0937
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
|
2015-04-19 01:04:32 +02:00 |
|
FreeZbe
|
f55bd5a629
|
French: updates / fixes stringtable
|
2015-04-18 18:49:46 +02:00 |
|
PabstMirror
|
ed2e847247
|
More Privates
|
2015-04-17 18:13:09 -05:00 |
|
PabstMirror
|
dce344c85f
|
Ignore Case
|
2015-04-17 16:51:27 -05:00 |
|
Grzegorz Sikora
|
7489e514ce
|
PL translation
|
2015-04-17 21:48:04 +02:00 |
|
EpMAK
|
31a2f1b279
|
Russian translations
Again, filling strings, fixing errors
|
2015-04-17 19:36:07 +03:00 |
|
KoffeinFlummi
|
20e4858a0d
|
Merge https://github.com/ramius86/ACE3 into italian-merge
|
2015-04-17 15:44:50 +02:00 |
|
EpMAK
|
c2214efeb1
|
Russian stringtables finished
Filled all the missing lines, little errors fixed.
|
2015-04-17 14:54:28 +03:00 |
|
Ivan Navarro Cabello
|
61d1e6854e
|
added spanish translation
added spanish translation to ballistics and respawn
|
2015-04-16 19:03:15 +02:00 |
|
Marco
|
13de953aab
|
Update stringtable.xml
IT
|
2015-04-16 10:23:34 +02:00 |
|
commy2
|
d68cc8f40e
|
sync rallypoint marker on jip
|
2015-04-15 20:50:03 +02:00 |
|
commy2
|
18be5276a9
|
rally point moved eh, markers at rallypoint positions
|
2015-04-15 19:18:42 +02:00 |
|
commy2
|
9c1b40f5a3
|
preparing for improved positions of action points
|
2015-04-15 16:40:20 +02:00 |
|
commy2
|
bf8f9b4818
|
all I need is a $
|
2015-04-15 15:34:01 +02:00 |
|
commy2
|
e3d1946924
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
|
2015-04-15 14:37:49 +02:00 |
|
KoffeinFlummi
|
2ffbccbf20
|
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
|
2015-04-15 12:59:56 +02:00 |
|
commy2
|
09289fbf48
|
only on server though
|
2015-04-15 08:34:30 +02:00 |
|
commy2
|
6c4e50a98d
|
localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot
|
2015-04-15 08:31:40 +02:00 |
|
Niko Lehtovirta
|
df8a958c42
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-15 06:45:42 +03:00 |
|
commy2
|
2940d1f83c
|
base rallypoints create a respawn marker if none is present in the mission
|
2015-04-15 03:10:17 +02:00 |
|
commy2
|
4cdf61ab9e
|
fix misc issues with rallypoints
|
2015-04-15 01:50:58 +02:00 |
|
commy2
|
7c5a6538a9
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
|
2015-04-15 00:06:12 +02:00 |
|
KoffeinFlummi
|
63fe4118d4
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
|
2015-04-14 14:48:13 +02:00 |
|
commy2
|
ea7659a36e
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
|
2015-04-14 13:36:02 +02:00 |
|
Harakhti
|
8bfd915ec4
|
Translation: N to R
This was a lot more fun than the previous two were. 12 folders left...
|
2015-04-13 23:45:44 +02:00 |
|
Kllrt
|
1c611ba2db
|
Added another new CZ strings
|
2015-04-13 21:15:04 +02:00 |
|
Niko Lehtovirta
|
21c9272293
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-13 15:37:38 +03:00 |
|
KoffeinFlummi
|
f6c7d444e1
|
Merge https://github.com/Anthariel/ACE3 into french-merge
|
2015-04-13 13:31:48 +02:00 |
|
commy2
|
f94b4befef
|
initial commit
|
2015-04-13 13:04:23 +02:00 |
|
KoffeinFlummi
|
118b5509ea
|
Merge https://github.com/gienkov/ACE3 into polish-merge
|
2015-04-13 13:00:59 +02:00 |
|
FreeZbe
|
45ff6c7ce9
|
French: (Nearly) Complete French translations
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
|
2015-04-12 14:15:45 +02:00 |
|
KoffeinFlummi
|
c6efd4e546
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
|
2015-04-12 05:39:46 +02:00 |
|
EpMAK
|
21abff3713
|
Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
|
2015-04-11 21:33:34 +03:00 |
|
EpMAK
|
ea04f4ab3e
|
Revert "Russian Translation"
This reverts commit 17a552bb80.
|
2015-04-11 21:33:07 +03:00 |
|
Niko Lehtovirta
|
4b50d760e9
|
fixed to use proper 4-space tabbing
|
2015-04-11 20:36:38 +03:00 |
|
Niko Lehtovirta
|
4a7358e05a
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-11 14:30:40 +03:00 |
|
EpMAK
|
17a552bb80
|
Russian Translation
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
|
2015-04-10 19:55:57 +03:00 |
|
EpMAK
|
68d08b8c7b
|
Revert "Translation"
This reverts commit fab5605ad5.
|
2015-04-10 19:46:18 +03:00 |
|
EpMAK
|
fab5605ad5
|
Translation
Russian translation of the texts
|
2015-04-10 17:51:48 +03:00 |
|
Niko Lehtovirta
|
9f2f660b89
|
fixed PFH to use EFUNC(common,waitAndExecute)
|
2015-04-10 16:23:27 +03:00 |
|
Legolasindar
|
19da5b366e
|
Update stringtable.xml
added spanish translation
|
2015-04-10 13:38:19 +02:00 |
|
Niko Lehtovirta
|
f0468fa7c8
|
Changed spawn code on respawn to PFH format
|
2015-04-10 14:21:52 +03:00 |
|
Anthariel
|
949cee6df4
|
Update stringtable.xml
Added: French Translation (100%)
|
2015-04-10 05:35:56 +02:00 |
|
Grzegorz
|
08590d98a3
|
respawn PL translation
|
2015-04-10 01:35:09 +02:00 |
|
PabstMirror
|
98428c42f5
|
#291 - RemoveDeadBodiesDisconnected
|
2015-04-03 01:05:14 -05:00 |
|
bux578
|
60c50e0daf
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
|
2015-03-24 19:12:23 +01:00 |
|