KoffeinFlummi
|
88a5609016
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-07-25 19:35:26 +02:00 |
|
KoffeinFlummi
|
9805a8270a
|
Merge branch 'master' into german-merge
|
2015-07-25 19:35:03 +02:00 |
|
PabstMirror
|
9e831d257d
|
Merge pull request #1768 from acemod/10digitGrids2
10 digit grids 2
|
2015-07-25 12:32:02 -05:00 |
|
PabstMirror
|
1b590bf0f9
|
More nametag fixes / setSetting casting
|
2015-07-23 14:05:20 -05:00 |
|
PabstMirror
|
f438c6d0c5
|
Revert "Use new worldSize command instead of whileLoop"
This reverts commit 7d26519b2e.
|
2015-07-16 18:10:10 -05:00 |
|
PabstMirror
|
7d26519b2e
|
Use new worldSize command instead of whileLoop
|
2015-07-16 17:47:39 -05:00 |
|
PabstMirror
|
b47a17230b
|
Merge branch 'master' into 10digitGrids2
|
2015-07-16 17:26:19 -05:00 |
|
SilentSpike
|
19c16b1f59
|
Comment out dev branch command
|
2015-07-04 17:40:23 +01:00 |
|
ProfessorCZ
|
89a9218e59
|
CZ Translation - Update
|
2015-07-04 15:56:00 +02:00 |
|
SilentSpike
|
909fbb5dc4
|
Merge pull request #1732 from acemod/checkPBOfix
CheckPBO should ensure client isn't running any addons the server isn't
|
2015-07-03 22:33:17 +01:00 |
|
Nicolás Badano
|
8052dd8ea3
|
Merge pull request #1782 from gienkov/pl-translation
PL translation
|
2015-07-02 23:06:13 -03:00 |
|
SilentSpike
|
d036639b46
|
Adding hideUnit functions to ace_common
|
2015-07-03 02:14:58 +01:00 |
|
gienkov
|
70862c5de9
|
PL translation
|
2015-07-02 23:55:26 +02:00 |
|
PabstMirror
|
c1dd2df57a
|
Move grid funcs and map long,lat,altitude to common
|
2015-06-30 12:26:51 -05:00 |
|
SilentSpike
|
873936dc31
|
Simplify addon checking code
|
2015-06-29 14:15:46 +01:00 |
|
ToasterBR
|
f4a51d57ef
|
Translation to Brazilian Portuguese (PT-BR)
Made all remaining translations, including new ones like the sitting
module, for example.
|
2015-06-27 15:48:39 -03:00 |
|
SilentSpike
|
e4f89a96b7
|
CheckPBO should ensure client isn't running any addons the server isn't
|
2015-06-23 15:01:55 +01:00 |
|
jonpas
|
293fa4f16b
|
Coding standards applied to common/CfgVehicles.hpp
|
2015-06-22 19:29:19 +02:00 |
|
jonpas
|
ec5cc606c3
|
Fixed CheckPBOs Whitelist default value in module
|
2015-06-22 19:24:10 +02:00 |
|
Macusercom
|
cac8dd8b02
|
German translations fixes
|
2015-06-20 02:16:30 +02:00 |
|
ViperMaul
|
85c40a4cf2
|
Merge pull request #1668 from acemod/release
Release v3.1.1 merge into Master
|
2015-06-17 19:15:35 -07:00 |
|
Macusercom
|
f1691f2562
|
Fixed a typo
|
2015-06-16 03:23:32 +02:00 |
|
Macusercom
|
24cea18ae5
|
Revert "Revert "Added German translations""
This reverts commit 4403e3c665.
|
2015-06-16 03:21:25 +02:00 |
|
Macusercom
|
4403e3c665
|
Revert "Added German translations"
This reverts commit 0adc07d284.
|
2015-06-16 03:06:23 +02:00 |
|
Macusercom
|
0adc07d284
|
Added German translations
|
2015-06-16 03:06:13 +02:00 |
|
Nicolás Badano
|
fbf99224c4
|
Merge pull request #1635 from jonpas/fixCheckPBOkick
Fixed CheckPBO Kick
|
2015-06-15 15:43:28 -03:00 |
|
jonpas
|
04c06b51ed
|
Fixed #1632 - CheckPBOs kick serverCommand changed to display 46
|
2015-06-15 20:23:16 +02:00 |
|
jonpas
|
f61066f11a
|
Fixed checkPBO function not executing on server
|
2015-06-15 19:55:30 +02:00 |
|
Ivan Navarro Cabello
|
76f7962dac
|
Updated spanish stringatable
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
|
2015-06-14 13:52:55 +02:00 |
|
ViperMaul
|
1322da5537
|
Merge pull request #1587 from acemod/fixVehicleUnconcious
fix animation and consistently unload units from vehicle
|
2015-06-13 12:44:34 -07:00 |
|
ViperMaul
|
132ec343b0
|
Suppress debug
|
2015-06-13 12:39:29 -07:00 |
|
ViperMaul
|
911a18d169
|
Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk
Convert ASLtoPosition
#1575 and #1577
|
2015-06-13 12:37:10 -07:00 |
|
PabstMirror
|
b2d69611d7
|
Merge pull request #1118 from acemod/multipleDevices
Multiple Devices
|
2015-06-13 14:20:38 -05:00 |
|
Glowbal
|
5013254769
|
Merge pull request #1530 from legman/akalegman_zeus_unconscious
Fixed Zeus Unconscious
|
2015-06-13 20:48:18 +02:00 |
|
PabstMirror
|
6ab8b129fa
|
Merge branch 'master' into multipleDevices
Conflicts:
addons/common/XEH_postInit.sqf
|
2015-06-13 12:30:35 -05:00 |
|
Nicolás Badano
|
c168afe8bb
|
Merge pull request #1598 from acemod/serverModulesFirst
Fix Server not reading modules
|
2015-06-13 12:01:22 -03:00 |
|
ViperMaul
|
cb1d016a39
|
Merge pull request #1592 from ProfessorCZ/master
CZ - Translation
|
2015-06-13 07:39:18 -07:00 |
|
ViperMaul
|
cbb620ba98
|
Change setPos to setPosASL to support roof tops and multi-level objects and faster code.
#1575 and #1577
|
2015-06-13 07:24:50 -07:00 |
|
PabstMirror
|
177f590dda
|
Make "InitSettingsFromModules" pfeh run on dedicated
|
2015-06-12 22:57:01 -05:00 |
|
PabstMirror
|
1804c6ceab
|
Merge branch 'master' into serverModulesFirst
|
2015-06-12 22:40:04 -05:00 |
|
ViperMaul
|
1c0811aa31
|
Change from globalEvent to targetEvent
#1575 and #1577
|
2015-06-12 16:56:13 -07:00 |
|
ProfessorCZ
|
acc5f4d29f
|
CZ - Translation
|
2015-06-12 15:05:04 +02:00 |
|
ProfessorCZ
|
531372b2a3
|
CZ - Translation
Already in README
|
2015-06-12 14:50:50 +02:00 |
|
ViperMaul
|
072f2cc3a7
|
fix animation and consistently unload units from vehicle
#1575 and #1577
|
2015-06-11 15:56:11 -07:00 |
|
PabstMirror
|
3e396b416a
|
One PFEH for execNextFrame and waitAndExec
|
2015-06-11 02:45:42 -05:00 |
|
AKALegman
|
5431ab5e01
|
fixed conflicts
|
2015-06-10 20:03:00 +01:00 |
|
PabstMirror
|
8abd488a43
|
Read server modules before "SettingsInitialized" on clients
|
2015-06-09 01:27:59 -05:00 |
|
PabstMirror
|
b61bd1fb75
|
1.46 New RscInfoType (fix UBC)
|
2015-06-08 13:26:18 -05:00 |
|
AKALegman
|
1ae8e29ac2
|
updated isPlayer v2
|
2015-06-08 19:12:16 +01:00 |
|
AKALegman
|
96fccbedf9
|
updated isPlayer
|
2015-06-08 11:09:49 +01:00 |
|