Commit Graph

78 Commits

Author SHA1 Message Date
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
KoffeinFlummi
f020ff7c53 Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
	addons/disarming/stringtable.xml
2015-04-15 22:08:15 +02:00
ruPaladin
7051152d93 Update stringtable.xml 2015-04-15 19:53:42 +03:00
KoffeinFlummi
250d6acb22 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-15 16:09:40 +02:00
Marco
aaee9c72c1 Update stringtable.xml
Italian translation
2015-04-15 10:44:13 +02:00
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
bux578
9184ef479a add disarm icon, add action psd, move icon files 2015-04-12 14:47:08 +02:00
Legolasindar
4bb9f0cf77 Update stringtable.xml
added spanish translate
2015-04-12 14:27:42 +02:00
licht-im-Norden87
d0fb387255 Update Stringtable: Disarming 2015-04-12 13:45:47 +02:00
PabstMirror
c055911231 Cleanup, remove debug spam 2015-04-04 00:52:21 -05:00
PabstMirror
ee961ed1e6 Fix Dropping Unique Magazines 2015-03-29 14:47:57 -05:00
PabstMirror
0dcb1dfab8 GUI 2015-03-20 20:48:39 -05:00
PabstMirror
22483ce22e Fix ranks, and uniform/vest drop 2015-03-20 20:47:34 -05:00
PabstMirror
52623f71b8 Use Inventory Scaling Option 2015-03-20 20:27:04 -05:00
PabstMirror
38745f4871 Various Changes 2015-03-20 20:17:49 -05:00
PabstMirror
9f25641f54 Verify Mag counts, headers, check animation 2015-03-17 14:43:50 -05:00
PabstMirror
14c45afd99 Sync holder gvar 2015-02-27 18:56:15 -06:00
PabstMirror
af1544ebb9 fix name 2015-02-27 18:50:08 -06:00
PabstMirror
641cbb7f64 Dialog Stuff 2015-02-27 18:43:42 -06:00
PabstMirror
d31c19c3eb Seems like it's working 2015-02-27 18:38:23 -06:00
PabstMirror
32f67487b5 More Work 2015-02-27 16:16:35 -06:00
PabstMirror
d55aed0813 Inv Screen Rough WIP 2015-02-27 15:23:46 -06:00
PabstMirror
744f37d18a DragandDrop Frisking WIP 2015-02-22 18:44:33 -06:00
PabstMirror
69835ec7fb Fix HMD bug and disarm types 2015-02-11 14:37:18 -06:00
PabstMirror
a7004cf0e9 Disarm Types Examples 2015-02-11 02:33:18 -06:00
PabstMirror
13c9db75a7 Disarming Prototype 2015-02-10 19:55:53 -06:00