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

Fix compile error

32646de31df19d12c7070d2993accc726d85b11e authored almost 7 years ago by Per Inge Mathisen <[email protected]>

Revert "** This will be reverted after tag is made. (ignore buildbot errors when this is made)"

This reverts commit 0538f820b667f3ad93699bebd4710674d8b8b07c.

BuildBot is happy again.

7c61dcdb22a8fdeffbe03a017579293740bec5fc authored over 8 years ago by vexed <[email protected]>

** This will be reverted after tag is made. (ignore buildbot errors when this is made)

Bump version numbers for a 3.1.5 release.
disable debug.

0538f820b667f3ad93699bebd4710674d8b8b07c authored over 8 years ago by vexed <[email protected]>

Update ChangeLog for 3.1.5

d40be86c09369379066328403e96ade9d1e3b39e authored over 8 years ago by vexed <[email protected]>

Fix visibility issues in campaign.

Partial revert of "teams: Fix unable to start game when all players are on the same team, but te...

c5117b0adb7bc1329df91ae170c19af2e2fffb4b authored over 8 years ago by vexed <[email protected]>

Revert "** This will be reverted after tag is made."

This reverts commit 9e78a9fab7f52b05cc5b356aea0907c6d8cc67eb.

BuildBot is happy once again!

2f2e1951293427e37b9fcf221ceedbf5a81a1c7e authored almost 9 years ago by vexed <[email protected]>

Sigh.

Forgot to bump 1 version number.

d2edc833b62278f559a534a6ed6099ec9b553111 authored almost 9 years ago by vexed <[email protected]>

** This will be reverted after tag is made.

(ignore buildbot errors when this is made)

Bump version numbers for a 3.1.4 release.
disable debug.

9e78a9fab7f52b05cc5b356aea0907c6d8cc67eb authored almost 9 years ago by vexed <[email protected]>

Update Changelog for 3.1.4

dc933a16499f0a633d278d95dceeef7391c51de1 authored almost 9 years ago by vexed <[email protected]>

Fix template error messages and checks.

Thanks to KlassKill for the heads up.

20f95af3f41a43446a93513a1d610519c6006a2b authored almost 9 years ago by vexed <[email protected]>

Fix stat loading to abort on errors, not crash out.

Thanks to KlassKill for pointing out the issue.

40b1df8809e7c84d0e9b8e81697420617ee1be06 authored almost 9 years ago by vexed <[email protected]>

Fix language names (.mo) files for nsis installer, this fixes it for all windows build types.

1c760042b8abfdcf9b99ad3a9d1d80c65e148b78 authored almost 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

d9685188c6b270cfb68eb0b00e4e3ac17c43373f authored almost 9 years ago by vexed <[email protected]>

teams: Fix unable to start game when all players are on the same team, but teams mode is alliances off.

Fixes ticket:4343.

dddf05cbe4bb31b87b8fb69c4b4ad4e634edc151 authored almost 9 years ago by Cyp <[email protected]>

Merge branch 'bugfixes' into 3.1

baf8f77086b947ae6721112c02d2b6121b853dac authored almost 9 years ago by vexed <[email protected]>

Let's try that again, and this time C&P the correct fix.

Fixes last commit 99b8218a8e0578ed8bb8f8d5c618d070e76e19da

fixes ticket:4339

refs ticket:4246

201dc762786ead3f1096d95f6fb949bc3aacbc3a authored almost 9 years ago by vexed <[email protected]>

Fix 'go to Transport' logic.

closes ticket #4339
refs ticket #4246

99b8218a8e0578ed8bb8f8d5c618d070e76e19da authored almost 9 years ago by vexed <[email protected]>

teams: Fix extra alliances on loading games.

Broken in 9300d7e3c6f13b11d004b059b2d219e27eed6a93. Fixes ticket:4334.

255009d7c18e8013e5f39b471e20a96bf7c9a9b4 authored almost 9 years ago by Cyp <[email protected]>

Revert "** This will be reverted after tag is made."

This reverts commit da55d5c3855741d9e796e25dcd0bf6a3231ab919.
BuildBot is happy once more.

c8fa4c513baed774e9f52919a768f676d7042758 authored almost 9 years ago by vexed <[email protected]>

Copy our new path to the debug handler as well.

f278c97f428d523bcc9dc1440c6dcbbba3a1d10d authored almost 9 years ago by vexed <[email protected]>

PHYSFS_setWriteDir() needs a trailing slash.

6c4ffd8de5e842565e416a52965c7720a7a95b67 authored almost 9 years ago by vexed <[email protected]>

** This will be reverted after tag is made.

Bump version numbers for a 3.1.3 release.
disable debug.

da55d5c3855741d9e796e25dcd0bf6a3231ab919 authored almost 9 years ago by vexed <[email protected]>

Update changelog for a 3.1.3 release

1be2c97073dafd1e8ee96f531bfd34c26112f5e5 authored almost 9 years ago by vexed <[email protected]>

Revert "Fix typo on a74a91029e0940e4f29e60f44d35be701069d089"

This reverts commit ac333436de6ec7e39d2697c51114d430aae369ba.
It was actually correct the first ...

a2900e33dc835680a9dda88db90f5d3d18422217 authored almost 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

d3f7fa2f9ecda5273390a54951f764822800dc87 authored almost 9 years ago by vexed <[email protected]>

Remove invalid bytes 0xEF, 0xBB, 0xBF from hu.po

refs ticket:4318
refs ticket:4268

6b1aae07d036cea9d1343e6bb0270729ba0d27a9 authored almost 9 years ago by vexed <[email protected]>

Fix typo on a74a91029e0940e4f29e60f44d35be701069d089

ac333436de6ec7e39d2697c51114d430aae369ba authored almost 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

aea3c1083e85852c8d52c590461f87d8bff81c20 authored almost 9 years ago by vexed <[email protected]>

Fix multiple issues with lobby console output.

63408c67c257f6f0f7b4b1b4bac4e9cf5e6d6b0d authored almost 9 years ago by vexed <[email protected]>

Rework our config directory to be of the format: Major version/Minor version to start everyone off with a clean config directory to help prevent conflicts.

*Release builds, 3.x only*

a74a91029e0940e4f29e60f44d35be701069d089 authored almost 9 years ago by vexed <[email protected]>

Update Hungarian translation by Mészáros Tamás.

closes ticket #4318
closes ticket #4268

66fec955924cf990614d3b78c0a86df45e8df94a authored almost 9 years ago by vexed <[email protected]>

Update French translation by Amiral JCDG.

closes ticket #4295

75541d50fb404e1db8a19c5cd97b0e57e7701d93 authored almost 9 years ago by vexed <[email protected]>

Update German translation by Kreuvf & Markus Enzenberger.

closes ticket #4272

e30fa2d5c06f8f1c1904a26ded5c9ffdaf5137b1 authored almost 9 years ago by vexed <[email protected]>

Update Chinese translation by Shinyu Wu

closes ticket:4329

23a399996e8205f35f0430ae4e4de7702a2e2a65 authored almost 9 years ago by vexed <[email protected]>

teams: Improve default teams.

9300d7e3c6f13b11d004b059b2d219e27eed6a93 authored almost 9 years ago by Cyp <[email protected]>

Sync templates on validation.

3e5e998de2797f7f61bc00f20d3eb1dc894c96be authored almost 9 years ago by vexed <[email protected]>

Revert "Synchronise stored templates."

This reverts commit 4edc0d77a67f4db3b230f9d3089ee14efc9ad4bd.
refs ticket:3013

b394de8f092e0f7059a2f53264378a8ced168695 authored almost 9 years ago by vexed <[email protected]>

Revert "Fix template code to prevent desyncs."

This reverts commit e3172b1dc6d4481c17641617a4de1360ad79af96.

c3a8259c578a62f3fb1b4d87b02df8d88c0e34d5 authored almost 9 years ago by vexed <[email protected]>

Revert "Fix typo on last commit."

This reverts commit 7415c5cac06f05e1945737e4ad44e11ca1ed5010.

b71e3599b6b4dde3fa8a2e4e4558c6fe99534228 authored almost 9 years ago by vexed <[email protected]>

Fix a typo that lead to a crash, and also prevent future crashes. closes ticket:4168

d72ab0ce178814de47ed7dcab74589414cfa7249 authored almost 9 years ago by vexed <[email protected]>

Fix typo on last commit.

7415c5cac06f05e1945737e4ad44e11ca1ed5010 authored almost 9 years ago by vexed <[email protected]>

Fix template code to prevent desyncs.

Patch by WulfKind.

e3172b1dc6d4481c17641617a4de1360ad79af96 authored almost 9 years ago by vexed <[email protected]>

Preparing XcodeProj for 3.1.3 Release

07df2663549c9cdfd97f436bc2e2cce75e49ffc8 authored almost 9 years ago by Kai Machemehl <[email protected]>

Merge branch 'bugfixes' into 3.1

ff128c63a40858b266c03880889d95933de97f2a authored almost 9 years ago by vexed <[email protected]>

Replace our old demangle.h with a newer version to fix CC.

NOTE: We only support Windows Vista and higher now.
XP doesn't have the required function calls.

00478433153823e4b1a5be5debbcd839b5ef55f9 authored almost 9 years ago by vexed <[email protected]>

Random backdrops patch backported to 3.1

Old patch in tracker would not apply cleanly to 3.1.
( http://developer.wz2100.net/attachment/ti...

b7e5e91b4ee3f3abe2fedb3c88947fd58d7d402e authored almost 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

d67a2ea740c6c2b7a237d1698d1ece094002bf9b authored almost 9 years ago by vexed <[email protected]>

Detect if our IPv6 address is actually a mapped IPv4, if so, convert it into IPv4.

cfd1e4a813c1235163a85c47dba6763ed5038377 authored almost 9 years ago by vexed <[email protected]>

Fix typo.

closes ticket #4286

97c889b714d362db76989b7d7421fa6a166fe619 authored almost 9 years ago by vexed <[email protected]>

Silence uninitialised warning.

../../src/mission.cpp:1846:79: error: ‘iX’ may be used uninitialized in this function [-Werror=m...

ca92748c2dae4fafe8f43b49665692f2627ff0a0 authored about 9 years ago by Cyp <[email protected]>

Fix -Werror in internal_saveImage_PNG.

../../../lib/ivis_opengl/png_util.cpp:193:19: error: variable ‘scanlines’ might be clobbered by ...

8c40488257658e82e19f4b3fbe8da30f2b23be33 authored about 9 years ago by Cyp <[email protected]>

Merge branch 'bugfixes' into 3.1

61746d98d284dc14cf6f3e1dfb0f55e9f51c9eda authored about 9 years ago by automerge <[email protected]>

Update changelog for 3.1.3 release

deefbbf2002999694e4b0e8d1e476da92c3b0d2a authored about 9 years ago by Per Inge Mathisen <[email protected]>

Merge branch 'bugfixes' into 3.1

715d9d0e440f4ed320bef8807b47b31513348496 authored about 9 years ago by vexed <[email protected]>

Fix CC to make sure it is using static lib for UPnP stuff.

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

Fix ping to be displayed only in true MP games, host's ping display has not changed, however, clients now only see "+" (player alive) and "∞" (player lost for now) as appropriate.

2199ffdd416cb5189c0ee5af4137a6248c3a2ff1 authored about 9 years ago by vexed <[email protected]>

Disable meaningless rank display for now. (Will be re-enabled when lobby server is finished with full rank support)

30ed6e846faecf2cf186a7d94182318de65fb362 authored about 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

04c736a549a50d4e5bdee7c052e08048992a597d authored about 9 years ago by vexed <[email protected]>

Update miniUPnP to v 1.219 2015/10/26.

Note, ttl must(?) be 2 as default now.
Closes ticket:4321

512a10d453c52b424f948c78d732f6d1fe627fb8 authored about 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

ec970a0934abae42cef52e68aa8b97773dfdd5b2 authored about 9 years ago by NoQ <[email protected]>

Grant scav techs to scavs synchronously.

Fix the scavenger-related desync on the script side,
revert the exception to multiplayer validat...

1c545375b854639b8f2264dd45b0266515c4c9e8 authored about 9 years ago by NoQ <[email protected]>

Merge branch 'bugfixes' into 3.1

72061878c1e9e85ff1aa97d2c7784f7326985f73 authored about 9 years ago by vexed <[email protected]>

Fix special case for scavs & templates.

4bc5e63fc53fc97b8e922dfc6a755d107923d3ce authored about 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

41d9989a591153341f24be50fa1c6a8ae91aad5e authored over 9 years ago by vexed <[email protected]>

Fix 'kill' command for SP games

d44708e1093a457fb110839c029d02ea69623715 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

75a22164b11ec77d68c1d1f0b0c46f5d3f70657c authored over 9 years ago by vexed <[email protected]>

Hideous indeed.

Bad things happen when player < 6.

3e48f5526d1d2b2fe7ffdfb5f0e606214efb11fa authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

7ec50c01aa34009972c0b521665bc4e69a63f91b authored over 9 years ago by vexed <[email protected]>

Fix the 'Assigned to Commander' voice over issue.

closes ticket:1432

(sorry it took 2013 days to finally fix this)

960ed9dfd82af57421b1c5e417a42bc8890065bc authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

8898271704adbb1741fa7a58b49027977a48d4a5 authored over 9 years ago by vexed <[email protected]>

Don't hardcode the IP dialog

Fixes ticket #4159

ea673ca4e32edc41097389948aec0f7bd3883567 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

7aee9076c777c532fd06a8c8d580024a71830945 authored over 9 years ago by vexed <[email protected]>

Don't assume we got a valid droid pointer.

fixes ticket:4251

f661a7b213b2d7db8053bde8c21e5ab42374f652 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

9c27a600fa1816e4b9710734bd4b5266e6fea232 authored over 9 years ago by vexed <[email protected]>

Don't go out of bounds in game.maxPlayers init.

1e6eea7940b3cd4e1f662d0666fb465718e61057 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

dfe8e5a926a2823a5b341d22500ca4fc005f6001 authored over 9 years ago by vexed <[email protected]>

Fix Logically dead code (DEADCODE)

ebbe3f58fb3989b9adac29236e0beeba34c6c18c authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

89ad58890dfe8b3edae953c8a861e77981f6a32e authored over 9 years ago by vexed <[email protected]>

Note, this commit is mainly for bugfixes only.

Master & 3.1 already have this commit as 00d21fde30a

Fix: Copy into fixed size buffer (STRING_OV...

673b8edfe752ef576fd27788f16af73f034d8c4e authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

74878840c5e752cceaf3b260d729faf8bd6f70aa authored over 9 years ago by vexed <[email protected]>

Fix: Copy into fixed size buffer (STRING_OVERFLOW) strcpy()->sstrcpy()

00d21fde30a7738650a604598173e7dda71c9762 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

a12c30f2111e0b813f6e0c169fde2ef937521d8d authored over 9 years ago by vexed <[email protected]>

When checking if it is a factory type, make sure we are a strucuture type as well.

5f0b96e5777949301231f8380104eac33e34fd71 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

ac988f08b03c1d7471c489894e6683fa05bac66b authored over 9 years ago by vexed <[email protected]>

fix coverity bug (UNINIT)

8da70e618ed6db75f477df71c837462687c65ed5 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

562fc105a9fa34823fa85a1de231bd1d20a4771f authored over 9 years ago by vexed <[email protected]>

Prevent NULL pointer dereferences

8c54ed502e12f8f86d8979935447dba76d7ee17f authored over 9 years ago by vexed <[email protected]>

Fix coverity issue #1311819 (Prevent out of bounds read)

b22ac1824e8039894dcb60a3fcc4a9ded26aca6b authored over 9 years ago by vexed <[email protected]>

Fix coverity bug #259753 Use after free (USE_AFTER_FREE)

9eddd825d9586c8ff754c4bb60d8dbc72c0190d1 authored over 9 years ago by vexed <[email protected]>

Fix coverity bug (FORWARD_NULL)

b980f22aa2c21bdd107bfa802bb24247fbecaa77 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

265f078fea680747265256c16aecb6f50d9157e6 authored over 9 years ago by vexed <[email protected]>

Resync/backport the code base:

3.1: Remove hack to support some pre-OpenGL-2.0 systems that made
assumptions about internals in...

6a6c611ca3d9d6745e5343f2ee041892772ccae6 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

6228c8efa525c213d79ae1bb33fc4d134ec95741 authored over 9 years ago by vexed <[email protected]>

Correct overzealous editing.

(remove bad lines)

50f54c6232ac2d80fc8651b57385faf34c131899 authored over 9 years ago by vexed <[email protected]>

Merge branch 'bugfixes' into 3.1

1ede809069fd93586a68bb43ac3913086c97c452 authored over 9 years ago by vexed <[email protected]>

Prevent a crash on 0 byte files.

3e70ec9469012604099f18bdd0961038ef6080cf authored over 9 years ago by vexed <[email protected]>

Remove dead code

df992885e538267c84266e58cef9d15e2d9a20ad authored over 9 years ago by vexed <[email protected]>

Fix Out-of-bounds write issue

206cb0943f76763369f56792874854fd8f81b6a0 authored over 9 years ago by vexed <[email protected]>

fix coverity bug #1108900 (FORWARD_NULL)

51f967a06f348d787bcf78b8e4cb0b2a6f93baae authored over 9 years ago by vexed <[email protected]>

Fix coverity bug #1108910 (FORWARD_NULL)

4a5c395a9d3e98404689ca6f35b50d01ffbf94fa authored over 9 years ago by vexed <[email protected]>

Ecosyste.ms: OpenCollective

github.com/Warzone2100/archived-3.1-branch