3467 Commits

Author	SHA1	Message	Date
FreeZbe	68d62b0005	Update stringtable.xml	2015-05-01 14:20:21 +02:00
FreeZbe	518614ec0b	Update stringtable.xml	2015-05-01 14:20:03 +02:00
FreeZbe	79ac41bd95	Update stringtable.xml	2015-05-01 14:19:43 +02:00
FreeZbe	80ae016021	Update stringtable.xml	2015-05-01 14:19:15 +02:00
FreeZbe	acf74dd2ae	Update stringtable.xml	2015-05-01 14:13:32 +02:00
FreeZbe	7a397459ae	Update stringtable.xml	2015-05-01 14:13:08 +02:00
FreeZbe	371aa381ec	Update stringtable.xml	2015-05-01 14:12:45 +02:00
FreeZbe	820c841b35	Update stringtable.xml	2015-05-01 14:12:10 +02:00
FreeZbe	53be70f661	French : update stringtable	2015-05-01 14:07:08 +02:00
ulteq	a6f4c68ef4	Removed obsolete comment	2015-05-01 13:50:01 +02:00
ulteq	6d0e2cc464	Merge pull request #936 from acemod/explosivesSleepReplacement ... Replaced sleep with waitAndExecute	2015-05-01 12:55:14 +02:00
Glowbal	f0efba09e5	Merge pull request #814 from acemod/basic-med-options ... Basic medical module options	2015-05-01 12:27:22 +02:00
ulteq	a9cde188ea	Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection ... Takes negative initSpeed values into account	2015-05-01 12:24:22 +02:00
Glowbal	e9a86da8e0	Should be in same order as the module	2015-05-01 12:18:21 +02:00
ulteq	4c0bed609e	Fixed a typo	2015-05-01 11:53:53 +02:00
Glowbal	5beca63ae2	Added missing private	2015-05-01 11:51:23 +02:00
ulteq	940f8e8349	Cleanup++: ... *Removed spawn *Added, moved and renamed some privates	2015-05-01 11:38:09 +02:00
commy2	a97c934688	fix ubc, fix #938	2015-05-01 11:01:07 +02:00
ulteq	d3b36c2b56	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-05-01 10:26:48 +02:00
ulteq	723ffc21d1	Removed unneeded TODO	2015-05-01 10:26:37 +02:00
ulteq	2219339e24	Fixed a typo	2015-05-01 10:25:59 +02:00
ulteq	965e45a53c	Takes negative initSpeed values into account	2015-05-01 10:25:33 +02:00
commy2	b859956604	rename category ace <blank> to ace common	2015-05-01 10:19:47 +02:00
ulteq	e8264110bb	Replaced sleep with waitAndExecute	2015-05-01 10:12:41 +02:00
commy2	c52278c11f	Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty	2015-05-01 09:52:03 +02:00
esteldunedain	a0923aa5c3	Tweak the position for rally point actions. Fix #837	2015-05-01 01:57:37 -03:00
esteldunedain	324b9510e3	Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.	2015-05-01 01:56:39 -03:00
esteldunedain	fc02bb4e06	Stylistic changes	2015-05-01 00:32:16 -03:00
esteldunedain	aa4a5539d4	Merge branch 'master' into interactMoreOptions ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf	2015-05-01 00:04:22 -03:00
KoffeinFlummi	984a1fe337	Rename breakLine to break_line	2015-05-01 02:14:23 +02:00
KoffeinFlummi	e06e1a2f89	Make preventDeath work	2015-05-01 01:38:36 +02:00
KoffeinFlummi	cb82b20464	Let setUncon handle AI unconsciousness	2015-05-01 01:38:16 +02:00
KoffeinFlummi	48770f77d2	Rename caching variables in basic HD	2015-05-01 01:37:58 +02:00
KoffeinFlummi	67bd2b4e2f	Reduce animation forcing delay	2015-05-01 01:36:09 +02:00
KoffeinFlummi	98e44e86d8	Offload ejecting to unloadPerson	2015-05-01 01:35:50 +02:00
KoffeinFlummi	f7f416c8d3	Proper privates and alignment	2015-05-01 01:34:38 +02:00
KoffeinFlummi	aa9f1c53c7	Whoops	2015-05-01 01:34:18 +02:00
KoffeinFlummi	53835605ea	Merge remote-tracking branch 'origin/master' into basic-med-options ... Conflicts: addons/medical/functions/fnc_getBloodLoss.sqf addons/medical/functions/fnc_handleDamage_basic.sqf	2015-05-01 01:25:16 +02:00
Kavinsky	f301491c7a	changed variable name to use QGVAR macro	2015-04-30 23:18:45 +02:00
Glowbal	eb48048a58	Merge pull request #930 from acemod/keybindingCategories ... Split keybindings into different sub-categories	2015-04-30 22:51:39 +02:00
commy2	2ae5538df5	change wrong strings	2015-04-30 22:46:08 +02:00
Glowbal	131468f0d8	plurals	2015-04-30 22:39:33 +02:00
PabstMirror	090062153c	Merge branch 'master' into interactMoreOptions ... Conflicts: addons/interact_menu/config.cpp	2015-04-30 15:36:00 -05:00
KoffeinFlummi	d59436c588	Only force animation when necessary	2015-04-30 22:19:31 +02:00
KoffeinFlummi	8fda984903	Fix missing semicolon	2015-04-30 22:17:25 +02:00
KoffeinFlummi	965a976daf	Reorganize AI unconsciousness	2015-04-30 22:16:45 +02:00
KoffeinFlummi	f28a806938	Remove max unconsciousness time again	2015-04-30 22:15:40 +02:00
Glowbal	7106093f1c	Merge pull request #929 from acemod/medical-lowercase ... Convert Medical stringtable key names to lowercase	2015-04-30 22:10:54 +02:00
commy2	bc0d95765a	Merge pull request #849 from acemod/menuonclick ... add option to only use action when clicking	2015-04-30 22:08:37 +02:00
KoffeinFlummi	270c3adc1e	Do it again, but properly this time	2015-04-30 22:06:10 +02:00