4507 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Glowbal	65ec2cc4e5	medical dll	2015-05-17 00:08:43 +02:00
Glowbal	1d7bfa239f	Temp added old sqf version for easy performance comparison	2015-05-17 00:08:34 +02:00
Glowbal	bd440f5af9	adjusted random	2015-05-17 00:07:41 +02:00
Glowbal	e3dd1eaf47	Using extension for handleDamage wounds instead of sqf	2015-05-16 23:21:03 +02:00
Glowbal	23a1bc86ca	Loading config data to extension	2015-05-16 23:20:38 +02:00
Glowbal	f26cb0a666	Now handles input and output	2015-05-16 23:20:17 +02:00
Glowbal	4b6b0621da	Implemented handleDamage wounds fully	2015-05-16 23:19:50 +02:00
Glowbal	b334d8c52e	Added woundID for open wounds	2015-05-16 23:18:58 +02:00
Glowbal	eb2383a6f0	tabs	2015-05-14 18:56:23 +02:00
Glowbal	5756c8530f	Ported over handleDamage_wounds	2015-05-14 18:52:12 +02:00
Glowbal	e98c7cd1b7	Made handleDamage a singleton	2015-05-14 17:41:50 +02:00
Glowbal	a48b6c9426	Fixed namespace issues. Removed static	2015-05-14 17:36:58 +02:00
Glowbal	4dbacbead8	Merge branch 'master' into medicalExtension	2015-05-14 16:43:12 +02:00
jaynus	c08082bef6	Merge branch 'master' of github.com:acemod/ACE3	2015-05-14 07:42:37 -07:00
jaynus	99c04d0ed3	Fixed: shared_ptr vs. unique_ptr behavior in VS2013	2015-05-14 07:42:21 -07:00
ulteq	7474d7f313	Merge pull request #1193 from acemod/getTemperatureAtHeight ... Moved all temperature calculations into the weather module.	2015-05-14 16:41:16 +02:00
ulteq	6a0f7343d8	Merge pull request #1192 from acemod/persistentKestrelMenu ... Made the Kestrel menu persistent	2015-05-14 16:41:12 +02:00
Glowbal	b68f02333e	Merge branch 'master' into medicalExtension	2015-05-14 16:27:41 +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	7c03ec913b	double all the things (ints)	2015-05-14 16:23:01 +02:00
Glowbal	d42d0ef69d	Merge pull request #1164 from acemod/litterFixes ... Litter distribution fix and "floating litter over water" fix (medical)	2015-05-14 16:17:10 +02:00
jaynus	20bd5957e3	Change to execNextFrame.	2015-05-14 07:15:52 -07:00
KoffeinFlummi	53bc8ca9e5	Change H1s to H2	2015-05-14 16:13:04 +02:00
ulteq	cf487b544e	Moved all temperature calculations into the weather module.	2015-05-14 16:07:41 +02:00
KoffeinFlummi	14ca9f2e4e	Merge branch 'documentation-merge'	2015-05-14 16:06:29 +02:00
Glowbal	8ec57a985c	Merge branch 'master' into medicalExtension	2015-05-14 16:05:11 +02:00
KoffeinFlummi	011570535f	Change H2s to H3s	2015-05-14 16:04:45 +02:00
KoffeinFlummi	33b94be5ff	Insert additional newlines	2015-05-14 16:04:20 +02:00
Glowbal	abadf05342	Merge remote-tracking branch 'gienkov/module-translations' ... Conflicts: addons/medical/stringtable.xml	2015-05-14 16:01:41 +02:00
Nicolás Badano	20e45b6d1e	Merge pull request #981 from acemod/makeDisplaysNotDialogs ... Interact_menu with cursor: Replace dialogs by displays	2015-05-14 10:41:36 -03:00
Nicolás Badano	4e7194174d	Merge pull request #989 from acemod/interactionOclusion ... Action point oclusion	2015-05-14 10:40:54 -03:00
ulteq	a167336b40	Made the Kestrel menu persistent	2015-05-14 15:39:29 +02:00
esteldunedain	5ef29c2354	Merge remote-tracking branch 'origin/master' into interactionOclusion ... Conflicts: addons/interact_menu/functions/fnc_keyDown.sqf	2015-05-14 10:39:02 -03:00
Nicolás Badano	2fb317d3bd	Merge pull request #1120 from acemod/syncAmmoOnBeltReload ... Manually sync ammo globably on belt reload.	2015-05-14 10:32:16 -03:00
KoffeinFlummi	a0ae11b761	Merge https://github.com/alganthe/ACE3 into documentation-merge	2015-05-14 15:21:14 +02:00
Nicolás Badano	dddd571a70	Merge pull request #1185 from Legolasindar/master ... fixed some spanish translation	2015-05-14 09:38:52 -03:00
Felix Wiegand	9e67839f73	Merge pull request #1152 from dharmab/doc-agm-to-ace ... Remove outdated references to AGM in documentation	2015-05-14 14:35:33 +02:00
Grzegorz	ca1ff8382c	Tabs fixed	2015-05-14 14:33:33 +02:00
Ivan Navarro Cabello	43c5afac55	fixed some spanish translation ... I fixed some spanish translation.	2015-05-14 14:32:35 +02:00
Glowbal	57bac7369d	Merge pull request #1177 from acemod/settingsFrameworkDoc ... Settings framework documentation	2015-05-14 13:17:39 +02:00
ulteq	6e1fba450b	Merge pull request #1180 from acemod/atragmxClickMemoryFix ... Fixed 'input parsing' corrupting 'relative click memory'	2015-05-14 12:53:04 +02:00
ulteq	7fcaa5bbcf	Fixed 'input parsing' corrupting 'relative click memory'	2015-05-14 12:52:48 +02:00
Legolasindar	683b06f317	Merge pull request #7 from acemod/master ... update my master fork	2015-05-14 12:01:54 +02:00
ulteq	ddbf274c89	ace_ballistics README.md update	2015-05-14 11:23:44 +02:00
Glowbal	d2f05827a1	removed GVAR	2015-05-14 10:11:02 +02:00
Glowbal	3f8e9476dc	Settings documentation	2015-05-14 10:08:47 +02:00
Nicolás Badano	560d6f09a0	Merge pull request #1160 from alef/translation/15bn/alef ... Fixed: Safe mode Italian translation	2015-05-13 22:54:10 -03:00
jaynus	b13d44fb6b	Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112	2015-05-13 17:29:09 -07:00
Josuan Albin	95bcb15779	Documentation pass : typos ... fixed some typos and removed some lines that dharmab is going to add.	2015-05-14 00:45:46 +02:00
PabstMirror	72715dd34d	Fix RHS_Javelin Comp Path	2015-05-13 17:04:27 -05:00