Commit Graph

10684 Commits

Author SHA1 Message Date
commy2
20d00d7cd9 make units scream when they're hit 2016-09-27 21:21:44 +02:00
commy2
a913054b57 fix error with out of bounds blood loss 2016-09-27 20:00:58 +02:00
commy2
5a19d4884b disable debug medical_damage 2016-09-27 19:22:54 +02:00
commy2
09c5fbde15 Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-27 18:59:43 +02:00
PabstMirror
257f1a1b4c Fix interaction addActionToX return values (#4461)
* Fix interaction addActionToX return values

Fix #4460
Fix returning number from pushBack

* Retrun empty array on error
2016-09-27 11:09:06 -05:00
commy2
5e35204811 woundHandler(SQF), fixes, improvements, more consistent variable naming 2016-09-27 17:29:49 +02:00
commy2
72e2bc72c0 don't exit loop prematurely 2016-09-27 11:57:37 +02:00
commy2
f90a91dfb5 add todo 2016-09-27 11:14:22 +02:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
commy2
cae5196656 fix wound translations being lost in limbo 2016-09-26 21:09:32 +02:00
commy2
0637a7401e travis pls 2016-09-26 20:52:08 +02:00
commy2
c21323f9ed travis 2016-09-26 20:45:29 +02:00
commy2
2bfa1370a5 port injury parse fnc to medical damage 2016-09-26 20:30:45 +02:00
commy2
9f6baca424 port injury parse fnc to medical damage 2016-09-26 20:25:14 +02:00
commy2
8fd7e8335a simplify and fix medical engine damage 2016-09-26 19:59:00 +02:00
ace3mod
565af1b571 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-26 19:10:36 +02:00
PabstMirror
055c6d23f3 Fix passanger interaction (#4467) 2016-09-26 12:09:20 -05:00
commy2
80232c39cc add todo note 2016-09-26 19:07:14 +02:00
commy2
4b9873d304 fix various issues with handleDamage engine component 2016-09-26 18:30:39 +02:00
PabstMirror
11b6370e8f Fix undefined var in paradrop (#4465) 2016-09-25 21:25:11 +02:00
commy2
033c7c7eec Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-25 18:11:48 +02:00
Glowbal
883006c420 Create .gibot.yml 2016-09-25 12:48:52 +02:00
commy2
7f07d4e4b8 fix broken parachutes, fix #4437 (#4462) 2016-09-25 09:45:55 +02:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457)
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
2016-09-24 22:31:10 +02:00
PabstMirror
9451716a44 Show damage on repair items interaction point (#4448)
* Show damage on repair items interaction point

* Fix dot size

* Change scaling
2016-09-24 15:15:02 -05:00
commy2
bc520c7fe7 add dmg materials to spare tracks and wheel (#4450)
* add dmg materials to spare tracks and wheel

* attempt to fix damage rvmats by making FIRE GEO components convex

* get materials to work
2016-09-24 22:08:56 +02:00
commy2
c1ead851cb Add 3den attribute to disable bft (#4452)
* add 3den object attribte to disable BFT on the object

* delay setVariable public on group

* fix tooltip
2016-09-24 21:46:03 +02:00
PabstMirror
0b3d38a72f Use waitAndExecute for fatigue loop (#4453)
* Use waitAndExecute for fatigue loop

Close #4379
- Will use CBA_missionTime so it repsects pause and time accl
- Possible performance improvment over using a PFEH

* Rename main loop function
2016-09-23 16:40:52 -05:00
PabstMirror
a7c75a3bf6 Handle RHS impact grenades (RGN/RGO) (#4447) 2016-09-23 16:38:24 -05:00
jonpas
d1e15110b3 Merge pull request #4455 from acemod/yellowCircleVersionNote
Add version note to yellow Advanced Throwing circle documentation
2016-09-23 20:41:24 +02:00
jonpas
33ab8c18ff Add version note to yellow Advanced Throwing circle documentation 2016-09-23 20:21:24 +02:00
PabstMirror
f23e5d33fc Fix throwing from map screen - global XEH (#4449)
* Fix throwing from map screen - global XEH

* Fix Capitalization
2016-09-23 12:48:25 -05:00
PabstMirror
b7dfdc6c84 End path drawing when passing through Geom/Fire (#4385)
* End path drawing when passing through Geom/Fire

* Add Advanced Throwing colored circles documentation
2016-09-23 12:48:15 -05:00
PabstMirror
4abf969abf Update for newest JR / 1.64 UBC (#4208)
* Update flashsuppressor JR configs for pistols

* Update for newest JR / 1.64 UBC
2016-09-23 12:48:04 -05:00
commy2
26ae575d4a fix broken ace menu in main menu (#4451) 2016-09-22 23:55:52 +02:00
PabstMirror
39fa0b5d0e #4366 - Fix treatment animion with no weapon equiped 2016-09-21 15:55:29 -05:00
commy2
03d83b633f more immersive dogtag interaction (#4446)
* more immersive dogtag interaction

* fix indent and macro usage

* move dogtag interaction point to neck
2016-09-21 09:07:45 +02:00
PabstMirror
58bd6467b2 Debugging tool to watch variables on main display (#4408)
* Debugging tool to watch variables on main display

* Fix error when called from scheduled code

* Remove demo code
2016-09-20 12:18:44 -05:00
BaerMitUmlaut
b1f6973772 Filter player medics (#4444) 2016-09-20 16:01:54 +02:00
bux578
c395af4c21 Merge pull request #4445 from acemod/fix-grenades-baseurl
Fix grenade docs base url
2016-09-20 14:48:08 +02:00
BaerMitUmlaut
ac2a71e376 Fix grenade docs base url 2016-09-20 14:28:11 +02:00
Glowbal
c7e16210c3 fix pboprefix path 2016-09-19 23:17:10 +02:00
jonpas
d088fc5212 Revert "add LGTM configuration" (#4426) 2016-09-19 23:11:06 +02:00
BaerMitUmlaut
e8249f8991 Merge pull request #4442 from acemod/add-throwing-hint
Add hint to grenades pages for advanced throwing
2016-09-19 21:41:08 +02:00
BaerMitUmlaut
93139c86f7 Added hint to grenades pages for advanced throwing 2016-09-19 21:38:41 +02:00
BaerMitUmlaut
ddb449cdbb Merge pull request #4401 from acemod/advanced-fatigue-doc
Advanced Fatigue documentation
2016-09-19 21:18:58 +02:00
BaerMitUmlaut
ed91aec84b Fixed usage of aerobic instead of anaerobic 2016-09-19 20:37:43 +02:00
commy2
236d1f9669 Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite 2016-09-19 18:23:37 +02:00
commy2
729ba9178b Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-19 18:23:26 +02:00
commy2
6c720a7c09 Merge pull request #4440 from acemod/medical-rewrite-port-litter
port litter to treatment
2016-09-19 18:23:19 +02:00