Commit Graph

2238 Commits

Author SHA1 Message Date
jaynus
761fef39c8 working save. 2015-04-13 15:34:51 -07:00
jaynus
ff858c1194 Begin stateful guidance. Re-write of TOP down because it wasnt even running. LIN was default. but it was broken anyways. 2015-04-13 09:56:15 -07:00
jaynus
e5d8fe2634 Guidance timing per FPS fixes. 2015-04-13 09:24:28 -07: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
jaynus
2d6b2f9a1a I had accidently commented out seeker FOV on the Titan rockets. 2015-04-13 08:33:03 -07:00
Grzegorz
ec381699ca fix missing class
Am I doin it right?
Works for me.
2015-04-13 16:48:14 +02:00
bux578
cba66366bd fix invalid xml 2015-04-13 15:25:51 +02:00
bux578
8c24d9ec35 fix invalid xml, fix duplicate keys 2015-04-13 15:25:30 +02:00
KoffeinFlummi
363a6b3738 Fix erroneus tag in nametags stringtable
Re: f6c7d444
2015-04-13 14:32:55 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
KoffeinFlummi
b93cf4fb4a Merge branch 'polish-merge' 2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
commy2
fce7c4d0be manual merge 2015-04-13 12:52:47 +02:00
Kllrt
915ac46e04 Very small typo in CZ translation
-.-
2015-04-13 11:00:47 +02:00
PabstMirror
bf3e3d3b64 #542 - ACE_fakeWeapon not found 2015-04-13 03:46:42 -05:00
PabstMirror
7111cdd8ff #540 - remove debug spam 2015-04-13 03:16:33 -05:00
PabstMirror
2a015482a1 Old Interaction Events (1713999 is long dead) 2015-04-13 01:03:08 -05:00
PabstMirror
878bdadbb3 Switch clientInit to postInit 2015-04-13 00:46:45 -05:00
PabstMirror
70dbae5a25 #527 - Unconscious switching groups 2015-04-13 00:32:07 -05:00
PabstMirror
669dbe10c9 BecomeLeader - Don't create new group 2015-04-13 00:23:00 -05:00
PabstMirror
b50a7a0147 Try to fix degree symbol (encoding issue) 2015-04-12 22:56:46 -05: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
Anthariel
3e8c8384cf Update stringtable.xml
Missing translation
2015-04-13 02:24:13 +02:00
Anthariel
8339d15087 Update stringtable.xml
Added: French translations (note, I've already removed a % at the line 30
2015-04-13 02:21:57 +02:00
Anthariel
7a8cd684a3 Update stringtable.xml 2015-04-13 02:19:58 +02:00
Anthariel
2939862e8c Update stringtable.xml 2015-04-13 02:12:56 +02:00
Anthariel
d9f9dffbc0 Update stringtable.xml 2015-04-13 02:11:12 +02:00
Anthariel
e176df4636 Update stringtable.xml 2015-04-13 02:10:23 +02:00
Anthariel
7523dd011f Update stringtable.xml 2015-04-13 02:06:17 +02:00
Anthariel
161866a8e5 Update stringtable.xml 2015-04-13 02:05:36 +02:00
Anthariel
67be340360 Update stringtable.xml 2015-04-13 02:05:15 +02:00
Nou
8df26b3246 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 17:03:16 -07:00
Nou
98acdc4089 M22 binocular mil reticle ported from ACE2. 2015-04-12 17:03:11 -07:00
Anthariel
77058857e6 Update stringtable.xml
Wrong translation
2015-04-13 02:02:19 +02:00
jaynus
0c3caffe89 Merge pull request #501 from acemod/network_lasers
Break all the lasers. Continuing expansion work is in #535
2015-04-12 16:47:24 -07:00
jaynus
fd4cb50d3d Remove thermal, prep for coding. 2015-04-12 16:44:39 -07:00
jaynus
db5d54dffd Only allow for laser designator for vanilla compensation. 2015-04-12 16:38:43 -07:00
Anthariel
0e925bc006 Update stringtable.xml 2015-04-13 01:31:49 +02:00
Anthariel
bd28f08559 Update stringtable.xml 2015-04-13 01:30:50 +02:00
Anthariel
c2253cf199 Update stringtable.xml 2015-04-13 01:30:16 +02:00
PabstMirror
74967910a3 opps 2015-04-12 18:27:55 -05:00
PabstMirror
d50bff866b addToInventory use addMagazineArray -maybe fix #530 2015-04-12 18:27:25 -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
Anthariel
9bb865a73f Update stringtable.xml 2015-04-13 01:18:24 +02:00
Anthariel
2ec9b94083 Update stringtable.xml
Fixed: Wrong translation (thx Dirtyhank)
2015-04-13 01:18:04 +02:00