Commits · develop · Xiam / empires_scripts

15 Sep, 2018 1 commit
- Merge branch 'develop' into 'develop' · c3dd5558
  Xiam authored Sep 15, 2018
```
Develop

See merge request !1
```
  c3dd5558
27 Aug, 2018 1 commit
- Merge branch 'bugfix/railgun-parent-research' into 'develop' · a7c4912b
  Max Maton authored Aug 27, 2018
```
Fix railgun parent research

See merge request !60
```
  a7c4912b
26 Aug, 2018 1 commit
- Fix railgun parent research · 1c6689bc
  Max Maton authored Aug 26, 2018
  
  1c6689bc
03 Dec, 2017 1 commit
- Merge branch 'bugfix/2.15_typos' into 'develop' · 5b8b0a9a
  Max Maton authored Dec 03, 2017
```
Fix for research items typos introduced in 2.15

See merge request !59
```
  5b8b0a9a
27 Nov, 2017 4 commits
- Fixed research item typos introduced in 2.15 · c95f3cbc
  D.D.D. Destroyer authored Nov 27, 2017
  
  c95f3cbc
- Merge branch 'feature/BEAR_slight_nerf' into 'develop' · 795b5cf1
  Max Maton authored Nov 27, 2017
```
BEAR falloffEnd 8000->6000  MinimalDamage 22->20

See merge request !58
```
  795b5cf1
- Merge branch 'feature/UML_slight_buff' into 'develop' · f1241342
  Max Maton authored Nov 27, 2017
```
UML damage 60->62  Speed 2500->2600  HDML  damage 66->68 Speed 2650->2750

See merge request empires_public/empires_scripts!57
```
  f1241342
- Merge branch 'feature/NFHR_slight_tweaks' into 'develop' · 15df370a
  Max Maton authored Nov 27, 2017
```
NFHR  Damage 43->45  FallofEnd 5250->7000 MinimalDamage 35->33

See merge request !56
```
  15df370a
26 Nov, 2017 6 commits
- UML damage 60->62 Speed 2500->2600 HDML damage 66->68 Speed 2650->2750 · d7c8379f
  Sgt.Security authored Nov 27, 2017
  
  d7c8379f
- NFHR Damage 43->45 FallofEnd 5250->7000 MinimalDamage 35->33 · daf983c7
  Sgt.Security authored Nov 27, 2017
  
  daf983c7
- BEAR falloffEnd 8000->6000 MinimalDamage 22->20 · 6ea615da
  Sgt.Security authored Nov 27, 2017
  
  6ea615da
- Merge branch 'feature/research-translations' into 'develop' · 60d6bf2c
  Max Maton authored Nov 26, 2017
```
Feature/research translations

See merge request !53
```
  60d6bf2c
- Merge branch 'feature/hint-translations' into 'develop' · 81dc201d
  Max Maton authored Nov 26, 2017
```
Changed vehicle script hints to refer to translation template files

See merge request !54
```
  81dc201d
- Merge branch 'develop' into 'feature/hint-translations' · b1d9cdbc
  Max Maton authored Nov 26, 2017
```
# Conflicts:
#   vehicle_weapons.txt
```
  b1d9cdbc
22 Oct, 2017 3 commits
- Changed old skill texts to translation keys · f2e3e1e2
  Ralf van Daal authored Oct 22, 2017
  
  f2e3e1e2
- Replaced the old texts with translation keys · 5054ce04
  Ralf van Daal authored Oct 22, 2017
  
  5054ce04
- Replaced old building hints with translation keys · 58cbcc9c
  Ralf van Daal authored Oct 22, 2017
  
  58cbcc9c
17 Sep, 2017 22 commits
- Merge branch 'bugfix/no_falloff_veh_mg' into 'develop' · ee93753d
  Smithy authored Sep 17, 2017
```
Some vehicle mg weapons have no falloff values.

See merge request !55
```
  ee93753d
- Some vehicle mg weapons have no falloff values. · 3db8ea9d
  Smithy authored Sep 17, 2017
  
  3db8ea9d
- Update vehicle_imp_afv.txt · d7e0ac3a
  Ralf van Daal authored Sep 17, 2017
  
  d7e0ac3a
- Update vehicle_imp_apc.txt · 86d348a0
  Ralf van Daal authored Sep 17, 2017
  
  86d348a0
- Update vehicle_imp_apc.txt · 99177970
  Ralf van Daal authored Sep 17, 2017
  
  99177970
- Update vehicle_imp_afv.txt · 92565941
  Ralf van Daal authored Sep 17, 2017
  
  92565941
- Merge branch 'feature/js-hud-health' into 'develop' · 257a4437
  Jonathan authored Sep 17, 2017
```
Feature/js hud health

See merge request !51
```
  257a4437
- Update vehicle_nf_med_tank.txt · 49925bcd
  Ralf van Daal authored Sep 17, 2017
  
  49925bcd
- Update vehicle_nf_light_tank.txt · 2f9fb6cc
  Ralf van Daal authored Sep 17, 2017
  
  2f9fb6cc
- Update vehicle_nf_jeep.txt · bbe707ae
  Ralf van Daal authored Sep 17, 2017
  
  bbe707ae
- Update vehicle_nf_heavy_tank.txt · 97b0fc79
  Ralf van Daal authored Sep 17, 2017
  
  97b0fc79
- Update vehicle_nf_comm.txt · 21580305
  Ralf van Daal authored Sep 17, 2017
  
  21580305
- Update vehicle_nf_arty_tank.txt · b9111d75
  Ralf van Daal authored Sep 17, 2017
  
  b9111d75
- Update vehicle_nf_apc.txt · 93fce20d
  Ralf van Daal authored Sep 17, 2017
  
  93fce20d
- Update vehicle_imp_med_tank.txt · ad99b2ed
  Ralf van Daal authored Sep 17, 2017
  
  ad99b2ed
- Update vehicle_imp_jeep.txt · 94299278
  Ralf van Daal authored Sep 17, 2017
  
  94299278
- Update vehicle_imp_heavy_tank.txt · d02bb513
  Ralf van Daal authored Sep 17, 2017
  
  d02bb513
- Update vehicle_imp_comm.txt · cc54b8d6
  Ralf van Daal authored Sep 17, 2017
  
  cc54b8d6
- Update vehicle_imp_arty_tank.txt · e2a8710b
  Ralf van Daal authored Sep 17, 2017
  
  e2a8710b
- Update vehicle_imp_apc.txt · 054f6750
  Ralf van Daal authored Sep 17, 2017
  
  054f6750
- Update vehicle_imp_afv.txt · d2c37cc5
  Ralf van Daal authored Sep 17, 2017
  
  d2c37cc5
- Merge branch 'develop' into feature/js-hud-health · cee6fd03
  Jonathan authored Sep 17, 2017
  
  cee6fd03
14 Sep, 2017 1 commit
- Merge branch 'tmp/weapons' into feature/hint-translations · 0e60851c
  Max Maton authored Sep 15, 2017
  
  0e60851c