KoffeinFlummi
|
8f2a1735ae
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-12 14:28:28 +02: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 |
|
Nicolás Badano
|
f18f807e60
|
Merge pull request #507 from Legolasindar/master
Merge pull request #1 from acemod/master
|
2015-04-12 09:06:30 -03:00 |
|
Legolasindar
|
b665781399
|
Update stringtable.xml
updated spanish translation and added some english missed translation
|
2015-04-12 13:58:06 +02:00 |
|
Legolasindar
|
4778c716cb
|
Merge pull request #1 from acemod/master
update from original
|
2015-04-12 12:36:43 +02:00 |
|
commy2
|
7b0e7a1efb
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-12 12:04:07 +02:00 |
|
commy2
|
f16d5398f4
|
enable vector on ffv positions, fix #506
|
2015-04-12 12:03:49 +02:00 |
|
Kllrt
|
be8ff39767
|
Fixed broken missileguidaince stringtable.xml
sry
|
2015-04-12 10:58:00 +02:00 |
|
bux578
|
dcf782abb4
|
add rocks LOD issue
|
2015-04-12 10:51:15 +02:00 |
|
Glowbal
|
6bfd3e5c74
|
Merge pull request #481 from acemod/FixUnconciousAnimWhileCarrying
Fixed breaking of unconscious animation on drop object.
|
2015-04-12 09:48:27 +02:00 |
|
PabstMirror
|
78b64ea273
|
Missing English
|
2015-04-12 01:36:41 -05:00 |
|
bux578
|
2fc7f44c39
|
french translation, tabler 4 spaces test
|
2015-04-12 07:50:23 +02:00 |
|
bux578
|
0e3d971274
|
Fix translations error
|
2015-04-12 07:46:43 +02:00 |
|
Felix Wiegand
|
0efcd7d56f
|
Merge pull request #499 from gienkov/patch-2
AUTHORS.TXT / e-mail of me and ACCtomeek
|
2015-04-12 04:23:59 +02:00 |
|
KoffeinFlummi
|
fa00052c66
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-12 06:22:56 +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
|
362753209e
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-12 05:40:24 +02:00 |
|
KoffeinFlummi
|
c6efd4e546
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
|
2015-04-12 05:39:46 +02:00 |
|
KoffeinFlummi
|
5108137302
|
Merge https://github.com/Ricciardino/ACE3 into italian-merge
|
2015-04-12 04:38:46 +02:00 |
|
KoffeinFlummi
|
5101a21beb
|
Remove "Original" stringtable entries
|
2015-04-12 04:21:06 +02:00 |
|
Felix Wiegand
|
4d1e21d362
|
Merge pull request #500 from licht-im-Norden87/patch-4
Update AUTHORS.txt
|
2015-04-12 03:41:18 +02:00 |
|
licht-im-Norden87
|
a30eabfb1d
|
Update stringtable.xml
|
2015-04-12 03:30:11 +02:00 |
|
licht-im-Norden87
|
bd673d3374
|
Update stringtable.xml
|
2015-04-12 03:28:12 +02:00 |
|
licht-im-Norden87
|
bd07e18b43
|
Update stringtable.xml
|
2015-04-12 03:26:45 +02:00 |
|
licht-im-Norden87
|
200c380622
|
Update AUTHORS.txt
|
2015-04-12 03:16:42 +02:00 |
|
Grzegorz
|
2182e8b631
|
e-mail of me and ACCtomeek
|
2015-04-12 03:15:57 +02:00 |
|
PabstMirror
|
350a79c8a4
|
#498 - Use cursor mode when scoped
|
2015-04-11 19:44:42 -05:00 |
|
Felix Wiegand
|
0531f2cc12
|
Merge pull request #493 from FreeZbe/patch-7
Update stringtable.xml
|
2015-04-12 01:14:40 +02:00 |
|
Felix Wiegand
|
7d8ad37ae0
|
Merge pull request #495 from FreeZbe/patch-8
Update AUTHORS.txt
|
2015-04-12 01:14:34 +02:00 |
|
esteldunedain
|
a01864319a
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-11 19:34:53 -03:00 |
|
esteldunedain
|
488000bdf3
|
Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494
|
2015-04-11 19:34:29 -03:00 |
|
FreeZbe
|
2ccec59b80
|
Update AUTHORS.txt
|
2015-04-12 00:14:33 +02:00 |
|
PabstMirror
|
baf4b0146e
|
Missing semmicolon
|
2015-04-11 16:50:35 -05:00 |
|
PabstMirror
|
0805d5b640
|
Update UAV battery icon from AGM
|
2015-04-11 16:48:49 -05:00 |
|
FreeZbe
|
3ff6abde71
|
Update stringtable.xml
|
2015-04-11 23:18:51 +02:00 |
|
jaynus
|
1a9b25c70e
|
Merge pull request #492 from acemod/acreCompat
ACRE API functions and core functions were incorrect.
|
2015-04-11 14:14:04 -07:00 |
|
jaynus
|
2a2f96a034
|
ACRE API functions and core functions were incorrect.
|
2015-04-11 14:10:30 -07:00 |
|
EpMAK
|
8406031a6e
|
Update AUTHORS.txt
|
2015-04-12 00:03:45 +03:00 |
|
jaynus
|
ffb7c0fbaa
|
Merge pull request #488 from acemod/javelinLocking
Javelin locking and CLU interface
|
2015-04-11 14:02:41 -07:00 |
|
jaynus
|
458c49b0a7
|
Merge remote-tracking branch 'origin/master' into javelinLocking
Conflicts:
addons/common/XEH_preInit.sqf
|
2015-04-11 14:01:47 -07: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 |
|
PabstMirror
|
f5cce94b91
|
Merge pull request #136 from acemod/disarmingTest
Unit Disarming/DropGear Merge
|
2015-04-11 14:14:22 -05: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 |
|
Glowbal
|
66bd7e7e5f
|
fixed #457
|
2015-04-11 20:32:07 +02:00 |
|