jonpas
86264a7b7d
Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized
2015-05-28 20:49:30 +02:00
jonpas
b85ae8f194
Fixed missed external strings
2015-05-27 22:34:57 +02:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
esteldunedain
39fec12528
Merge branch 'master' into reliableSettings
2015-05-27 12:09:06 -03:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
PabstMirror
4e70bf6e83
Single PFEH for waitAndExecute - using sort
2015-05-25 22:46:56 -05:00
ViperMaul
6a1724343d
remove debug
...
#1375
2015-05-25 11:38:28 -07:00
ViperMaul
789e92d8ef
Ensuring a proper return value and removing unnecessary code.
...
#1375
2015-05-25 10:32:52 -07:00
ViperMaul
9a07a9bfd6
modify unloadPerson to use unloadPersonLocal
...
#1375
2015-05-25 09:43:29 -07:00
ViperMaul
7141d251c7
create unloadPersonLocal
...
#1375
2015-05-25 09:41:24 -07:00
PabstMirror
f4bf6ea26d
Fix Time Calc
2015-05-22 14:29:56 -05:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
jonpas
1a468cb4ff
Split common ACE_Settings.hpp from config.cpp, shortened sampleSetting
2015-05-16 01:06:29 +02:00
jonpas
cccc741a16
#1123 - Added CheckPBOs to ACE_Settings
2015-05-16 00:54:01 +02:00
esteldunedain
0b1beed219
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reliableSettings
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-05-15 18:18:13 -03:00
jaynus
d4dab0275d
Me and my typos.
2015-05-15 12:54:02 -07:00
esteldunedain
d189cffce6
Fix event names
2015-05-15 15:49:22 -03:00
jaynus
e1c3e96eb1
Fixes: Nil scheduled space bug with hashes. This is still a bug everywhere else.
2015-05-15 10:45:07 -07:00
esteldunedain
ca94fd4c78
Remove the pfh
2015-05-14 20:58:45 -03:00
esteldunedain
5e3b6f389a
Reliable settings framework
2015-05-14 20:45:53 -03:00
PabstMirror
666db5e245
Fix Typo
2015-05-14 18:13:20 -05:00
PabstMirror
d5db268fc0
Clean unused privates
2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382
Common Privates Redo
2015-05-14 17:12:40 -05:00
PabstMirror
fd8d68c451
Merge branch 'master' into multipleDevices
...
Conflicts:
addons/common/stringtable.xml
2015-05-14 15:38:13 -05:00
SAM
0b6f02f45e
Second batch of cleaned up files.
2015-05-14 20:06:06 +02:00
SAM
9b55dd0b57
First batch of cleaned up files
2015-05-14 20:02:42 +02:00
jaynus
cac70762f5
Merge pull request #1149 from acemod/extBuildFix
...
Extensions build system updates, changes and crash fixes
2015-05-14 07:25:49 -07:00
Glowbal
abadf05342
Merge remote-tracking branch 'gienkov/module-translations'
...
Conflicts:
addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
jaynus
9f3a57bf32
Changed: checkFiles extension check prints version returned by extension
...
Changed: Build changed to SSE2 instead of defaulting to AVX.
2015-05-13 09:57:24 -07:00
jaynus
ed2f73d4d9
Merge pull request #1117 from acemod/waveHeightAtFunc
...
Added: waveHeightAt Function
2015-05-12 21:15:35 -07:00
jaynus
d972f14649
Merge pull request #1092 from acemod/superTime
...
ACE_time variables for accurate purposeful time use
2015-05-12 19:34:20 -07:00
PabstMirror
e613db1fea
Add missing script_component include
2015-05-12 15:40:12 -05:00
GieNkoV
ed1acd8c15
Some small errors fixed #2
...
Mainly tabs and wrong italian strings (got those from newest master)
2015-05-12 19:42:35 +02:00
GieNkoV
bc72c71e8e
Fix small errors inside stringtables
2015-05-12 19:11:56 +02:00
Grzegorz Sikora
44466e8be8
Remove tabs and repair errors @Glowbal found
...
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
2015-05-12 18:27:27 +02:00
Grzegorz Sikora
156bba3321
Yes/No to BOOL
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
PabstMirror
043fee03bd
Return Valid bool for keybind
2015-05-11 22:48:03 -05:00
PabstMirror
de2a89613c
ATragMX
2015-05-11 22:22:24 -05:00
PabstMirror
ffce1f6386
Condense mDagr interactions - intergrate kestral
2015-05-11 21:49:13 -05:00
jaynus
7efe8ccba5
Added: waveHeightAt Function, refs #1024 for use.
2015-05-11 16:44:17 -07:00
jaynus
9660978b92
Changed: search for ace_server, not ace_serverconfig
2015-05-11 09:02:13 -07:00
PabstMirror
57d6ad988b
Kestral WIP
2015-05-10 16:54:24 -05:00
PabstMirror
05f1b884fa
Localization/ headers
2015-05-10 15:17:50 -05:00
PabstMirror
f7ff4a2f36
Base Device Handler Framework
...
Multiple devices share Home/Ctrl-home keys
2015-05-10 14:59:53 -05:00
jaynus
e1c3c40cdd
I need more coffee. this should be more accurate.
2015-05-10 07:50:58 -07:00
jaynus
318b2437f9
Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution.
2015-05-10 07:42:53 -07:00
Alessandro Foresi
2dd06babec
Added: Italian translations completed.
...
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932
Added: Italian translation from Blackedsoul p#20
2015-05-10 11:05:16 +02:00
jaynus
7fb7b04a85
And one final bugfix for fast machines.
2015-05-09 23:13:02 -07:00
jaynus
8e34b99c0f
Optimization of variables.
2015-05-09 23:09:33 -07:00
jaynus
b3833c665d
Time magic.
2015-05-09 22:53:20 -07:00
commy2
aa6c3ddf2c
fix: check files script, order in activatedAddons is not guaranteed
2015-05-09 19:34:35 +02:00
commy2
7fb56d4fd5
simple check to compare client and server version of ace
2015-05-09 17:03:51 +02:00
commy2
3976c4d64f
the spaces
2015-05-09 16:06:44 +02:00
commy2
f0cca5b33e
ignore ace in checkPBO module, also fix #1020
2015-05-09 16:01:53 +02:00
commy2
57131496f2
check for outdated pbo files
2015-05-09 13:25:19 +02:00
Glowbal
518dfb4373
Added missing privates
2015-05-07 21:51:03 +02:00
PabstMirror
d8a6dd1bbd
Stuff
2015-05-01 12:58:56 -05:00
PabstMirror
8d1ac26e24
Save and replay valid awake animations
2015-05-01 12:12:13 -05:00
PabstMirror
0f736ae684
GetDeathAnim
2015-05-01 03:13:26 -05:00
Glowbal
349d723fea
Merge pull request #928 from acemod/AdjustUnloadPerson
...
Adjust unload person
2015-04-30 20:55:17 +02:00
Glowbal
67370f3340
Handles waking up
2015-04-30 20:49:38 +02:00
Glowbal
432a0102e8
Improved unloadPerson function
...
Removed caller parameter.
2015-04-30 20:44:43 +02:00
bux578
367da1f4bf
cleaned up insignias
2015-04-30 19:36:35 +02:00
commy2
8e54e6ec13
fix setFWS locality issues, fix #892
2015-04-30 00:53:49 +02:00
bux578
fce91279b5
add ace3 and banana insignia
...
`[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;`
and
`[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`
2015-04-29 22:04:31 +02:00
Glowbal
dfbc9b74fd
Added arsenalScope #913
2015-04-29 15:14:37 +02:00
commy2
d149db61e8
ace insignia, #906
2015-04-29 13:01:08 +02:00
KoffeinFlummi
b263ac6847
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/common/stringtable.xml
2015-04-29 12:57:48 +02:00
KoffeinFlummi
a1e709047e
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
NukeDev
1d434949de
Some Italian Translation's Changes
2015-04-28 17:46:35 +02:00
VyMajoris
ba89bc8faa
Added - Myself to AUTHORS.txt
2015-04-26 03:15:25 -03:00
Nou
7c857a5a7e
Make sure load spawns the function, not calls it.
2015-04-25 00:52:51 -07:00
Nou
c8e6e7018c
Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission.
2015-04-25 00:49:47 -07:00
Nicolás Badano
1bfb13abac
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:07:42 -03:00
bux578
3897b73d56
remove author from items inheriting ACE_ItemCore
2015-04-21 19:16:54 +02:00
Glowbal
89a1306605
Merge branch 'master' into KeyPressesWhileUnconscious
2015-04-20 22:19:40 +02:00
Glowbal
362051e2db
Merge pull request #717 from acemod/medicalFixes
...
Medical fixes
2015-04-20 22:16:57 +02:00
commy2
ea368511b7
ace extensions class for modularity
2015-04-20 18:48:58 +02:00
commy2
14214090dc
manual merge
2015-04-20 18:22:17 +02:00
Glowbal
b71ac1485d
Merge branch 'master' into medicalFixes
2015-04-19 12:06:54 +02:00
commy2
c9a2505031
Merge pull request #755 from acemod/fixoptics2
...
Fix for PIP scopes, fix #547
2015-04-19 07:46:41 +02: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
commy2
7ac7bc3f29
eventhandler for creating and deleting cameras
2015-04-18 22:06:42 +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
jaynus
f5705a91e6
oops.
2015-04-18 12:04:48 -07:00
jaynus
c438d9e790
Merge remote-tracking branch 'origin/master' into localMedicalGarbage
2015-04-18 11:12:22 -07:00
Glowbal
54a70f26b1
Moved to own function.
2015-04-18 20:06:01 +02:00
Glowbal
85e5293c37
Fix settings localization is done by the server instead of client #744
2015-04-18 19:59:41 +02:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
PabstMirror
d7da259c11
Merge pull request #688 from acemod/optionMenuStuff
...
Option menu stuff
2015-04-17 23:49:37 -05:00
PabstMirror
71e62711c6
#731 - stop error if target offscreen
2015-04-17 22:02:23 -05:00
jaynus
93d03b404f
JIP Sync events complete.
2015-04-17 19:26:27 -07:00
jaynus
da09b74fe4
Don't JIP check server side, but still have it fire for HC.
2015-04-17 18:27:35 -07:00
jaynus
8fa0c91632
Added PlayerJIP event, handled full requests on JIP.
2015-04-17 18:23:26 -07:00
commy2
708a2aa374
check if ddls are present on mission start
2015-04-18 01:44:53 +02:00
commy2
3ec5acbdb0
stuff
2015-04-18 01:05:30 +02:00
