11201 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
commy2	347be3c222	handle vehicle crashes and add wounds for fall damage	2016-10-20 15:02:24 +02:00
commy2	576a63c27e	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite	2016-10-20 13:56:56 +02:00
commy2	fc39ac14b7	don't knock out if pain is removed	2016-10-20 13:49:52 +02:00
commy2	be56b4d806	knock out due to pain	2016-10-20 13:46:28 +02:00
commy2	370faf9b48	cleanup	2016-10-20 13:38:26 +02:00
commy2	0370a34672	remove some debug	2016-10-20 12:43:57 +02:00
commy2	7e498ab762	setting for basic/advanced syringes	2016-10-20 02:14:11 +02:00
PabstMirror	e5c59b56fb	Update wiki version to 3.8 (#4570)	2016-10-19 15:52:46 -05:00
Glowbal	bf5892aa2a	Merged branch release into master	2016-10-18 22:59:44 +02:00
Glowbal	d5160b436f	Fix build tools not working with two digit build numbers	2016-10-18 22:15:49 +02:00
Glowbal	b150f440e6	Prep 3.8.0 Release	2016-10-18 21:57:40 +02:00
Glowbal	d867805406	Prepare v3.8.0 RC3	2016-10-18 20:25:45 +02:00
jonpas	5922aad91c	Fix 3rd party air and sea vehicle fuel capacity (#4554) ... * Fix fuel capacity for air vehicles * Sea vehicles as well, minor empty classes cleanup	2016-10-18 20:21:28 +02:00
jonpas	877944ddce	Fix 3rd party air and sea vehicle fuel capacity (#4554) ... * Fix fuel capacity for air vehicles * Sea vehicles as well, minor empty classes cleanup	2016-10-18 20:21:27 +02:00
classicarma	19fe4016e5	Japanese translations (#4553)	2016-10-18 20:19:29 +02:00
classicarma	d33219b9ba	Japanese translations (#4553)	2016-10-18 20:19:27 +02:00
PabstMirror	63f3673a65	Missile Guidance Overhaul	2016-10-17 16:08:23 -05:00
PabstMirror	5ae8145234	Don't show dogtag ID in action menu (#4558) ... #4476	2016-10-17 10:55:42 +02:00
bux578	846b7f26f7	Dockerfile (#4550) ... * add init dockerfile * add dockerfile documentation * gitignore gemfile.lock * improve Dockerfile * add docker-compose file * change readme to use docker-compose * improve readme * Fix readme - Debian != Windows * Small wording improvement * copy contents into dockerfile To be able to run it without a volume (but with `docker-compose up` who would do that :) )	2016-10-16 10:48:14 +02:00
commy2	519ea25fc7	cleanup	2016-10-15 13:48:13 +02:00
Glowbal	d9a199b942	Increment build number	2016-10-15 11:44:43 +02:00
Glowbal	8afb3c7279	Update CBA required version	2016-10-15 11:44:26 +02:00
PabstMirror	6fce923783	Fix mortar changes for laser shootRay changes ... Ref #4478	2016-10-15 11:42:09 +02:00
PabstMirror	fe35e64696	Reset animation speed when not swimming (#4546)	2016-10-15 11:41:03 +02:00
bux578	1f0f9f7ee1	Merge pull request #4549 from acemod/fix-jekyll-doc ... fix spelling of ruby	2016-10-14 10:13:50 +02:00
bux578	99d910d6c9	fix spelling of ruby	2016-10-14 07:55:46 +02:00
commy2	633c6f0ce4	formating	2016-10-13 21:21:42 +02:00
commy2	6b84bd1ff6	fix misc. treatment actions	2016-10-13 21:11:13 +02:00
commy2	e03614757e	fix misc. treatment actions	2016-10-13 21:08:41 +02:00
commy2	03fe2826dd	remove some debug	2016-10-13 20:31:39 +02:00
commy2	f2dfc6dc0e	fixes, tweaks	2016-10-13 20:17:21 +02:00
commy2	bc4c1787f9	show tourniquets in 3d menu	2016-10-13 19:05:29 +02:00
commy2	ba2d6fda8a	treatment tweaks	2016-10-13 17:39:01 +02:00
commy2	fe2c6e8d85	basic <-> advanced	2016-10-13 17:14:43 +02:00
commy2	68d75beae6	manual merge	2016-10-13 16:56:57 +02:00
commy2	2d243d45f3	fix tourniquets	2016-10-13 10:28:28 +02:00
commy2	e1cbeeea16	fix tourniquets	2016-10-13 10:12:28 +02:00
commy2	18907adcd5	increase medical item mass to at least 100 grams	2016-10-13 09:48:58 +02:00
commy2	5965326ca1	merge basic and adv. bandage actions	2016-10-13 09:47:52 +02:00
commy2	b1f0af7e1c	merge basic and adv. bandage actions	2016-10-13 09:10:08 +02:00
commy2	68d199c5b2	merge basic and adv. bandage actions	2016-10-13 02:05:14 +02:00
commy2	4a06d19ce4	merge basic and adv. bandage actions	2016-10-13 01:55:10 +02:00
commy2	fd6e46b622	make waking up rocket soldier kneel not stand	2016-10-13 01:42:32 +02:00
commy2	71884778dd	animation fixes	2016-10-13 01:16:51 +02:00
commy2	e38845bf45	add ace_kill event handler	2016-10-12 23:20:22 +02:00
commy2	92fc4ec14b	add a setting for 'basic' blood bags	2016-10-12 22:38:58 +02:00
commy2	4e0f3e53e0	manual merge	2016-10-12 22:03:08 +02:00
commy2	a5d070f829	blood and unconsciousness fixes	2016-10-12 21:59:32 +02:00
bux578	4d31c8f148	add missing line in medical doc (#4545)	2016-10-11 21:42:16 -05:00
commy2	be71e6fa7b	Merge branch 'medical-rewrite-blood' into medical-rewrite	2016-10-12 04:05:50 +02:00