PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
PabstMirror
43a9865fa2
Use isNil for better future compatiblity
2015-12-16 12:10:53 -06:00
PabstMirror
360bdcb50e
Optics - Don't modify camera for ThreeDen Editor
...
Fix broken ThreeDen Camera when returning to editor from preview.
PIP will still work in preview.
Will have to take a look at 1.56 RC to see if command exists and
eventually cleanup.
2015-12-16 11:28:43 -06:00
commy2
e422388484
fix waitUntil capitalization
2015-11-30 17:28:01 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
.
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
1ec4556bb8
fix zeus forced interface broken, fix #2642
2015-09-29 02:48:22 +02:00
commy2
c18af0d34b
completely prevent ace_optics from interfering with any mission camera scripts
2015-08-30 19:30:44 +02:00
commy2
74dfd73167
fix issues with pip optics camera in virtual arsenal
2015-08-30 19:05:35 +02:00
commy2
8d589ea8f0
solution for custom cameras (for intros) being broken with ACE
2015-08-30 15:50:51 +02:00
ViperMaul
5ea98143e2
Merge pull request #2211 from jonpas/integrateAsdg
...
Integrated ASDG JR Optional
2015-08-26 17:53:32 -07:00
jonpas
d71c43b91c
Fixed unknown char
2015-08-19 17:12:39 +02:00
jonpas
9fd155f3ec
Integrated ASDG JR Optional
2015-08-19 17:11:15 +02:00
jonpas
de033f0ff2
README.md files added to all modules
2015-08-19 04:18:33 +02:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
jonpas
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
jonpas
6f6f2a55f0
Stringtable fixes except medical
2015-05-27 21:43:30 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
PabstMirror
30adc2d463
Patch Merge of PR #1156 - Optics for tripplehead
2015-05-27 11:28:06 -05:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Bla1337
cfbf3bd053
Localization update
2015-04-29 11:20:21 +03:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
commy2
ae80da7492
fix cameras breaking pip scope camera r2t texture, reenable PIP scopes in arsenal
2015-04-19 00:05:54 +02:00
jaynus
e83ab4049f
Fixed: Tabs everywhere.
2015-04-17 07:30:55 -07:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +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
commy2
0214d891e1
fix misc issues with optics, fix #537
2015-04-13 12:04:43 +02:00
Nou
98acdc4089
M22 binocular mil reticle ported from ACE2.
2015-04-12 17:03:11 -07: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
5101a21beb
Remove "Original" stringtable entries
2015-04-12 04:21:06 +02:00
commy2
5a5a1fd66a
ACE_optic_SOS_PIP - iron sight was missing, fix #470
2015-04-11 13:18:45 +02:00
commy2
ec29cdd731
remove forgotten debug item, .MD for optics, fix #439
2015-04-10 19:34:44 +02:00
licht-im-Norden87
c18f7cafa6
Update stringtable.xml
2015-04-10 00:34:04 +02:00
PabstMirror
2033676e81
another undef to Make PBO-Project Happy
2015-04-08 18:20:00 -05:00
commy2
d496cabbbb
remove obsolete folder from TO_MERGE folder
2015-04-04 14:38:49 +02:00
commy2
a5b071912f
CfgPreloadtextures for optics
2015-04-04 13:15:27 +02:00
commy2
b7fa2bd8b3
disable pip scopes in arsenal
2015-04-04 12:06:20 +02:00
commy2
5fdd93587c
localization
2015-04-04 09:16:41 +02:00
commy2
ea275b1e52
2d with and without PIP
2015-04-04 08:51:22 +02:00
commy2
98d217d97e
handle 2d optics recoil
2015-04-04 06:19:19 +02:00
commy2
9968bc132c
get a pip scope to work
2015-04-03 22:30:29 +02:00
commy2
025c1ef63f
simplify optics
2015-04-03 19:25:28 +02:00
commy2
b0575bad21
improve infoDisplayChanged EH
2015-04-03 17:50:52 +02:00
commy2
6d3ddfeb5e
2d scripted optics
2015-04-03 12:33:12 +02:00