Grzegorz Sikora
|
44466e8be8
|
Remove tabs and repair errors @Glowbal found
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
|
2015-05-12 18:27:27 +02:00 |
|
PabstMirror
|
ce1255bb2f
|
Fix configProperties
|
2015-05-01 17:56:04 -05:00 |
|
Lukas
|
1d3f5cc312
|
Czceh translation
|
2015-05-02 00:04:50 +02:00 |
|
jaynus
|
e4567fb59f
|
Merge remote-tracking branch 'origin/master' into guidanceClassFixes
Conflicts:
addons/javelin/functions/fnc_onOpticDraw.sqf
|
2015-05-01 06:59:28 -07:00 |
|
jaynus
|
9997b6d464
|
action is select 1
|
2015-05-01 06:57:49 -07:00 |
|
Glowbal
|
131468f0d8
|
plurals
|
2015-04-30 22:39:33 +02:00 |
|
Glowbal
|
1ca0d66f30
|
Initial categories
|
2015-04-30 22:02:20 +02:00 |
|
jaynus
|
7568773ece
|
class localize and disable all guidance/locking.
|
2015-04-30 09:00:09 -07:00 |
|
Glowbal
|
8f3d8707cc
|
Should be select
Should fix the new script error after last fix.
|
2015-04-30 08:53:43 +02:00 |
|
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 |
|
Glowbal
|
7dc8a08b89
|
Replaced _currentshooter by _this
Fixes script error `Error Undefined variable in expression: _currentshooter`
|
2015-04-24 20:03:04 +02:00 |
|
jaynus
|
0c6786a138
|
use the vehicle of the player for variables, not the player. allows static optics. FIxes #808
|
2015-04-22 08:07:58 -07:00 |
|
jaynus
|
d63de3a09e
|
restart PFH on optic reload. Fixes #812
|
2015-04-22 07:49:18 -07:00 |
|
bux578
|
0f2e4c22b7
|
Merge pull request #749 from FreeZbe/master
French: updates / fixes stringtable
|
2015-04-18 21:16:07 +02:00 |
|
jaynus
|
87337bcb7a
|
ace_javelin privates
|
2015-04-18 10:50:22 -07:00 |
|
jaynus
|
9c076364ec
|
Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff.
|
2015-04-18 10:18:33 -07:00 |
|
FreeZbe
|
f55bd5a629
|
French: updates / fixes stringtable
|
2015-04-18 18:49:46 +02:00 |
|
jaynus
|
d1e03d8e7a
|
Slight tweaks.
|
2015-04-18 09:40:46 -07:00 |
|
jaynus
|
6c3e699fdb
|
tabs
|
2015-04-17 07:28:19 -07:00 |
|
jaynus
|
ce4a9c3676
|
Apply javelin guidance to static titans.
|
2015-04-16 11:32:47 -07:00 |
|
KoffeinFlummi
|
11f9478035
|
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
|
2015-04-16 18:31:31 +02:00 |
|
PabstMirror
|
9c9136ae91
|
Stringtable cleanup
|
2015-04-16 02:54:50 -05:00 |
|
KoffeinFlummi
|
1b67b2df26
|
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
|
2015-04-15 22:20:47 +02:00 |
|
jaynus
|
25b7f779f1
|
Difficulty magic.
|
2015-04-15 10:11:13 -07:00 |
|
jaynus
|
ea2281616e
|
Enable all variants of Titan. Can now vanilla-lock in cadet mode.
|
2015-04-15 09:55:40 -07:00 |
|
jaynus
|
5923f246fd
|
Fixed: only exit on shooter.
|
2015-04-15 09:25:19 -07:00 |
|
jaynus
|
c793df4848
|
Changed: Safety mode on Titan, it now doesnt show as unloaded Fixed: Some TOP shots would miss, Fixed: Lock constraints would show on fast weapon switch.
|
2015-04-15 09:10:00 -07:00 |
|
Ivan Navarro Cabello
|
40b784fb7a
|
update stringtable
added spanish translate
|
2015-04-15 17:41:10 +02:00 |
|
jaynus
|
0d28a890e1
|
Fixes: Cycle fire mode on Titan was not working. Closes #603
|
2015-04-15 08:19:21 -07:00 |
|
KoffeinFlummi
|
8b915380b7
|
Merge branch 'hungarian-merge'
|
2015-04-15 13:55:02 +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 |
|
Marco
|
d1936d8e1b
|
Update stringtable.xml
Italian
|
2015-04-15 11:06:42 +02:00 |
|
jaynus
|
24830f815f
|
random lock interval was causing phasing.
|
2015-04-14 11:18:16 -07:00 |
|
jaynus
|
511ca860e0
|
Merge pull request #579 from acemod/moreJavelinLockingFixes
More javelin locking + UI fixes
|
2015-04-14 10:40:51 -07:00 |
|
jaynus
|
f0940707be
|
Disable locking on unloaded. Closes #539
|
2015-04-14 10:27:37 -07:00 |
|
jaynus
|
6f3ce27894
|
Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite
|
2015-04-14 10:25:08 -07:00 |
|
KoffeinFlummi
|
63fe4118d4
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
|
2015-04-14 14:48:13 +02:00 |
|
Harakhti
|
1b60a335a5
|
Translation: J to M
I feel burned out. This was very specifically long and tedious.
|
2015-04-13 23:03:09 +02:00 |
|
jaynus
|
3e7c8ca634
|
remove optic debug.
|
2015-04-13 09:03:19 -07:00 |
|
jaynus
|
6aa9f5bcbc
|
NFOV/WFOV
|
2015-04-13 09:01:18 -07:00 |
|
jaynus
|
c66f99faac
|
Fixed: Locking reticles would lock out-of-order. Fixed: Locking was hard. Fixes #539
|
2015-04-13 08:59:36 -07:00 |
|
KoffeinFlummi
|
f6c7d444e1
|
Merge https://github.com/Anthariel/ACE3 into french-merge
|
2015-04-13 13:31:48 +02:00 |
|
KoffeinFlummi
|
118b5509ea
|
Merge https://github.com/gienkov/ACE3 into polish-merge
|
2015-04-13 13:00:59 +02:00 |
|
PabstMirror
|
7719da2f66
|
Javelin Localiztion
|
2015-04-12 22:45:55 -05:00 |
|
PabstMirror
|
36b92b3d44
|
Don't do client stuff on dedicated.
|
2015-04-12 22:44:19 -05:00 |
|
jaynus
|
9a25fb4f2f
|
Remove debug.
|
2015-04-12 16:19:18 -07:00 |
|
jaynus
|
4bd489cd96
|
Fixed: Javelin CLU UI should have been a PFH not a draw. Migrated. Closes #531
|
2015-04-12 16:18:39 -07:00 |
|
PabstMirror
|
807ebd8bfe
|
Resave reticle_titan in objectBuilder
|
2015-04-12 17:14:30 -05:00 |
|
jaynus
|
c9e2eb0869
|
Changed: no-crosshair reticle for Titan by BlackPixxel
|
2015-04-12 14:05:12 -07:00 |
|
KoffeinFlummi
|
614afa8537
|
Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/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/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-12 14:27:59 +02:00 |
|