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

<netplay>

astyle with:
--suffix=none
--style=allman
--indent=tab
--indent-cases
--indent-namespaces
--pad-...

ec867bdc3e822b1a9831ac002579baaa6df60427 authored almost 10 years ago by astyle <[email protected]>

<ivis_opengl>

astyle with:
--suffix=none
--style=allman
--indent=tab
--indent-cases
--indent-namespaces
--pad-...

97f2e860552575098a6868132539e17b0f6318a5 authored almost 10 years ago by astyle <[email protected]>

<gamelib>

astyle with:
--suffix=none
--style=allman
--indent=tab
--indent-cases
--indent-namespaces
--pad-...

7ba8876ed25f36b985d6be4763694422f81c4cdc authored almost 10 years ago by astyle <[email protected]>

<framework>

astyle with:
--suffix=none
--style=allman
--indent=tab
--indent-cases
--indent-namespaces
--pad-...

f3642db68114955a6ae0a48752ace0ea9e01294a authored almost 10 years ago by astyle <[email protected]>

<exceptionhandler>

astyle with:
--suffix=none
--style=allman
--indent=tab
--indent-cases
--indent-namespaces
--pad-...

0d4deba9509ae6a26b8bc70e3a3dc34cd2b3ed04 authored almost 10 years ago by astyle <[email protected]>

<src> astyle with: --suffix=none --style=allman --indent=tab --indent-cases --indent-namespaces --pad-oper --pad-header --unpad-paren --add-brackets --align-pointer=name --min-conditional-indent=0 --indent-preprocessor --keep-one-line-statements

cecce2b0aaf46fb50a9ccaf215c2d963fc9c038e authored almost 10 years ago by astyle <[email protected]>

<bugfixes> NOTE: the tag bugfixes_base was made prior to this commit, in case you need a "clean" copy of the prior state of bugfixes.

Cleaned up with astyle with these options:
--suffix=none
--style=allman
--indent=tab
--indent-ca...

b8ce4995a09b2ea6cbca85394bcce63aeb905e81 authored almost 10 years ago by astyle <[email protected]>

Merge branch 'bugfixes' into 3.1

7279f96acf1bb63cb4623f15b971ae54a1d4ff56 authored about 10 years ago by vexed <[email protected]>

Fix C&P error 93c18a2385 to fix selection issues.

837d79f6fa0c61754495b6fc8085c634a356c16e authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

Conflicts:
lib/netplay/netplay.cpp

c46c7f48a551bf914f399ea5aee050367299cebe authored about 10 years ago by vexed <[email protected]>

Implement new NETCODE version coding.

See: http://developer.wz2100.net/wiki/ReleaseChecklist for explanation.

935294824e90d19ca571a27a02fef22f8c0914ea authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

1e2b899ffdb474f0dde5f50074311713e15239ae authored about 10 years ago by vexed <[email protected]>

Fix mac builds Patch by Wolftrac.

8fd1413adf13b176a31879d257b03a98ea4fa425 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

8b474d939ca95c7f686aafee00082b977d769326 authored about 10 years ago by vexed <[email protected]>

Updated/added names.

cd1099dc938b5367e79e6115c3e05dd990bae61a authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

8f58e7f2b919b793101cb7330f236c0226d68369 authored about 10 years ago by vexed <[email protected]>

Xcode updates by Wolftrak.

fixes ticket:4265

a9f1e1a58e435cb00b56b167950807b80c769be4 authored about 10 years ago by vexed <[email protected]>

changelog updates

4bfbf5156eb914fc8187ae982e81b5448ce40a58 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

b489bcc6ad12988599844870f2a55b08ab68fc31 authored about 10 years ago by vexed <[email protected]>

Fix mac URL parsing.

6c1118dac5b214928f5321972aa71f49eb6c9a08 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

* bugfixes:
Update translations.
Hungarian translation update by MeszarosTomi.
Another Hun...

aadd0ddb9264df156e3ba18884e2e7409d9d5307 authored about 10 years ago by cybersphinx <[email protected]>

Update translations.

e3126d90259fb859eee3eb13a4e9fe327a81834b authored about 10 years ago by cybersphinx <[email protected]>

Hungarian translation update by MeszarosTomi.

Closes #4264, #4266.

f3f769f69bf12087e1df4c3a125a2d8559877012 authored about 10 years ago by cybersphinx <[email protected]>

Another Hungarian update.

by Mészáros Tamás & Szalai Kálmán

fixes ticket:4264

NOTE to updater, please name the po file co...

2e5a3806859a7625e3782e243f0c1aed46071f7a authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

5d8cb52d2de9c45fbc51921cd94181223967fbe0 authored about 10 years ago by vexed <[email protected]>

Add tooltips to our hyperlinks.

6eda68d567b95a278fe28eff8ce2a6601988ce33 authored about 10 years ago by vexed <[email protected]>

BACKPORT: Add donation link

(cherry picked from commit db65c97c710cf7bfa2ba0fc849b5a861aebf6cbc)

Conflicts:
src/frontend.c...

f95e752e796ad61af56ccc7410fb88d05a33d06e authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

Conflicts:
win32/warzone2100.rc
win32/warzone2100_portable.rc

a3e2f7bc491e1773fe016708f205934619ed786f authored about 10 years ago by vexed <[email protected]>

Notify host & client of a new game version when available. refs ticket:4257 refs ticket:4259

3e746930ebe6d5f8de759f899eb31fe62d32493a authored about 10 years ago by vexed <[email protected]>

Fix display name(s) to update correctly.

refs ticket:4259

7aee7377f211970e3168a4f0f603008f1fbcaace authored about 10 years ago by vexed <[email protected]>

Use our configdir (which is the only directory WZ should ever write to) for all crash handlers now.

Fixes ticket:3885
refs ticket:4259

ff1ac373abec15ca4095a82b76d0e584741a15d4 authored about 10 years ago by vexed <[email protected]>

Introduce a rudimentary way to check if they have the latest version of the game. (Part 1)

refs ticket:4257
refs ticket:4259

b92a1d9328223f50911833fe5a0aa285bc3fd02c authored about 10 years ago by vexed <[email protected]>

Create a new font size of medium since large was too large for some languages, and regular was too small to read at higher resolutions.

refs ticket:4259

fdf94efb19f2407d44cd27ec66a4e968c9f9d72d authored about 10 years ago by vexed <[email protected]>

Remove old, inaccurate credits screen. Will replace as soon as forum thread http://forums.wz2100.net/viewtopic.php?f=33&t=11885 picks some winners.

refs ticket:4259

7f9a5804545444726fe165fca3aa318ee9cfc4f5 authored about 10 years ago by vexed <[email protected]>

Correct oversight of not including original bison/flex files for distribution.

patch by clueless
closes ticket:4151
refs ticket:4259

63b1860973138ad8d0b4642599bce874cf72ac28 authored about 10 years ago by vexed <[email protected]>

Add missing files for distribution

refs ticket:4259

992dcecac2a4aefab6d6283abe2d7b3465c9042a authored about 10 years ago by vexed <[email protected]>

Fix some trivial UTF-8 issues.

fixes ticket:3884
refs ticket:4259

150fad1d72dc80b7b29de1e4bbd966e696da1910 authored about 10 years ago by vexed <[email protected]>

(3.1)Fix solution file for a missing file.

bf846e108b1806074ebb5bcb60c3f3a20dd7f9a6 authored about 10 years ago by vexed <[email protected]>

Revert this to make buildbot happy once again.

Revert "Bump version for 3.1.2 (RC)"

This reverts commit 67f5e852468fc69a8f8e5c05dbbf253462f3c066.

a0c3fcfaed07227180c8e4921339b464b2fd926d authored about 10 years ago by vexed <[email protected]>

Bump version for 3.1.2 (RC)

[NOTE: no tags for this one!]

(cherry picked from commit 816556d8e48b7bf74d479e189ae3f30...

67f5e852468fc69a8f8e5c05dbbf253462f3c066 authored about 10 years ago by vexed <[email protected]>

make -Cpo update-po

4ffa4a5c601f2dbfefe775c0f99cd501e736e90b authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

6be3d7e8ba1fb6db4a5359444f98ba7277e62eb0 authored about 10 years ago by vexed <[email protected]>

Update it.po by Alpha93

closes ticket #4174

8ce802dcf7b8b0e96aa5ab4ffc1d735835ae8340 authored about 10 years ago by vexed <[email protected]>

Update el.po by Nikos

closes ticket #3703

8792f5b02ea347c1ab262504392161d0904a0749 authored about 10 years ago by vexed <[email protected]>

Update hu.po by MeszarosTomi

Note to updater, keep line endings the same as the original,
and also name the po file correctly...

65317d87bc0bf57b1bea71442af63925015cca70 authored about 10 years ago by vexed <[email protected]>

Update pt_BRO translation by Tucalipe

closes ticket #4164

b94b1f676bea1d9f77ac649968f64e7d50a0a482 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

b44a4fd6719a1307f8d2ce7e6bf2efffbb6312d5 authored about 10 years ago by vexed <[email protected]>

Don't allow transporters to pick up oil/artifacts either.

refs ticket:4246

c36361bb1e7117e059a607011945b87eec3c9408 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

f8c25de7286bb5c4ba14abf8db2dbf5ca718060f authored about 10 years ago by vexed <[email protected]>

Transporter cleanup.

Using isTransporter() instead of psDroid->droidType == DROID_TRANSPORTER || psDroid->droidType ==...

93c18a2385f3525b261452d8690730cc9162650f authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

48f6d919b9f8154498e1f29f14c2912cc18bbe28 authored about 10 years ago by vexed <[email protected]>

Revert "Don't allow the transporter to get oil (or any other feature) on campaign games."

Redoing this another way, see transporter cleanup patch.

This reverts commit 549635219f2a5af4f09...

eaec05dc2b209e878b5d39038ce1e183fa5a871f authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

d00686cf93544438de3012666310d62a70025d9d authored about 10 years ago by vexed <[email protected]>

Don't allow the transporter to get oil (or any other feature) on campaign games.

549635219f2a5af4f0905aaf428c02f72f50877e authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

b45a3821a8c5edde264b0b720352d9dbbf956ab1 authored about 10 years ago by vexed <[email protected]>

remove useless conditional.

8065c2fd3e267d454b30919f98ae7a23b22573f8 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

cb2515c2cffd67183dda505b07fa71da1bdb771f authored about 10 years ago by vexed <[email protected]>

Remove severely outdated build system that doesn't work

and wasn't maintained.

437c672dc0e2a155879715b0569bfed926ee03e1 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

4fd9e08b327f01b23005420dabe443c6b7f5f0ed authored about 10 years ago by vexed <[email protected]>

Fix CC issues to resolve trying to link to shared libs instead of static. Remove functions that are now integrated with the new CC.

This commit is ONLY for the Cross-Compiler.
Nothing else should be affected by these changes.

a41b6e2758309181cadff41195d76f56e84e38a1 authored about 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

7364a77ef2120cf711b6458a80f5d3bb6661a5b6 authored about 10 years ago by automerge <[email protected]>

Fix some uses of undefined values and integer overflow. Closes ticket:4216

cdadf82a0e20ce5e209055e9459b9016064a323d authored about 10 years ago by per <[email protected]>

cleanup the autorevision.h.new file when it is not moved to replace autorevision.h

Patch by rbt
closes ticket:4018

a81330d516ef6562fbe8f7a0efe2ff16d58c6db0 authored over 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

a642a79f4bc2a5c66adbf71b8ce3512da73f35f1 authored over 10 years ago by vexed <[email protected]>

Fix iterator erasing from std::list

Fix data race condition.
Fixes ticket:4213
Fixes ticket:3228

4986580f0845f47553713c2b3afbdfa82296d12a authored over 10 years ago by vexed <[email protected]>

Fix vector subscript out of range.

d9071fd77cd860f02095b76997789521878e64ac authored over 10 years ago by vexed <[email protected]>

Fix string subscript out of range.

3fadd3c645c13316c2b09c9d94571bf7955b24b9 authored over 10 years ago by vexed <[email protected]>

Put back debug line that was incorrectly removed.

3b45165d5f80ef9391f75f3cd1fad18b630f1fe0 authored over 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

ec43ce88be687ea3ffacb1aff149af74785fc264 authored over 10 years ago by automerge <[email protected]>

No longer need to enforce a 255 max limit on number of structure types.

9236baee1a93f351a0326eb4d18e550481a69ac7 authored over 10 years ago by per <[email protected]>

Fix an fsanitize=address warning. Patch by NoQ.

b7ee6376c4b7fd69289b0467afbfda705390916b authored over 10 years ago by per <[email protected]>

Merge branch 'bugfixes' into 3.1

c356b596087cc52bdcf6e485be04965eb0d3b964 authored over 10 years ago by automerge <[email protected]>

Stop Auto-repair from repairing unfinished structures. Patch by Kreuvf.

Closes ticket:4205.

8f7b9c8f07502c2e0cb86fd2c7d6085dfae1896d authored over 10 years ago by per <[email protected]>

Fix throttling of danger function. It was only supposed to do work every

GAME_TICKS_FOR_DANGER ticks, but last call time was never saved. Patch by NoQ.
Closes ticket:4212

9827d7a2a99602016d55c9cc8cb18d375fb7b5a8 authored over 10 years ago by per <[email protected]>

Merge branch 'bugfixes' into 3.1

2298ef6a265e813c62c516ca4884c047a375eafe authored over 10 years ago by vexed <[email protected]>

[backport fix commit 144c2e380d7a999f9012804119d32b79b37dc39c]

Fix feature creation to have the actual feature selected, and not the
first feature of the same ...

67df2f2dd8ff62a1a415c19a67d5e829c31771a1 authored over 10 years ago by vexed <[email protected]>

Fix:

C6289 Mutual exclusion over logical-OR is true.
Incorrect operator: mutual exclusion over || i...

b562febeec102801e098a69c484fdc5c65fbdec3 authored over 10 years ago by vexed <[email protected]>

Fix some issues for different compilers.

NOTE to VS users:
If you installed git, so it is part of your system path, then there is
no need...

ae58541d0b6d7f27c07e6504c743165f64a2051b authored over 10 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

b2e3b0e069ec6dc34974d2f6b5026483fff922c4 authored almost 11 years ago by automerge <[email protected]>

Place newly produced droids correctly when building is rotated.

19c16ed0ba1aa9678d098c0747e4a1a9415e5cf5 authored almost 11 years ago by haonoq <[email protected]>

Merge branch 'bugfixes' into 3.1

ea1b7daa398e09cac040cf4ef781d43ac2c7c640 authored almost 11 years ago by automerge <[email protected]>

Merge branch 'newbugfixes' into bugfixes

e0dd069d893173e617f1a5f5e81274d45d075d04 authored almost 11 years ago by vexed <[email protected]>

Merge branch 'newbugfixes' into 3.1

af2a6b30f2b228d32201d6d63fa228662a4f7d2a authored almost 11 years ago by automerge <[email protected]>

Fix path concatenation bug in CheckInMap, don't forget to check out the skirmish folder.

016b717a43ddf4a1a40b48d3ff79acc41f9f27bc authored almost 11 years ago by haonoq <[email protected]>

Updated textures and models by Christian Scholz (cnceo), and tcmasked VTOL pad by Berg.

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

Make sure the AI no longer gets stuck with no power in new starting conditions.

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

An attempt to make Nexus and Semperfi no longer leave modules unfinished.

(cherry picked from commit f50c0366f95dd39d30cb0c6fc93e69ba16a656fc)

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

Use the tag for 3.1.1 not 3.1!

Revert "Bump version for 3.1.1 (final)"

This reverts commit f6e8dad9c442d2f456f9ddab00d83ec3780...

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

Needle Gun: (RailGun1Mk1) weight 400 -> 1000

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

make -Cpo update-po

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

Bump version for 3.1.1 (final)

(cherry picked from commit 816556d8e48b7bf74d479e189ae3f30a757e5c58)

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

Merge branch 'newbugfixes' into 3.1

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

Update changelog for 3.1.1

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

Merge branch 'newbugfixes' into 3.1

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

Updated Turkish translation

This commit fixes typos and consistency problems. Also double space,
punctuation, capita...

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

Merge branch 'newbugfixes' into 3.1

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

When making builds and checking for modifications, we will

ignore any and all po files as far as git is concerned, and
after check is done, we reset our ind...

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

Merge branch 'newbugfixes' into 3.1

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

Fix some log spam

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

Check deeper for map-mods

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

Ecosyste.ms: OpenCollective

github.com/Warzone2100/archived-3.1-branch