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

Update ChangeLog

2216c3a2b1839233e629dc43a9cd0d9988634e82 authored over 12 years ago

Fix missing decals in Rocky Mountains tileset that were specially made for it

but never mentioned in the rockiedecals.txt file. It also fixes the ground
types of certain urban...

087ab8c5058730925c747dcdf14c8319319b3929 authored over 12 years ago

Revert "Update translations."

This reverts commit adbabfa2cc333b7a8f681afd70d97aec325bce12.

18c2599688cd3100ad6d98fbf23152c7cfc25a76 authored over 12 years ago

Revert "Update version numbers for 3.1 rc1."

This reverts commit aa20a4f55edf825c3a26749652a8d93cdddee285.

197fde6636626989fdcee678d14faa69b330e8dd authored over 12 years ago

Update version numbers for 3.1 rc1.

aa20a4f55edf825c3a26749652a8d93cdddee285 authored over 12 years ago

Update translations.

adbabfa2cc333b7a8f681afd70d97aec325bce12 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.
Add header for ...

26db798f42f9685dd62b587f33c89e17d6b9b36a authored over 12 years ago

Add files missing from 1e5fafabb39f76762ab7a560be7770595bc60a8c.

Fixes ticket:3646.

552a60b099a5bc4a9b571056dde7afbf5723047c authored over 12 years ago

Add header for std::sort.

2ca39e5fc776019a6d5e315e674397a915f860bb authored over 12 years ago

Merge branch 'bugfixes' into 3.1

050866e4008f8ebb24bceb8ce9422757151d4baa authored over 12 years ago

Warn when uplink and/or lassat is disabled.

1e5fafabb39f76762ab7a560be7770595bc60a8c authored over 12 years ago

Split frontend*.png and intfac*.png into individual images.

The images are now combined into texture pages at runtime.

This should simplify adding/removing...

26bb10588511f74b2ce60d7243752eb66d5754e2 authored over 12 years ago

Correctly handle interface image texture pages which are not 256x256.

Game logo now appears full size.

f879b83605a601080e3bdd902996e50575ca9706 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

7c76d4eaff71258bb94d4c5cd86d8d4ffef53ccb authored over 12 years ago

Assert on collision of hashes of resource types or filenames.

This should be a minor improvement over silently retreiving the wrong resource on filename hash ...

74c153cf7bcc823ce1ace112cb9ce96d527c9f97 authored over 12 years ago

No longer save default map, max players and map hash. Patch originally by vexed. Closes ticket:3618

398f77ede082063bd1bc607d5814e9630f663967 authored over 12 years ago

Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes

2c2822664f752b38b36a84e33c3f76a897e0fd23 authored over 12 years ago

Remove unused lines of code from display.cpp

44947ad4a831f4bc31fe3abc526175f37b539456 authored over 12 years ago

Make improvements to the case where there is no codesign id.

93f54a45316d76e3505e66143f5c84369ec665c1 authored over 12 years ago

Use codesigning for the mac builds.

Requires the presence of 'macosx/configs/CS-ID.xcconfig' containing a valid codesign id listed i...

c4edfed60de7edf88a5bbf334c85beef6d3c813a authored over 12 years ago

Update the changelog

bf0d92dab49e029044156014f35614522214e004 authored over 12 years ago

Update nullbot to latest version. Rename nullbot include files to avoid spurious qslint errors.

feb7476af63d0715cf989b8174babced8f3d7eda authored over 12 years ago

Do not use std::string in a memory structure that is memset().

Patch by tnmurphy, closes ticket:3620

fdb1c0b52153d3368ae79e8f0befdd2744b43692 authored over 12 years ago

qt: Use QImage instead of QImageReader to load mouse cursor images.

Some combination of QImageReader, QImage, QPixmap, QCursor and the wzfs wz:: virtual file system...

df32833ab8b17e6db5815b7eca9f5fe01a5b7f8f authored over 12 years ago

Merge branch 'bugfixes' into 3.1

70a416977f5368a39a8b2368bdc1f1f795c7b268 authored over 12 years ago

Run astyle over transport code to make it readable.

06f10ca89fb7d020b6b2cac4a6f533b016ac0175 authored over 12 years ago

Run astyle over mission code to make it readable.

b307efb4dd4ec648328f196c52c299b2517c741c authored over 12 years ago

Remove dead code

9d82dea37ae9ed2662ccf26ad1614ed386106972 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

28a2a034447a73edd652ebc7e86d54c0a64ef01a authored over 12 years ago

Don't rename AI players.

With multiple AI's, Nexus, Nexus, Nexus would be renamed to Nexus, Nexus_2, Nexus_3, or similar.

ee95d785bdfd72a490863d7cdb3f504f88f9eecd authored over 12 years ago

Fix reading of scavenger parameter in challenge files. Reported by KukY, closes ticket:3630

95677b02b9959b05372e7dc10286fe184bfd6cdd authored over 12 years ago

Update glew to 1.8.0.

62c8c727dc1919c35c7f20cc3dc262f9170572f0 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

865588631dbaf922befa2ca7b42f6e3010a68a5b authored over 12 years ago

Fix reported [-Werror=format] issue.

0bfee185a38c1a354c14b33a064d13d81a03962f authored over 12 years ago

NullBot by NoQ

646f6d7b8248dedb5686d86199519d4e75a30493 authored over 12 years ago

Add last part of net patch (needs updated server code).

329572779ae2e383b6bd668078ee4ecffe173dc4 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

aa676c18bbf496fd62485c1b9cf9d8b9eeae87b3 authored over 12 years ago

Update png to 1.5.12.

d2a8a134a6c3a08d20e461425a9714ab52ee78b8 authored over 12 years ago

Fix reverse balanced tree lookup

"Rechts ist da, wo der Daumen links ist."

Fixes ticket:3589.

Signed-off-by: Linus Lüssing <lin...

64173cbd0826a67dafb9293c9bc2ac3bdf44ff73 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

e370f0f707edfaea8027c9b20e9c97426914e784 authored over 12 years ago

Update custom translations.

0800da0d25d1b6e509b84435ec80cda176e046c0 authored over 12 years ago

Turkish translation update by Ayhan Görgülü.

Closes #3591.

da43686ad35b33850a97ffcb8023c60e5ff55f83 authored over 12 years ago

Catalan translation update by mecatxis.

Closes #3582.

3b261c24d2dfe39eae6f51f3a4827bc3b67e927f authored over 12 years ago

French translation update by Amiral JCDG.

Closes #3577.

875be5fda1b9ecf4aae3ece1fa5639904f3c06ab authored over 12 years ago

German translation update by Kreuvf.

Closes #3564.

44c810bc73ca8f17bdbf8fc28bcbae8ec81233ab authored over 12 years ago

Polish translation update by Emdek.

Closes #1347.

0cec33c0fceeb65fac3c26412a3d2d3667c04886 authored over 12 years ago

Bump MAX_TERRAIN_TILES from 100 to 512.

ab44eafb7bd1daa2d0f4efe367673b4c2985a05d authored over 12 years ago

Merge branch 'bugfixes' into 3.1

aeeec83bd76ba7e0f617fd1099b1c17cd6a40bfe authored over 12 years ago

Fix moving repair delivery points.

Closes #3581.

caabd96741fb3113dc96127ae32826ada643992a authored over 12 years ago

Merge branch 'bugfixes' into 3.1

Conflicts:
lib/ivis_opengl/screen.cpp

f556d6265fa1928661869fbf202315e3bb4b707f authored over 12 years ago

Reset research pending state even if research facility is destroyed.

Destroyed research facilities can no longer permanently hog a research.

Steps to reproduce: Ena...

6a04b6ad677678e1d824209dda45a70f85b64a96 authored over 12 years ago

Do not halt production on template becoming redundant.

Production would halt until the redundant tank was manually removed from the build order.

7621581c8f76f3b7a774182cd3b5eee8e26b7954 authored over 12 years ago

Add a bit of overly-paranoid checking, to detect hard drive failures, or similar.

134c51c8902bf80c699d29a8db1c71fea9a4e85d authored over 12 years ago

Always initialize shader usage setting.

ef2b23681b2840478a4203b8bd3a75b8882bd9f0 authored over 12 years ago

Add settings / UI support for shaders without tex_env_crossbar (added in 64a3cc1).

7e3be754d4daddd771de1e115ed6845652300638 authored over 12 years ago

Don't require texture_env_crossbar for shaders.

Refs. #3575.

64a3cc13deda9a59aae2cf0705c68dbe3eadeaa8 authored over 12 years ago

And even more log spam to help track down current issues.

845903e5b60292d2a15a2f442120122ea1ff90e7 authored over 12 years ago

Let's not hide error messages, and add more debugging to track down a few

issues

3640b024f28b0fc264e2d33ea516687fc41ffccc authored over 12 years ago

Revert "Fix blueprint alignment and snap modules."

This reverts commit 581d65411e714bec6c5b0e783dbaa705ff6a38c4.

3c5e8792be30278fee65ac5d5f59933388f384ed authored over 12 years ago

Fix minor memory leak on loading/unloading transporters.

DROID::sMove.asPath is set to NULL on unloading droids, but was never freed.

Also, clear any re...

032956e649e69aa51edd80787c9c94bf2c08d164 authored over 12 years ago

Fix uninitialised variable usage on removing repair facilities.

See previous commit.

88e94391669e54808b2d6f40cba994d3501efb08 authored over 12 years ago

qtscript: Add new function that returns unit limit(s).

67b2a6210afa4306e813489d7cf2288c7ff4211f authored over 12 years ago

Fix compilation on non-x86 platforms.

Refs. #3558.

6c6180495cc791afe9f818b7070f8a6bc3b13fae authored over 12 years ago

Fix dangling pointer when structures are destroyed and you are repositioning the delivery point.

Untangles delivery points code from building placement code.
You can no longer "quick queue" uni...

6382bbb08ea7e6ca93a0ba83fdb65952778c962a authored over 12 years ago

Fix blueprint alignment and snap modules.

Closes #3466.

581d65411e714bec6c5b0e783dbaa705ff6a38c4 authored over 12 years ago

Cleanup: Remove unused mendVtol() function and fix excess indentation.

adc13fe9fa8f83dbb23abff4d9d0a86b54a2e904 authored over 12 years ago

Rename DROID::sMove.iAttackRuns[i] to DROID::asWeaps[i].usedAmmo.

The sMove structure is cleared when unloading from transports, and it makes no sense to think of...

e1dcb241abcfd42ef988bf88bb1c44dd8cd89d1f authored over 12 years ago

Don't require OpenGL extensions to be reported, if present in the reported OpenGL version.

e8ee5e6f431d03def032659d4f19856176d4df26 authored over 12 years ago

Save and load map hashes in config file.

This prevents a zero hash from being sent by the host when the user has not selected the map bet...

9784c655af2a66bd541268e2c9e6f19fcd1ac200 authored over 12 years ago

Revert "Update translations."

This reverts commit 8d8539fba9757da4dc12f60056fb1f19ea1a9ff6.

5b8165e087e4e3c696d71316ae9876f56c7b7ffe authored over 12 years ago

Revert "Update version numbers for 3.1 beta11."

This reverts commit e8a51a2ec434b683c938797cdb80612e0866c52e.

df98e340b5ce915047710f32b8477df87597ae31 authored over 12 years ago

Update version numbers for 3.1 beta11.

e8a51a2ec434b683c938797cdb80612e0866c52e authored over 12 years ago

Update translations.

8d8539fba9757da4dc12f60056fb1f19ea1a9ff6 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
Update translations.
Update the mac doc bundle.
Update ChangeLog.
Remove unu...

3bb326b906007bad6f64e456010eaf28d1d92f7e authored over 12 years ago

Update translations.

0c55d94ea0b6c3ff17527dbe61b8c0b0c0f885a9 authored over 12 years ago

Update the mac doc bundle.

0007657291832d003639eb3f408d069881ed3b39 authored over 12 years ago

Update ChangeLog.

6a3121754793d994069af0854fd61fc64b073c92 authored over 12 years ago

Remove unused variable, and fix some narrowing stuff.

src/multiint.cpp:404:52: error: narrowing conversion of ‘(rand() % 256)’ from ‘int’ to ‘char’ in...

a0b7030cd651af0f165a74b9a37638b6de899dfe authored over 12 years ago

Fix loading of campaign savegames.

Apparently, the game.map variable is set to "Sk-Rush" in campaign. And the actual map name is sa...

1461b3a5a81b72381bc3cc3dbc57bbd2f5ce22a7 authored over 12 years ago

Merge branches 'screenscalehack' and 'bugfixes' into 3.1

Conflicts with 'bugfixes':
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
src/clparse.cpp

5c1e204e78bba98585336cc2eae93e1ad3d302ec authored over 12 years ago

Don't convert to a platform specific string here, it causes bad things to happen.

"const char * PHYSFS_getRealDir ( const char * filename )
Figure out where in the search p...

205609302755ec151d4768da6cdcefe768059fb1 authored over 12 years ago

Update ChangeLog.

769fccc22001dc94a0f243c533185c7ab9676640 authored over 12 years ago

Handle different maps with identical names, instead of a desynch.

Fixes ticket:3531 and ticket:3180.

15c04ab10f87de89ca7dcae2813834bd1a03247b authored over 12 years ago

Add shader toggle UI.

691df6a1837cec65fe7ac4e924c96868df2b749d authored over 12 years ago

"Fix" object selection bounding boxes and clicking on terrain, by scaling by a random factor.

This shouldn't work, but works in the sense that two wrongs make a right, two bugs make a feature.

d697c42d9cfde492fbcf4bef6a02676a9308b6d0 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

02395b3f02589a7a908cb7cddfaaf5248fdd8d23 authored over 12 years ago

Be somewhat less unaimed in putting the image tool in the tarball.

2e72860fb1c666f9950350d0bdd5238315c4ea1c authored over 12 years ago

Add some enums that were missed and update the functions for a newly used function.

9d428d553e271f834a848776b296b62ba321e754 authored over 12 years ago

Determine which stencil functions and enums to use once instead of each frame.

b35afbf9d34ef33980888af3803cbc29bb05497a authored over 12 years ago

Use Berg's animated cyborg factory (GPL.)

da433789c3e272c9c22307b6e74eeb81b2925e07 authored over 12 years ago

Add tools/image to the tarballs.

Closes #3528.

d9aab02307d326caf7d42e54f4d8ef19d75b09ce authored over 12 years ago

In fallback, try to use glBlendColorEXT if glBlendColor is not present.

7867b7abe209613da26ae36897ac864eaee73a14 authored over 12 years ago

Swap Rush-T[23] map with 4c-Rush2-T[23] map, such that the map order does not depend on tech level.

4a1aec1c57adedd57c757fb06df91dfecfe071dc authored over 12 years ago

Add SHA-256 implementation.

474216b781e1b5f418585a073cb693dafdc777dd authored over 12 years ago

Extra manual cleanup of function.cpp

ec2bbb95f610d7f5fce2610188c94f2a02e4a1b7 authored over 12 years ago

Clean up crazy indentation in function.cpp to make it readable. Refs ticket:3220

29af6bf8d201df86e8102f48b36a925706085a85 authored over 12 years ago

Do not dereference NULL on referencing non-existent structure in structureweapons.txt.

Fixes ticket:3543.

8aa4a686761b76f2d9a78423864dc173ba0bbd1f authored over 12 years ago

qtscript: Set .stattype of a Laser Satellite building to correct ID. Closes ticket:3506

7dbe64278c23883253f1fbd0ae830332e85eb6b8 authored over 12 years ago

qtscript: Add .type properties to common game objects, as requested in

http://forums.wz2100.net/viewtopic.php?f=35&t=9576&p=105883

69727cdb9a6aa1994016f70426f64739dce6101e authored over 12 years ago

Make sure we do not overwrite sensible defaults with non-sensible ones

when reading rearm pad data from savegame files. Closes ticket:3518

eb3001bd2fb6c0494abb3677cd05f62c1b0d8a4a authored over 12 years ago

Ecosyste.ms: OpenCollective

github.com/Warzone2100/archived-3.1-branch