Commit Graph

1091 Commits

Author SHA1 Message Date
95be641918 common PL translation 2015-04-10 03:52:30 +02:00
c1941f2719 Added - Portuguese translation to common/Stringtable
I see that the english description for the banana is from the Wikipedia. If wanted I can use the portuguese version from Wikipedia.
2015-04-09 22:12:54 -03:00
ae7af34a11 Added - Portuguese translation to common/Stringtable
Everything translated. Even the banana.
2015-04-09 20:53:44 -03:00
5f5ce47bec Update stringtable.xml
fixed one term in spanish
2015-04-10 01:26:06 +02:00
65b3566d41 Update stringtable.xml
fixed spanish terms.
2015-04-10 01:24:37 +02:00
cef9a6454a Update stringtable.xml
Updated spanish terms, on moved english to first raws.
2015-04-10 00:38:24 +02:00
3c4656522f Stringtable: German additions 2015-04-09 23:33:36 +02:00
00c37e0b9d Update stringtable.xml 2015-04-09 23:12:00 +02:00
3a871eed58 Merge branch 'master' into tools-cleanup 2015-04-09 13:37:19 +02:00
c5b38c8942 manual merge 2015-04-08 21:51:42 +02:00
1ae69d56ff Merge pull request #377 from KoffeinFlummi/142light
142 directional light for map effects
2015-04-08 21:46:48 +02:00
7346c194f4 Merge pull request #306 from KoffeinFlummi/optics
Taosenai's Animated Optics req 1.42
2015-04-08 21:41:12 +02:00
01a9374a26 Merge pull request #382 from KoffeinFlummi/disablebs
disable cursor showing map position
2015-04-08 10:48:31 +02:00
4834facccf moving it to map 2015-04-08 00:30:36 +02:00
ce45237989 Report full version number in RPT for debugging 2015-04-08 00:27:00 +02:00
50dbbda8eb disable cursor showing map position 2015-04-08 00:20:43 +02:00
2f4335d3c2 #344 - Ignore missing ace_serverconfig on client 2015-04-07 17:14:27 -05:00
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
d1b8595c0e light intensity from object: handle campfires 2015-04-07 23:02:54 +02:00
96268b6407 directional light for map effects 2015-04-07 22:19:03 +02:00
88a5519465 cache the frames 2015-04-07 21:42:08 +02:00
d825505aa0 cache light config properties 2015-04-07 21:22:00 +02:00
ba618a69ec Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:54:45 +02:00
722c2af4dc lightIntensity, handle soldier flashlights 2015-04-07 20:54:25 +02:00
765ae4ee64 Merge branch 'master' into tabCleanup
Conflicts:
	addons/explosives/functions/fnc_addClacker.sqf
	addons/explosives/functions/fnc_detonateExplosive.sqf
	addons/explosives/functions/fnc_getPlacedExplosives.sqf
	addons/explosives/functions/fnc_openDetonateUI.sqf
	addons/explosives/functions/fnc_openPlaceUI.sqf
	addons/explosives/functions/fnc_openTransmitterUI.sqf
	addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
	addons/explosives/functions/fnc_placeExplosive.sqf
	addons/explosives/functions/fnc_place_Approve.sqf
	addons/explosives/functions/fnc_setPosition.sqf
2015-04-07 15:00:56 -03:00
98f7125171 function to return light intensity recieved from another object 2015-04-07 18:54:53 +02:00
deabbcd840 add function that returns config properties of a vehicles light 2015-04-07 15:43:23 +02:00
5df25cf44d function to return all turned on lights of any objects 2015-04-07 15:06:27 +02:00
0d126dc562 function to return object's lights 2015-04-07 14:44:34 +02:00
bb8762f4b9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 13:55:09 +02:00
ad5aad60c7 fix: ambient brightness can return values greater 1 2015-04-07 13:54:33 +02:00
92da20ce62 translations
#367
2015-04-07 10:02:33 +02:00
9ce2e38814 removed <orignal> language entry 2015-04-07 09:27:26 +02:00
09461d94ef Rewritten changeProjectileDirection 2015-04-06 18:10:17 -03:00
aec9962121 Fix changeProjectileDirection 2015-04-06 18:02:08 -03:00
04e9f28734 Make function handle negative numbers 2015-04-06 16:12:38 -03:00
c1799616c7 add function to convert numbers to string 2015-04-06 20:47:11 +02:00
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
befb52e855 Merge pull request #260 from KoffeinFlummi/serverConfig
Server Config support
2015-04-06 01:42:33 +02:00
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
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
044d2551ce Merge branch 'master' into serverConfig 2015-04-04 23:00:47 +02:00
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
a7edd00420 removed useless doAnimation call when animation is not "unconscious" in unconscious state 2015-04-04 20:41:49 +02:00
5f4030469f Merge pull request #309 from KoffeinFlummi/closeInteractMenu
Close interact menu when knocked out
2015-04-04 15:35:00 -03:00
efe810ae4e Private Variables for localEvent 2015-04-04 12:08:59 -05:00
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
1dea63067a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics 2015-04-04 16:14:19 +02:00
ea275b1e52 2d with and without PIP 2015-04-04 08:51:22 +02:00