ace3mod
b1c969c89d
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2018-05-31 17:44:13 +02:00
Ozan Eğitmen
a917d586cb
Pylons - Separate settings for in-game and zeus ( #6365 )
...
* Modernize pylons
* Revert docs/wiki/featurex/fortify.md
* Bring back ACE settings with movedToSQF
* 🤦
* Move settings to separate file, Fix postInit logic problems
* Tabs -> spaces
2018-05-31 10:43:02 -05:00
EtoileRei
a5a8c68831
Japanese Translation Tweak ( #6375 )
...
- fixed typo
- improved readability
- standardized expression
2018-05-31 10:34:19 -05:00
BaerMitUmlaut
9aba78b320
Fix AF sway factor ( #6360 )
...
* Fix sway factor, switch to CBA settings in AF
* Add movedToSQF
2018-05-30 18:05:55 -05:00
mharis001
232f986048
Pass by reference for BI EHs ( #6368 )
2018-05-30 17:39:28 -05:00
mharis001
f3f57c6a38
Cleanup unused priority entry for interact menu actions ( #6372 )
2018-05-30 16:48:19 -05:00
shukari
bdc58441f4
Fixed mortar double loading ( #6240 )
...
* block double loading
* prevent double loading
* block double loading
* use nil
* use nil
* fix some wrong variables
* not needed here
* unload only one person
* prevent duping
* wrong makro
* wrong makro
* wrong macros
* wrong macros
2018-05-30 16:45:31 -05:00
BaerMitUmlaut
9acce30dd3
Fix doc for aneaerobic pathway ( #6379 )
2018-05-30 15:25:58 +02:00
Dmitry-Yuri
9c60ec06e4
Fix Pointing Problems with Static Weapons ( #6377 )
...
* Update fnc_keyPress.sqf
* Update fnc_keyPress.sqf
2018-05-29 22:04:32 +02:00
EtoileRei
0199ba9b4c
Japanese Translation Tweak ( #6374 )
...
# fixed typo
# improved readability
# standardized expression
2018-05-28 07:15:28 +02:00
BaerMitUmlaut
3ebdb31a82
Replace make.bat with more advanced make.ps1
2018-05-27 20:28:38 +02:00
Thomas Kooi
e916f3eb5b
Increase build parallelism on circleci
2018-05-23 22:05:33 +02:00
SilentSpike
54c398a007
Use macros for peripheral resistance
2018-05-23 10:52:47 +01:00
SilentSpike
52dbef84ab
Fix incorrect macro variable
2018-05-23 10:27:12 +01:00
jonpas
c9d774eeeb
Merge branch 'master' into armake
2018-05-23 00:44:55 +02:00
jonpas
5e6ae3ca36
Revert documentation changes
2018-05-23 00:41:15 +02:00
Thomas Kooi
9d0e2014cf
Delete travis ci config file ( #6361 )
...
Travis CI is no longer being used.
2018-05-22 23:02:34 +02:00
jonpas
326604ae9f
Fix particles preprocessing for both armake and pboProject
2018-05-22 20:09:30 +02:00
jonpas
9a37713710
Fix pboProject compatibility
2018-05-22 19:53:26 +02:00
jonpas
f613597636
Make setup.py compatible with new include CBA structure
2018-05-22 19:49:19 +02:00
SilentSpike
de2d7f2fb8
Use macros for hemorrhage class tracking
2018-05-22 18:25:50 +01:00
SilentSpike
c9e11e62a1
Use macros for status state variables
2018-05-22 18:06:28 +01:00
jonpas
ef2c8c9502
Remove copying of inexisting userconfig, Bring version number up to date
2018-05-22 18:55:12 +02:00
jonpas
4054b0acba
Update CBA include (from its armake setup) and enable excessive concatenation warnings
2018-05-22 18:45:27 +02:00
jonpas
90e51e501c
Update A3 includes
2018-05-22 18:42:14 +02:00
SilentSpike
ff33f8e954
Use macro for unconscious variable
2018-05-22 17:21:24 +01:00
jonpas
7dda6c62ef
Update armake Windows binaries to 0.6.1, Use new signature name argument and header info for 'version'
2018-05-22 17:21:48 +02:00
jonpas
40de340d82
Revert changes that shouldn't be changed
2018-05-22 17:17:05 +02:00
Thomas Kooi
04a452bbc3
Add deploy step to same build step
2018-05-20 11:11:11 +02:00
Thomas Kooi
58f4ca4581
Merge branch 'master' into armake
2018-05-20 11:08:58 +02:00
Thomas Kooi
10f19997bd
Armake install ( #6356 )
...
Add building ace3 on CircleCI using armake. It will build it on every commit / PR
2018-05-20 11:07:00 +02:00
commy2
104efe28bc
Merge pull request #5773 from jlillis/adv_fatigue_sway_factor
...
Add sway factor option to advanced fatigue
2018-05-19 02:43:53 +02:00
commy2
e289acbb4e
Merge branch 'master' into adv_fatigue_sway_factor
2018-05-19 02:43:11 +02:00
Dedmen Miller
4ede9858e5
Fix minor typo in fnc_cachedCall ( #6346 )
2018-05-16 20:00:51 -05:00
commy2
d6a88ac34a
Merge pull request #5828 from xrufix/AimCoef
...
Add ability to set aiming coefficient for mission scripting.
2018-05-16 07:53:09 +02:00
SilentSpike
563742bdd8
Fix heart rate and pain suppression adjustments
2018-05-11 16:11:01 +01:00
SilentSpike
1dc934e1b1
Use macros for unit variables
...
Improves the way medical is storing variables in object space by having
a common list of variables names as macros. Makes the code a bit cleaner
and ensured consistency across components. Also a handy reference for
when working on medical to see what values are all stored.
2018-05-11 15:28:25 +01:00
classic
2cd4615d5d
Update Japanese translations ( #6340 )
...
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
* Update Japanese translation
2018-05-11 08:39:32 -05:00
SilentSpike
e0503129f0
Use blood bolume status macros
2018-05-10 17:44:02 +01:00
SilentSpike
4715a75351
Include all UI files
2018-05-10 16:47:11 +01:00
SilentSpike
65a3c32f9f
Fix patient information display
2018-05-10 16:42:33 +01:00
SilentSpike
267c0b5c3c
Fix some moved function calls
2018-05-09 16:52:26 +01:00
PabstMirror
4df3cfe8a0
Clean up ace_main requiredAddons list ( #6332 )
...
Close #6331
2018-05-09 10:32:44 -05:00
Dystopian
a4b803e2c1
Interaction - Allow RHIB push ( #6302 )
2018-05-09 10:09:34 -05:00
PabstMirror
b1526ccb86
Spall - Don't throw script errors in doSpall if input is bad ( #6322 )
...
- Fix #5614
- Don't run tracking siumlation on small calibre ammo that won't ever spall
2018-05-09 10:08:26 -05:00
SilentSpike
dbb538dc56
Fix GVARs moved out of medical
2018-05-09 13:37:07 +01:00
SilentSpike
b81bee2d46
Fix bandage and injector icon paths
2018-05-08 14:55:13 +01:00
SilentSpike
33a5fb46f5
Fix patient information display
2018-05-08 14:51:32 +01:00
SilentSpike
4303a340de
Fix stringtable duplicates and missing Key tag
2018-05-08 14:37:54 +01:00
SilentSpike
e97e1ed670
Fix more icon paths
2018-05-08 13:57:32 +01:00
