11235 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
commy2	41dde51e8e	Merge branch 'medical-rewrite-pain' into medical-rewrite	2016-10-12 03:19:48 +02:00
commy2	d781890ee1	use liters for blood volume variable (#4537) ... * use liters for blood volume variable * blood volume unit vitals * move IV transufsion rate macro to blood config * add comment explaining why 6.0 were chosen * simplify lost some/much blood macros	2016-10-11 20:19:55 +02:00
commy2	b0b9037f24	simplify lost some/much blood macros	2016-10-11 19:44:20 +02:00
commy2	d1df47919d	support neg numbers to remove pain in addPain	2016-10-11 19:36:04 +02:00
commy2	1ea2a72f20	don't play scream by addPain function	2016-10-11 19:29:44 +02:00
commy2	ed6688c899	Merge remote-tracking branch 'origin' into medical-rewrite	2016-10-11 19:14:13 +02:00
Glowbal	84cbd50582	Merged branch master into release	2016-10-11 19:04:14 +02:00
commy2	8822cb1b90	emulate frag grenade ai behaviour for incendiaries (#4534)	2016-10-11 19:04:08 +02:00
jonpas	b8cc10fecb	Fix #4523 - fuel nozzle disconnect at maximum hose distance	2016-10-11 18:57:58 +02:00
PabstMirror	5d610cf148	Always create namespace at preInit	2016-10-11 18:57:34 +02:00
commy2	130265fd9f	add function to disable dogtags for factions, and disable for civilians	2016-10-11 18:57:34 +02:00
Glowbal	a98013c36e	Merge branch 'master' into release	2016-10-11 18:51:05 +02:00
PabstMirror	cd79ebe3ce	Bump REQUIRED_VERSION to 1.64	2016-10-11 18:49:31 +02:00
BaerMitUmlaut	2ba0137a1e	Fix going unconscious while fastroping (#4531)	2016-10-11 18:48:20 +02:00
commy2	c390b6c1fc	increase red laser alpha, close #4535	2016-10-11 18:47:52 +02:00
commy2	4fb5d230ac	remove civilian rank icons from nametags (#4538)	2016-10-11 18:44:27 +02:00