github.com/Warzone2100/archived-3.1-branch commits

Buff cannons more: decrease production time 375->250.

72a73175bbd915e1083f5ed5ffbd8b174bb49b88 authored about 11 years ago by haonoq <[email protected]>

Merge branch 'newbugfixes' into 3.1

85d7b1fd26987fb78651ba506ff47c5411eddd52 authored about 11 years ago by vexed <[email protected]>

Disable 'View Intro' when videos are not installed.

(cherry picked from commit 770b5d45af9bd90b5356efdee1283b1da1102dec)

5a8493034f21c546a91e5823a289cc5a66e422ed authored about 11 years ago by vexed <[email protected]>

Tell autohell to ignore our lone autorevision.cache file on make distcheck

results:

======================================================
warzone2100-bugfixes archives re...

8423d90a72d1d152c0f76de36e59db0c5e5cd95b authored about 11 years ago by vexed <[email protected]>

Remove odd characters at the begining.

Odd, since it was a straight copy.

Complaint by BuildBot.

refs ticket:4130

564a8e922534e51217bfac35216f47e81cab09ed authored about 11 years ago by vexed <[email protected]>

Update Hungarian translation by mtomi78

closes ticket:4130

Note: please use the actual po name of hu.po, not hungarian.po

4868883811bf7dc01efc91454bb86968a8722bcc authored about 11 years ago by vexed <[email protected]>

Update Spanish Translation by Saberuneko

closes ticket:4137

4f37b25b91e9b1bd8589c056ca8b2c0cdd81ef57 authored about 11 years ago by vexed <[email protected]>

Make sure that a droid's weapon can actually damage the target before getting orders to pursue the target.

Patch by Kreuvf & vexed

fixes ticket:4134

af746f570c8b43d98b4b29fd68a36bf9e1f699ed authored about 11 years ago by vexed <[email protected]>

K.I.S.S

Vastly simplify how we determine what version it is.
We only support git, nothing else is needed...

cc70e11921b4913ea9b652842093fd8997db00b3 authored about 11 years ago by vexed <[email protected]>

Fix --host & --join=IP to work again.

fixes ticket:4094

8cba7f3463db890999c3ada48dcc384c77523d4b authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

f3b4d7050ee018343ac0feb3023ae703a3e0c491 authored about 11 years ago by automerge <[email protected]>

Updated textures by Christian Scholz (cnceo)

1f5432d81c621f28dc091ba50aa0fb16b6e5d1e1 authored about 11 years ago by per <[email protected]>

Update translations.

59592bc4df3fa6f69ca5059b935d643c94c314e9 authored about 11 years ago by cybersphinx <[email protected]>

Italian translation update by Alpha93.

Closes #4121.

82d77b700cc82372122c2e61ffebf05e8d470d5a authored about 11 years ago by cybersphinx <[email protected]>

Hungarian translation update by mtomi78.

Closes #4120.

7e866083c16b67b326af9406dedf46035750f633 authored about 11 years ago by cybersphinx <[email protected]>

Merge branch 'bugfixes' into 3.1

598ea0dbdf3efe90aa7165a851361917f5e4de90 authored about 11 years ago by vexed <[email protected]>

When physfs finds issues with maps, throw up a POPUP about the issue, (which makes it a non-fatal error) and then ignore said file.

205016160000614f0393f665a99a820f4e4cc424 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

ce313f4331e657bc57399ffbad3d7084fa0b6c49 authored about 11 years ago by vexed <[email protected]>

Make it more clear that the user needs to delete said file, since it unsupported or corrupted.

3eb4457e017d103693240806750494133648b55e authored about 11 years ago by vexed <[email protected]>

Revert "Bump version for 3.1.1 RC3"

This reverts commit 816556d8e48b7bf74d479e189ae3f30a757e5c58.

54327fbd8d2079ac56e5b9feabc084c7a5ccd082 authored about 11 years ago by vexed <[email protected]>

Bump version for 3.1.1 RC3

816556d8e48b7bf74d479e189ae3f30a757e5c58 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

08ff1abc9bffa58779a7f0334f5c183974bb3db4 authored about 11 years ago by vexed <[email protected]>

Update changelog for 3.1.1 RC3

932c0da57f761b62a40e22296890a8bff5b1d117 authored about 11 years ago by vexed <[email protected]>

Change laser pre-requisites: Flashlight now requires sensor upgrade Mk2, while Pulse Laser still requires sensor upgrade Mk3.

109ee4d7b9598a6696211338599eff6b1a891173 authored about 11 years ago by haoNoQ <[email protected]>

Revert "Pushing 3.1.0."

This reverts commit 766ca7eb26288bbd193b21a5fe23941f3aa02143.
(Forgot to revert this before...)
...

1f3ad783c369e3f96c94342db9f0701ac5f15f70 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

e2519b196ea166b878556ccaed994d70501a9b81 authored about 11 years ago by vexed <[email protected]>

Differentiate between maps and maps that have mods in them. Map-mods will now be shown in red on the lobby screen, and the map picker screen. It will show a red lamp next to the map if you join a game via IP or, you knowingly join a game that is hosting a map-mod.

fdd2524f1b9d425955e40c03c1447ccea6e02872 authored about 11 years ago by vexed <[email protected]>

Update translations.

38b65aa26ac9707fa3970d5c58161845ce8c2bed authored about 11 years ago by cybersphinx <[email protected]>

French translation update by machintruc.

Closes #4113.

a31930ed1d3373225d6dab29b00a6eb62d0864c5 authored about 11 years ago by cybersphinx <[email protected]>

Hungarian translation update by mtomi78.

Closes #4117.

a2d4952dda8abdc599dc13a883340583936b33aa authored about 11 years ago by cybersphinx <[email protected]>

Revert "map-mod fun"

This reverts commit ac9afb2721fc8e25a1adfe0f09106405f28ac44d.
(didn't mean to push this yet)

8cff9973b927f9a28282b6d0532168714a913ae2 authored about 11 years ago by vexed <[email protected]>

Update Changelog

(resync from RC2)

(cherry picked from commit 64e8f0e1461be2c41d6020ebbeaacf3ee191d71f)

Conflict...

65114c6dd912d0845bbcea3f70a097d331e9c342 authored about 11 years ago by vexed <[email protected]>

map-mod fun

ac9afb2721fc8e25a1adfe0f09106405f28ac44d authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

1e0ee98a9fe4f18590a997b8ff297d4361bc62a8 authored about 11 years ago by vexed <[email protected]>

Deja 'vu, Fix picky compile issue reported by buildbot. :P

53a2ec6ad5ef86d1606e74c5703077245428fc25 authored about 11 years ago by vexed <[email protected]>

Fix lobby to correctly show when no games are available because of version mismatch.

bd83349fbf3b211abdb1d9abf1c367b2f8f20c67 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

b9a5dd39e5d73a10c3879b0182a0a943fcf157c6 authored about 11 years ago by vexed <[email protected]>

Fix message for Challenges.

a2b721183d086c82bc0be7a72f0c483fd3abc5b9 authored about 11 years ago by vexed <[email protected]>

Fix the explosion effect for the Super Transporter

refs: e3279f6d033b4967b955dcaaf2ce3c5e21ed7579

7827f6bcd47dfe1ecf8d4aa95f4ae9f2adb4c15c authored about 11 years ago by vexed <[email protected]>

Fix Transporter types to take the same multiplier of damage as VTOLs

when on ground.

refs: e3279f6d033b4967b955dcaaf2ce3c5e21ed7579

9bb57850c6304ba08b7875661230b592e7f6aa4d authored about 11 years ago by vexed <[email protected]>

Try to better balance Super Transport Hitpoints now at 500,

Armor types changed to 35 & 20 and make weapon MG1-VTOL instead of MG3-VTOL

refs: e3279f6d033b49...

d5ac23a267dce5dbc51fa5a50688841ce73af4c6 authored about 11 years ago by vexed <[email protected]>

Revert:

Fix the SuperTransport body type to be SUPER HEAVY, not HEAVY.
Try harder not to have the...

b9a136ac7adeec52c9f165869c102cdfdaebd440 authored about 11 years ago by vexed <[email protected]>

Revert "If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them."

This reverts commit 75ede1da1d77b6326b9897b59d5d394d3ef533f0.

0805e57c9a0b0087283ce28006517e27967be66e authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

c739964186d26d6052e22ff1024b108bacc5dda1 authored about 11 years ago by vexed <[email protected]>

Fix false positive in the Coverity static analysis tool.

The array will never be MAX_PLAYERS (11) and overrun it, since the loop goes
up to indexLen whic...

6e5e8bdd0995880d03710d51f48db5014289ec72 authored about 11 years ago by vexed <[email protected]>

Keep a copy of our log filename that we use to work around an obscure bug(?)

in compiler flags (windows (mingw) only).

Should now correctly show the log filename on crashes ...

fb1f90dd2767a695aff7901b7685ad45884ba885 authored about 11 years ago by vexed <[email protected]>

Remove unused file multiplay/maps/4c-rush/templ.bjo.

aafca35a730fc9681495800145241ec2a75eb454 authored about 11 years ago by Cyp <[email protected]>

Merge branch 'bugfixes' into 3.1

05f9f3e42a0c6be763cc98c24c4ec6e5327edae7 authored about 11 years ago by automerge <[email protected]>

Make sure tar does not make `._` files.

a3468b1a00da072539ded959b1bdfdfb5673007a authored about 11 years ago by dak180 <[email protected]>

Make sure to remove the leading `v`.

2b0dc1bce3729a633ad4df218eb790b362b943e3 authored about 11 years ago by dak180 <[email protected]>

Fix build with C++11 and/or Qt.

"blah"PRIu64 was interpreted as a string literal, and wzDelay was missing.

35745a79a39216de1f87225a2041b7370d6801d3 authored about 11 years ago by Cyp <[email protected]>

Quote all possible spaces the mkdmgs script.

5d5a6eb8b7c4f38cf3d03eaa7430e8c972b5ed3e authored about 11 years ago by dak180 <[email protected]>

Fix Hungarian translation.

Refs #4112.

ea8e66a9e386c61e0917ac6af5f28d87553236c6 authored about 11 years ago by cybersphinx <[email protected]>

Hungarian translation update by mtomi78.

Closes #4112.

feafcad20ccdc5795755d4839860e98ef3bacd06 authored about 11 years ago by cybersphinx <[email protected]>

Reinitialize AI data and player names each time frontend is reloaded. This closes ticket:3994.

143c5dafff0705d9791437a2d023e03e1a945327 authored about 11 years ago by per <[email protected]>

Add workaround for null pointer reference bug on recycling in factory. Closes ticket:4035.

f0bb142e4540a0325e75676123154bcd5cf8a227 authored about 11 years ago by per <[email protected]>

Update Readme by removing out of date information regarding

command-line options. Refer instead to wiki and --help option.
Closes ticket:4104

d4dda2323a66d57446d0e41403f8a3fb676306d2 authored about 11 years ago by per <[email protected]>

Merge branch 'bugfixes' into 3.1

3f316f1532adb3b1d6bd23be8fd2586e6cfc0768 authored about 11 years ago by vexed <[email protected]>

Note, this is *only* for MP, not campaign!

* Cyborg transporter weapon removed. [assignweapons.txt]
* Machine gun upgrades: [functions.txt...

cb407b558da5155ae52c5d8afb4b36e8d258935a authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

* bugfixes:
Hungarian translation update by mtomi78.

fbf9074334324ac4f5488964ea853f9525966b3a authored about 11 years ago by cybersphinx <[email protected]>

Hungarian translation update by mtomi78.

Closes #4110.

3106ec26ba0522381ab6e287e5865f5654664f54 authored about 11 years ago by cybersphinx <[email protected]>

Merge branch 'bugfixes' into 3.1

41fcf0233859b16562af0fb50d302d9f64bebf3a authored about 11 years ago by vexed <[email protected]>

If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them.

75ede1da1d77b6326b9897b59d5d394d3ef533f0 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

8a340bc143979d3be77ad2939e4f1c77f50afad8 authored about 11 years ago by vexed <[email protected]>

Allow VTOL factories to produce SUPER_HEAVY units.

4458c8b2edece39175bda25ecf8ac84c2633feca authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

ef0db3a6ffa260703c2bb365e9b286d0081a011d authored about 11 years ago by vexed <[email protected]>

Revert "Add fix for backwards terrain shadows by Berg"

This reverts commit 85ecd9a3937e7843d9eb4798572651f950bd7555.

This caused the mini-map to r...

0fc924f7c1a4a2c0ea2128216d433db0155ce427 authored about 11 years ago by vexed <[email protected]>

qtscript: Make eventDestroyed() trigger on every destroyed object, not just those you own.

(cherry picked from commit 14476581cc897fd9fc2fec60c8dfddd2ec10fd42)

10157526039c464d2aa17fefecf872c25dbc6c70 authored about 11 years ago by haoNoQ <[email protected]>

Merge branch 'bugfixes' into 3.1

4be4b01140efd9367a6ad7726b8e1447e909d602 authored about 11 years ago by automerge <[email protected]>

Fix possible crash in campaign when returning home to factory that does not exist. Discovered by Coverity scanner.

83cd123e74c079b1b9d5d1337363261eb161e243 authored about 11 years ago by per <[email protected]>

Update translations.

0f7a152599cb2a27d7826fe92b74005eca06453b authored about 11 years ago by cybersphinx <[email protected]>

Update POTFILES.in and custom translations.

7e24f1f5f396601d44d7bc315a2e270d3a713d6c authored about 11 years ago by cybersphinx <[email protected]>

French translation update by machintruc/cpasmoi.

dd9a750e13bf0703aedd20384f40376845e25c72 authored about 11 years ago by cybersphinx <[email protected]>

Merge branch 'bugfixes' into 3.1

6d63bdbfffab1f78c70e41032647afc6961a715e authored about 11 years ago by vexed <[email protected]>

Reformat some messages to fit correctly in the console area.

Don't retry UPnP configuration after it failed, and while still in the game lobby screen.
(You ne...

1498b6c40e81999fc58e5c42d741f1d80f8de325 authored about 11 years ago by vexed <[email protected]>

Update NullBot to the latest version, include Turtle and Hover AI

c86552aca0596f01ad125f08f4031c8d44877cef authored about 11 years ago by haonoq <[email protected]>

Make Semperfi AI add cyborgs into the attack group.

(cherry picked from commit 3718c21c62067a5a8a3ed6bf399211bbf0f771ac)

3dabf10d63e596ce1ca5174346d672dcd00d1c04 authored about 11 years ago by haonoq <[email protected]>

Merge branch 'bugfixes' into 3.1

d15d7211f30a370574cb4f2b0a4c8063256aeb3b authored about 11 years ago by vexed <[email protected]>

Updata changelog

cd3c925169a8d33428b0989c9335d05d0c567215 authored about 11 years ago by vexed <[email protected]>

*3.1* Set default size of textures to be 512

refs ticket:3830

899d60e2ffed26d90670b4cc5dd8d797f28b810c authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

b83a68f2d74ce6e7b4960acb80b5126d2787d771 authored about 11 years ago by vexed <[email protected]>

Remove/hide filter icon when needed.

14aa458f0972af22c2d2eb5f22c787563e7a5258 authored about 11 years ago by vexed <[email protected]>

Show kick message when kicked, and show host has quit message if host quit (in lobby).

Fixes ticket:4007

76ed7aed41ed59931f6d5a5982b13483e7cb9de4 authored about 11 years ago by vexed <[email protected]>

Add a wzDelay function to be used to delay things

aac6622fa3caf6cd1523ee6ea4f2cc3d8955d267 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

e572fc25b4694c14e47179d61a621931000ae622 authored about 11 years ago by vexed <[email protected]>

Add filter icon by duha

Add refresh icon by slate

Fix button states.

854b22c77094f446e983ffeb7d4b4d3bc4ecc8dc authored about 11 years ago by vexed <[email protected]>

Portable Warzone fixes for windows.

Fix windows paths.

Windows portable icon by forum member Duda.
Portable header & welcome images ...

4086e93c16a74491e3b6a58efb2df5e3714b0079 authored about 11 years ago by vexed <[email protected]>

Only need to show the UPnP stuff for Hosts.

43bf1a8b30655d3037cf44d9f6e4963b01843bd7 authored about 11 years ago by vexed <[email protected]>

Bump net version

cac0091cb724d4abbbbdf15bb19d7087d00965a4 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

b0dacce4c4b14ab622e3d5749f19038bcd469717 authored about 11 years ago by vexed <[email protected]>

Fix picky compile issue reported by buildbot. :P

4de83bcb7dd588eb86da32df65f49da05f2721a8 authored about 11 years ago by vexed <[email protected]>

Fix the SuperTransport body type to be SUPER HEAVY, not HEAVY.

Try harder not to have them be on top of each other (only in MultiPlayer games).
Fix explosion ty...

e3279f6d033b4967b955dcaaf2ce3c5e21ed7579 authored about 11 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

4e01823ffbcec5840877e97ed5a68a5c385be020 authored about 11 years ago by vexed <[email protected]>

Fix a off by one error for AI count.

d5428b94e48bc8209abcf1dc2e865fff03a2c140 authored about 11 years ago by vexed <[email protected]>

Fix AI picking to show at most 8 AIs, because of the limitations of the GUI. closes ticket:3147

(cherry picked from commit 20c7024a9bfff73ce3a9338a17381cfb110a1d40)

c2ded00ed4dc6a8ffbb2c1e2a608b92132baa111 authored about 11 years ago by vexed <[email protected]>

Fix off-by-one memory error

(cherry picked from commit 1e6e097e7ab5112b4e603c2996ced41dccf77df9)

cf317799adf0370a4bdb8067ba8aeeeb5c9f6d36 authored about 11 years ago by per <[email protected]>

Merge branch 'bugfixes' into 3.1

8789fc1e954399617e68fcc4b1cc7493bfdbf79a authored about 11 years ago by automerge <[email protected]>

Fix the mac build for 8f4adda2.

Refs. ticket:4095.

992113d98ccaba7e9d17e6a917da31214f9c44e3 authored about 11 years ago by dak180 <[email protected]>

Merge branch 'bugfixes' into 3.1

cc08a48058bab983b03b7de3ee1b887993b015bf authored about 11 years ago by vexed <[email protected]>

Only display the UPnP messages for MP games, not for skirmish.

9a1e472e42db8bdc68de60e81c96e7b94042f16a authored about 11 years ago by vexed <[email protected]>

Ecosyste.ms: OpenCollective

github.com/Warzone2100/archived-3.1-branch