Commit Graph

248 Commits

Author SHA1 Message Date
commy2
c1799616c7 add function to convert numbers to string 2015-04-06 20:47:11 +02:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
Glowbal
befb52e855 Merge pull request #260 from KoffeinFlummi/serverConfig
Server Config support
2015-04-06 01:42:33 +02:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
2015-04-05 13:26:54 -07:00
Glowbal
f1a3d588ba Changed initialization order of config settings.
ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used.

This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description
2015-04-05 12:38:10 +02:00
Glowbal
044d2551ce Merge branch 'master' into serverConfig 2015-04-04 23:00:47 +02:00
Glowbal
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
a7edd00420 removed useless doAnimation call when animation is not "unconscious" in unconscious state 2015-04-04 20:41:49 +02:00
Nicolás Badano
5f4030469f Merge pull request #309 from KoffeinFlummi/closeInteractMenu
Close interact menu when knocked out
2015-04-04 15:35:00 -03:00
PabstMirror
efe810ae4e Private Variables for localEvent 2015-04-04 12:08:59 -05:00
commy2
e27c91710c Revert "Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events."
This reverts commit 6864529d9c.
2015-04-04 16:26:32 +02:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
Nou
6c4dda2dc8 Use visual versions. 2015-04-03 14:40:01 -07:00
Nicolás Badano
63ac3bb768 Merge branch 'master' into lasers
Conflicts:
	addons/common/XEH_preInit.sqf
2015-04-03 10:40:11 -03:00
Glowbal
4478602cfb Consistent use of quotes for localized text 2015-04-03 12:56:12 +02:00
Glowbal
2d0e8dea7e Added banana to curator item list 2015-04-03 01:27:22 +02:00
jaynus
6864529d9c Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events. 2015-04-02 16:20:22 -07:00
jaynus
d81d1b3176 Added: ACE Event stack debugging output, use DEBUG_EVENTS in main\script_debug
Added: PFH Perfcounter tracking+output, use ENABLE_PERFORMANCE_COUNTERS in main\script_debug and then call ace_common_fnc_dumpPerformanceCounters
2015-04-02 16:05:21 -07:00
commy2
88b9d0899f shortdot scope onDraw 2015-04-03 00:03:08 +02:00
jaynus
596854a264 Moved getTurretDirection to common.
Tweak creation of action (fucking actions?!) :( :( :(
2015-04-02 10:05:50 -07:00
PabstMirror
ec59397e4f Fix playerTurretChanged event 2015-04-02 11:15:31 -05:00
jaynus
b0926a542c Merge pull request #282 from KoffeinFlummi/AddItemToInventory
Added a function that will add the passed item to the unit or place it i...
2015-04-02 08:42:48 -07:00
commy2
f2d802eb90 make getGunner work in person turret turret units (commander FFV) and for foot soldiers 2015-04-02 13:52:22 +02:00
commy2
d8e0c54406 function to log ace config entries 2015-04-02 10:27:21 +02:00
commy2
2fd2e313f2 sort stuff 2015-04-02 08:44:58 +02:00
commy2
8fde553731 getItemType more relyable after potential arma updates 2015-04-02 08:16:13 +02:00
commy2
191126ecd6 update getItemType 2015-04-02 07:37:44 +02:00
jaynus
cc27ff63d6 finalized. works for weapons/mags/items. Optional container also works. 2015-04-01 16:51:34 -07:00
jaynus
5d6495dafe Merge remote-tracking branch 'origin/master' into AddItemToInventory 2015-04-01 16:42:24 -07:00
commy2
411fb6bc62 getText vs. getNumber 2015-04-01 22:13:37 +02:00
commy2
a14cc0853e function to return item type 2015-04-01 21:52:56 +02:00
jaynus
bd1f69d8a2 assign container 2015-04-01 10:37:47 -07:00
commy2
b66bb4ffd6 add functions to get cfg type of items and objects 2015-04-01 19:36:11 +02:00
jaynus
46a761a1c8 canAdditem works on weapons. 2015-04-01 10:35:22 -07:00
jaynus
de920e8874 Final cleanup. 2015-04-01 10:34:38 -07:00
jaynus
ec6fb6fcb8 containerize. 2015-04-01 10:34:16 -07:00
jaynus
c3f915a0ac tabs because 2015-04-01 10:22:27 -07:00
jaynus
37bbbc607f derp. 2015-04-01 10:20:58 -07:00
jaynus
46284622b3 Optional container variable for adding item to a specific container (vest/backpack/uniform) 2015-04-01 10:20:24 -07:00
Garth L-H de Wet
e06e7a2a51 Added a function that will add the passed item to the unit or place it in a ground holder if the unit has no space. 2015-04-01 18:48:46 +02:00
Nicolás Badano
1def2bd2b4 Fix bugs with interaction with vehicles and passengers 2015-03-31 18:09:29 -03:00
commy2
e7ec618f97 function decription 2015-03-28 02:10:04 +01:00
commy2
d12ba196c5 function to return attachments, muzzles with magazines and ammo, moved stuff around 2015-03-28 01:43:30 +01:00
commy2
66c026d4a0 refueling the uav didn't work on UAVs local to server or HC 2015-03-28 00:30:51 +01:00
Glowbal
7a091215e1 Draft #188 2015-03-27 16:26:18 +01:00
Glowbal
4336cf0fc1 Merge pull request #258 from KoffeinFlummi/BananaPort
Banana
2015-03-27 00:04:53 +01:00
Glowbal
f652ae89d1 Banana 2015-03-26 23:14:22 +01:00
commy2
9fcb193064 Merge pull request #243 from KoffeinFlummi/mediccarry
refining carrying injured persons
2015-03-26 18:04:35 +01:00
commy2
0a0e7c8a0c disable user input was broken 2015-03-26 17:32:00 +01:00
commy2
606c1fbcf9 tweaks 2015-03-26 14:11:04 +01:00