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 |
|
KoffeinFlummi
|
59952441d8
|
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
|
2015-04-12 06:22:17 +02:00 |
|
KoffeinFlummi
|
c6efd4e546
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
|
2015-04-12 05:39:46 +02:00 |
|
jaynus
|
6e28b3b9b7
|
Disable gates (reload)
|
2015-04-11 13:59:17 -07:00 |
|
jaynus
|
d744074b2f
|
localization.
|
2015-04-11 13:48:46 -07:00 |
|
jaynus
|
2418d99f97
|
Finalizes port. Closes #75
|
2015-04-11 13:41:00 -07:00 |
|
jaynus
|
75216c2f8b
|
readme, authors.
|
2015-04-11 13:39:16 -07:00 |
|
jaynus
|
2999ff55e1
|
Working javelin targeting and gating. Still has red center target optic because I cant do optic p3d's. TODO: We need an optic p3d.
|
2015-04-11 13:37:55 -07:00 |
|
jaynus
|
505005891d
|
Remove debug, targeting constraints working.
|
2015-04-11 12:42:30 -07:00 |
|
jaynus
|
458958ef09
|
Target gating implemented.
|
2015-04-11 11:17:34 -07:00 |
|
jaynus
|
aa53a1815c
|
scaling.
|
2015-04-11 10:58:27 -07:00 |
|
jaynus
|
fb6c99d69b
|
re-path. Wtf safezones.
|
2015-04-11 10:56:58 -07:00 |
|
jaynus
|
efaee770bb
|
rename wep_javelin to javelin
|
2015-04-11 10:44:13 -07:00 |
|