Commit Graph

22620 Commits

Author SHA1 Message Date
Mustafa Alperen Seki
f585b94b4c Add Ordos 1a 2017-01-31 08:58:14 +02:00
abcdefg30
274cf14c6f Merge pull request #12613 from reaperrr/prep-slim-ra-weapons3-misl
Prepare RA weapons for inheritance part 3 - Missiles
2017-01-23 23:01:17 +01:00
abcdefg30
8910a8aec5 Merge pull request #12612 from reaperrr/prep-slim-ra-weapons2-small
Prepare RA weapons for inheritance part 2 - small arms
2017-01-23 22:59:48 +01:00
reaperrr
9f9bda9634 Move FLAK weapons up in RA smallcaliber.yaml 2017-01-23 21:19:28 +01:00
reaperrr
decf2150a7 Move RA Colt45 down inside smallcaliber.yaml 2017-01-23 21:19:27 +01:00
reaperrr
ce41a037ee Move APTusk up in RA missiles.yaml 2017-01-23 21:14:53 +01:00
reaperrr
319d53990a Move SubMissiles down in RA missiles.yaml 2017-01-23 21:14:51 +01:00
reaperrr
3c2fe1e1a7 RA missile warhead naming fixes
To make inheritance easier later on.
2017-01-23 21:14:50 +01:00
reaperrr
9d62c1a1d6 Merge pull request #12610 from obrakmann/sysinfo-64bit
Add OS bitness to sysinfo query
2017-01-23 20:49:50 +01:00
Paul Chote
f4bcf79e7c Merge pull request #12524 from paulvt/deb-packaging-lintian-clean
Debian packaging lintian clean
2017-01-23 18:20:10 +00:00
abcdefg30
d165523072 Merge pull request #12608 from MustaphaTR/d2k-crate-terrain-types
D2K - Add more tile types to possible places Crates can spawn
2017-01-23 13:49:31 +01:00
Mustafa Alperen Seki
695b6e5c9a Add Transition, Spice and Concrete to Crate's TerrainTypes 2017-01-23 07:53:08 +02:00
Oliver Brakmann
53c037aa53 Add OS bitness to sysinfo query 2017-01-22 21:36:32 +01:00
Oliver Brakmann
6177855e20 Merge pull request #12607 from MustaphaTR/d2k-fix-carryall-on-concrete
D2K - Fix Carryalls can't land on Concrete
2017-01-22 21:07:11 +01:00
Paul van Tilburg
17617334dd Nothing should have group writable permissions
These might occur due to difference in umask values.
2017-01-22 20:41:19 +01:00
Mustafa Alperen Seki
bcee1fafd8 Add "Concrete" to Carryall's "LandableTerrainTypes:" 2017-01-22 20:31:59 +02:00
abcdefg30
e489211434 Merge pull request #12481 from reaperrr/rem-runafterdelay
Remove Game.RunAfterDelay from SwallowActor
2017-01-22 17:54:16 +01:00
reaperrr
d05d7a6944 Remove Game.RunAfterDelay from SwallowActor
RunAfterDelay might be potentially problematic for savegame support.
2017-01-22 17:41:55 +01:00
reaperrr
42df24a18a Introduce MapNotificationEffect 2017-01-22 17:41:55 +01:00
reaperrr
c470e04988 Merge pull request #12566 from reaperrr/ts-weapons-misc1
Various minor TS weapon cleanups
2017-01-22 16:40:41 +01:00
reaperrr
e4fd10e46b Merge pull request #12603 from reaperrr/fix-d2k-spicebloom-spawns
Fix spicebloom spawns on all older D2k maps
2017-01-22 16:38:23 +01:00
reaperrr
d435cbc0c2 Fix Ion Cannon targeting to allow shooting at water 2017-01-22 12:30:38 +01:00
reaperrr
489fb91f26 Remove TS bombsandgrenades.yaml and move its weapons elsewhere
Grenade and RPGTower weapon to ballisticweapons.yaml, Bomb to otherweapons.yaml
2017-01-22 12:30:38 +01:00
reaperrr
68e45f7c67 Rename TS largeguns.yaml to ballisticweapons.yaml 2017-01-22 12:27:48 +01:00
reaperrr
a41cfc50a8 Enable water splash for TS AA missile
On the unlikely off chance that the missile might fall into water.
2017-01-22 12:27:48 +01:00
reaperrr
bbff2b3fd4 Remove unnecessary smudge warhead removals
The smudge WH code now exits early when exploding above ground, so this is no longer necessary.
Also renamed the default smudge WH identifier since the number is (currently) no longer correct and not necessary, either.
2017-01-22 12:27:48 +01:00
reaperrr
2036ed55d7 Remove air-only explosions from TS missiles
The original didn't differentiate, and the audiovisual contrast is also a bit too strong (and the air explosion sound was a bit annoying).
2017-01-22 12:27:48 +01:00
reaperrr
a9d8cd58c5 Replace pre-placed spiceblooms with spawners on all D2k maps
Spice Blooms are not supposed to grow on cells occupied with spice, so it's better to use the spicebloom.spawnpoint actor instead as most of them are placed on cells initially covered by spice.
2017-01-22 12:10:38 +01:00
reaperrr
c80072e7f3 Minor d2k yaml style fixes 2017-01-22 12:10:36 +01:00
abcdefg30
b5944fe1a7 Merge pull request #12515 from reaperrr/slim-d2k-weapons
Slim down D2k weapon yamls
2017-01-22 00:06:43 +01:00
abcdefg30
d8c154a772 Merge pull request #12546 from Mailaender/sdl2-2.0.5
Updated Windows SDL2 to version 2.0.5
2017-01-21 23:46:47 +01:00
Oliver Brakmann
c5cf787b84 Merge pull request #12501 from pchote/osx-retina
Add HiDPI support for OSX/Windows/Linux
2017-01-21 22:54:15 +01:00
Oliver Brakmann
145fd2eed0 Merge pull request #12571 from reaperrr/bullet-bounce
Implement bullet bouncing logic
2017-01-21 22:06:23 +01:00
Oliver Brakmann
05475d752a Merge pull request #12503 from pchote/radarjammer
Migrate ProvidesRadar from IDisable to conditions.
2017-01-21 20:55:37 +01:00
Oliver Brakmann
e5dda218ea Merge pull request #12540 from reaperrr/takeovers/minelayer-merge
Merge RA minelayers
2017-01-21 19:51:29 +01:00
Paul Chote
85053d8d59 Merge pull request #12601 from obrakmann/activities-pt1.5
Rename existing activity states
2017-01-21 17:32:18 +00:00
Paul Chote
1f44e91746 Migrate ProvidesRadar to conditions and remove JamsRadar. 2017-01-21 17:24:54 +00:00
Paul Chote
18d2454306 Pixel double hardware cursors on non-OSX. 2017-01-21 11:00:00 +00:00
Paul Chote
fb451fb203 Add an OPENRA_DISPLAY_SCALE environment variable for linux. 2017-01-21 11:00:00 +00:00
Paul Chote
87b894ad8e Add support for the windows DPI scaling. 2017-01-21 11:00:00 +00:00
Paul Chote
5e7c816257 Add support for font scaling. 2017-01-21 10:59:59 +00:00
Paul Chote
6599aeb035 Add support for retina displays on OSX. 2017-01-21 10:59:59 +00:00
Paul Chote
951ce92fcc Update to new OSX launcher snapshot. 2017-01-21 10:59:59 +00:00
Paul Chote
75c2b117d0 Update to new SDL2-CS snapshot. 2017-01-21 10:59:59 +00:00
reaperrr
bb972fa46d Merge pull request #12591 from MustaphaTR/d2k-map-tsimpo
D2K - Add Tsimpo to map pool.
2017-01-21 11:05:55 +01:00
reaperrr
67e225f12d Merge pull request #12590 from MustaphaTR/d2k-map-sietch-tabr
D2K - Add Sietch Tabr to map pool.
2017-01-21 11:05:36 +01:00
reaperrr
71dcc11e57 Merge pull request #12589 from MustaphaTR/d2k-map-habbanya-erg
D2K - Add Habbanya Erg to map pool.
2017-01-21 11:05:20 +01:00
reaperrr
a19cecd34e Merge pull request #12588 from MustaphaTR/d2k-map-habbanya-ridge
D2K - Add Habbanya Ridge to map pool.
2017-01-21 11:05:01 +01:00
Oliver Brakmann
683d3e747b Rename existing activity states 2017-01-20 22:16:25 +01:00
Mustafa Alperen Seki
9ab2d2d763 Added D2K map Sietch Tabr 2017-01-20 13:42:28 +02:00