ulteq
|
336a192302
|
The range card setup data is now also restored on mission start
|
2015-04-19 10:57:55 +02:00 |
|
ulteq
|
51590d39ad
|
Cleaned up the ATragMX postInit routine
|
2015-04-19 10:47:43 +02:00 |
|
ruPaladin
|
d8b96066e6
|
Rus translation (nametags)
|
2015-04-19 11:01:41 +03:00 |
|
bux578
|
b6c3cabff9
|
Merge pull request #765 from ruPaladin/patch-2
Rus translation (medical)
|
2015-04-19 09:56:09 +02:00 |
|
ruPaladin
|
45fd90c6e0
|
Rus translation (medical)
|
2015-04-19 10:49:06 +03:00 |
|
commy2
|
c9a2505031
|
Merge pull request #755 from acemod/fixoptics2
Fix for PIP scopes, fix #547
|
2015-04-19 07:46:41 +02:00 |
|
bux578
|
2dfbd0a5cd
|
Merge pull request #761 from Tachii/patch-16
Update stringtable.xml
|
2015-04-19 07:11:39 +02:00 |
|
bux578
|
daf2fbb906
|
Merge pull request #760 from Tachii/patch-15
Update stringtable.xml
|
2015-04-19 07:11:27 +02:00 |
|
bux578
|
25ac90ef8b
|
Merge pull request #759 from Tachii/patch-14
Update stringtable.xml
|
2015-04-19 07:11:06 +02:00 |
|
bux578
|
5ed0dfe463
|
Merge pull request #758 from Tachii/patch-13
Update stringtable.xml
|
2015-04-19 07:10:55 +02:00 |
|
bux578
|
fa8e954d27
|
Merge pull request #757 from Tachii/patch-12
Update stringtable.xml
|
2015-04-19 07:10:45 +02:00 |
|
commy2
|
275da6f40a
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-19 07:09:21 +02:00 |
|
commy2
|
9cb27c8fb2
|
fix: error when getting killed with FF-messages module, fix #745
|
2015-04-19 07:08:57 +02:00 |
|
bux578
|
0d86374bee
|
Merge pull request #754 from gienkov/master
PL translation
|
2015-04-19 07:08:54 +02:00 |
|
PabstMirror
|
54c5070569
|
isNull
|
2015-04-18 22:23:19 -05:00 |
|
jaynus
|
dccc869a6a
|
Merge pull request #753 from acemod/fixSettingsLocalization
Fix settings localization is done by the server instead of client
|
2015-04-18 20:09:56 -07:00 |
|
ViperMaul
|
fe92110b4d
|
Make sure you build missing files.
Even if cache says the source files has not changed.
#735
|
2015-04-18 19:16:12 -07:00 |
|
KoffeinFlummi
|
65fd6b0937
|
Merge https://github.com/EpMAK/ACE3 into russian-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
|
2015-04-19 01:04:32 +02:00 |
|
KoffeinFlummi
|
46bd51ffdf
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-19 00:51:33 +02:00 |
|
KoffeinFlummi
|
592e0d2dd3
|
Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-19 00:51:09 +02:00 |
|
jaynus
|
14faabb677
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-04-18 15:44:25 -07:00 |
|
jaynus
|
2fe7122b3e
|
Disable handoff until completed.
|
2015-04-18 15:44:07 -07:00 |
|
commy2
|
5558a6491d
|
remove weapon select in favor of the new controls from bi
|
2015-04-19 00:40:29 +02:00 |
|
KoffeinFlummi
|
8015aca0c3
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-04-19 00:40:18 +02:00 |
|
KoffeinFlummi
|
3aafa2082d
|
Merge https://github.com/nomisum/ACE3 into german-merge
Conflicts:
addons/atragmx/stringtable.xml
addons/scopes/stringtable.xml
addons/weather/stringtable.xml
|
2015-04-19 00:39:44 +02:00 |
|
Tachii
|
e62a476a90
|
Update stringtable.xml
|
2015-04-19 01:37:08 +03:00 |
|
Tachii
|
dc2c3e246e
|
Update stringtable.xml
|
2015-04-19 01:25:30 +03:00 |
|
Tachii
|
8f9796f488
|
Update stringtable.xml
|
2015-04-19 01:23:37 +03:00 |
|
Tachii
|
a9d38f5970
|
Update stringtable.xml
|
2015-04-19 01:19:32 +03:00 |
|
Tachii
|
560646e1e1
|
Update stringtable.xml
|
2015-04-19 01:18:53 +03: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
|
0bfd084024
|
extensions recompiled
|
2015-04-18 14:54:32 -07:00 |
|
jaynus
|
b3b172e13b
|
drop bad docs.
|
2015-04-18 14:46:01 -07:00 |
|
jaynus
|
41bd3cb6f5
|
documented synchronized events.
|
2015-04-18 14:43:22 -07:00 |
|
esteldunedain
|
8b389949bc
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-18 18:42:11 -03:00 |
|
esteldunedain
|
bce0d84989
|
Fix interact menu object ordering
|
2015-04-18 18:41:36 -03:00 |
|
jaynus
|
43e287dc0f
|
Added PlayerJIP event.
|
2015-04-18 14:41:17 -07:00 |
|
jaynus
|
365d6c81c4
|
Update javelin.md
Small description update just so something is here.
|
2015-04-18 14:39:51 -07:00 |
|
jaynus
|
9618fefa67
|
Merge pull request #384 from acemod/fixmass
fix falling over static weapons
|
2015-04-18 14:36:20 -07:00 |
|
jaynus
|
a428abea84
|
Merge pull request #711 from usecforce/wiki-wording
Wiki wording
|
2015-04-18 14:24:31 -07:00 |
|
ulteq
|
21c772aa8d
|
Fixed scope adjustment conflicting with vehicle weapon zeroing
|
2015-04-18 23:14:40 +02:00 |
|
ulteq
|
454c6dfbfe
|
Added more GUI elements to structure the ATragMX main page
|
2015-04-18 22:58:23 +02:00 |
|
ulteq
|
ae3dad4f36
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-18 22:12:45 +02:00 |
|
ulteq
|
283388eb7c
|
Fixed a small calculation error in the wind speed output
|
2015-04-18 22:12:37 +02:00 |
|
commy2
|
7ac7bc3f29
|
eventhandler for creating and deleting cameras
|
2015-04-18 22:06:42 +02:00 |
|
Grzegorz
|
8dac6d3f3d
|
Update stringtable.xml
|
2015-04-18 22:03:36 +02:00 |
|
Grzegorz Sikora
|
0629b59184
|
Merge branch 'master' of https://github.com/gienkov/ACE3
Conflicts:
addons/optionsmenu/stringtable.xml
|
2015-04-18 22:02:44 +02:00 |
|
Grzegorz Sikora
|
c08125e0f3
|
PL translation
|
2015-04-18 22:00:37 +02:00 |
|
Glowbal
|
9825d030e3
|
Merge pull request #714 from acemod/localMedicalGarbage
ACE JIP data and event synchronization (Tested with Litter change)
|
2015-04-18 21:25:53 +02:00 |
|
ulteq
|
c950324c75
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-18 21:18:18 +02:00 |
|