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

Do not install map tools. Closes ticket:3494

43f9036607e275e6456c71911ac7cf9bc31ae653 authored over 12 years ago

Do archaic OpenGL driver workaround before trying to enable shaders, as well as after the workaround is clobbered.

f5a7fd52c01dbe848ecaab27da4a08fc7eef536a authored over 12 years ago

Update the mac doc bundle.

caa2074679691724fc0a77385c6b9fdc335f2fa8 authored over 12 years ago

Pngs should be crushed, a lot.

Preferably before being committed.

02b99612b6b45264ddca2ab3c8b0eb14069ce426 authored over 12 years ago

Use Berg's animated factory (GPL).

e636d41472762f0573979c1f05ada2e1484e4eca authored over 12 years ago

Merge branch 'bugfixes' into 3.1

2ccf4e04f51b684c649f6d1db3c9b9e8d7abfb6d authored over 12 years ago

Fix debug mode after player switching. Patch by vexed. Closes ticket:3264

(cherry picked from commit 15d7ef0295e9baaa171254e78b7f12b257f7139b)

4a2f7d4399649662f33d146cbe97a12110b8995b authored over 12 years ago

Fix texture animation data loading for pie 3

(cherry picked from commit 7c451d54485b93d213894e7036e48b7f11b072e1)
(cherry picked from commit c...

07a2a9671b32d4817942739de723f380c7b88cc7 authored over 12 years ago

Don't reserve frame 0 for team colour (we use tcmask now).

Fixes bug in animation found by Berg.
(cherry picked from commit 2a9548aaf4de880726ae94ac991cd374...

b59fe8bdb587671c8a382887c10ce804a1d1cd9a authored over 12 years ago

Convert code and models from hard coded animation intervals to model defined animation intervals.

Also assert on PIE files with bad animation data.

Closes #3539.
(cherry picked from commit 75ff...

2d0a089bad6b6b2fdca75556444a66e07ad3dbaa authored over 12 years ago

Don't crash on NULL socket

6ff93f694096364d1111631d02521309105191da authored over 12 years ago

Fix hardcoded number of frames for structure animations.

N.B. Animation rates remain hardcoded for now.

Closes #1871.
(cherry picked from commit 55bea095...

190c7a99cccc9e831a49712ec431b194f0b65cb8 authored over 12 years ago

Add missing vids message when they are not found

1a7c1a41b7a5171695e8e59f2d41c7de6638a14f authored over 12 years ago

Don't crash on null pointers.

dc856acbd9fe2a1e335436fa637812b3e40a7483 authored over 12 years ago

Merge remote branch 'origin/3.1' into 3.1

828292fc4e9ef434076082b277efcaa0bbd486af authored over 12 years ago

Revert "Fix hardcoded number of frames for structure animations."

This reverts commit 02ced5ef58c6a63472fc0c0ef0c6759af449d400.

(will commit this to bugfixes ins...

f13b0e37126cd3b31a4b08d47c4cf3e44109e4d1 authored over 12 years ago

Revert "Convert code and models from hard coded animation intervals to model defined animation intervals."

This reverts commit b3dc9444da8f453cbf03c418005bca58318e1ce3.

(will commit this to bugfixes ins...

41b80341908b0fb9921e958ad8c55ff927d99c08 authored over 12 years ago

Revert "Don't reserve frame 0 for team colour (we use tcmask now)."

This reverts commit ecacd970674fd044491756c7c0275a80057cfc1f.

(Will commit to bugfixes instead!)

da94f64e04dbaecfa5223c1e091c948f7441a535 authored over 12 years ago

Revert "Fix texture animation data loading for pie 3"

This reverts commit cea701af5c4babf4a2bfbba527dfa93490b533be.

(will commit this to bugfixes ins...

f3df64a017f1d15746befec835b7f3d77b05d9df authored over 12 years ago

Merge branch 'bugfixes' into 3.1

Conflicts:
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
src/terrain.cpp

db1e828ddc6d509c77db01f89a9fdc2835615dd1 authored over 12 years ago

Use OpenGL functions under extension names, if not present under regular names.

96272ebf5008ad7ac47865e3493d43a597371944 authored over 12 years ago

Fix bugs in glUseProgram and glAttachShader extension names.

174c56190df54fcd7ed4316c7a6f39f32087ccb8 authored over 12 years ago

Add documentation for opengl usage.

d3144a7f1c7c4f46ecae199f04082fd2ac9e0901 authored over 12 years ago

qtscript: Make getResearch() return null if tech not found. Closes ticket:3548

752eef9410c4ee3ba1ceb5984d98cb68729e641f authored over 12 years ago

Merge branch 'bugfixes' into 3.1

Conflicts:
lib/ivis_opengl/screen.cpp

9732dc744243eca59d4192c01964edca81ea8c41 authored over 12 years ago

Check for shader version ≥ 1.20, instead of checking for OpenGL 2.0.

Try to simplify checks a bit.

0c03151e250a89f23ea5960cd488367112bd3fdc authored over 12 years ago

Merge remote branch 'origin/bugfixes' into 3.1

Conflicts:
lib/ivis_opengl/screen.cpp

c348761bf11b669a7afa83f5a5f032b5b67a4ef1 authored over 12 years ago

Fix texture animation data loading for pie 3

(cherry picked from commit 7c451d54485b93d213894e7036e48b7f11b072e1)

cea701af5c4babf4a2bfbba527dfa93490b533be authored over 12 years ago

Don't reserve frame 0 for team colour (we use tcmask now).

Fixes bug in animation found by Berg.
(cherry picked from commit 2a9548aaf4de880726ae94ac991cd374...

ecacd970674fd044491756c7c0275a80057cfc1f authored over 12 years ago

Convert code and models from hard coded animation intervals to model defined animation intervals.

Also assert on PIE files with bad animation data.

Closes #3539.
(cherry picked from commit 75ff...

b3dc9444da8f453cbf03c418005bca58318e1ce3 authored over 12 years ago

Fix hardcoded number of frames for structure animations.

N.B. Animation rates remain hardcoded for now.

Closes #1871.
(cherry picked from commit 55bea095...

02ced5ef58c6a63472fc0c0ef0c6759af449d400 authored over 12 years ago

Change OpenGL 1.4+VBO check to OpenGL 1.2+VBO+TEC check for testing.

8b8282cc1f9bbddd6c48cef4dbf1681b84160129 authored over 12 years ago

Fix on-screen droid radius calculation and placement of group/cmndr numbers, rank, etc

Closes #3547.

dd8025d10853fe775ef37c0c632647086752b4d9 authored over 12 years ago

Update Png to 1.5.11.

e971ebbf1cce31b3b7e4e14479ed23b235824254 authored over 12 years ago

Add #include.

Buildbot apparently wasn't happy.

ff09d24f6198e98799f77a1c3f7e873c08d9fd02 authored over 12 years ago

Print all OpenGL extensions with --debug=3d, not just what fits on one line.

86c4b9a37ebdbd2040f6a71380a22e7f1ad66991 authored over 12 years ago

Add extra deprecated feature check in the obsolete driver workaround function.

f54eb00d7044827e011bd3261108bfd446f6a68e authored over 12 years ago

Do not give up following a path due to the droid being on a blocking tile.

If the droid is on a blocking tile, repeatedly redoing pathfinding will not result in a path whi...

f7c6e38aa8e06051c6ac6e42ab9bbaf1b760c9e8 authored over 12 years ago

Don't put pathfinding points very close to blocking tiles.

57a56f21c372e268a645e6312b3f1c5a95a98000 authored over 12 years ago

Fix fpathBlockingTile() usage in moveGetObstacleVector().

d11516795a7d98a6bcf0cdeafe159435108344a4 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

3928607fd9188f5147de396437a7367594949c33 authored over 12 years ago

Make sure we pop our matrix when returning from rendering functions in exceptional circumstances.

c7e72b30e917459d15da0f9e2bda2ac23c16ab36 authored over 12 years ago

New skybox for urban maps.

Closes #3534.

aca180e0e860f42206bc9be21d9e7a65638afbec authored over 12 years ago

Update ChangeLog.

d51cea925ba706b58b14ff66dd32f2ce133c1baa authored over 12 years ago

Update COPYING.NONGPL.

Closes #3533, refs #3534.

7e18c2a58a4c73941f4fdd6aba238e162f81f641 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

Conflicts:
src/game.cpp (Dropped 1974546c27a1d9422ca7ec6bcd70e4fb1041ccc3 changes, which were n...

d227d3a7712a452ac921205e8e1f02d661d9af9d authored over 12 years ago

Always reload weapons when bar is full.

Weapons would only reload if completely empty. If not completely empty, the reloading bar was me...

74d8086132a3f847ea13b88254096fe68a30474b authored over 12 years ago

Texture changes by several people.

Cliff decals by Jorzi, sand support by Mysteryem, new rocky ground texture by MaNGusT, minor twe...

4a53a0e010452a1ef2a64d92fd3f12c27b451a50 authored over 12 years ago

Balance changes by NoQ.

And thanks to Reg312, Iluvalar and tmp500 for valuable suggestions.

Inferno: price 80->110, inc...

ea7b1912fdd6d733288e9b5e783af8cd1c3cf408 authored over 12 years ago

Try to only show issues in the test outputs.

64951d6f128c6a3db01b1705a462f4f632bcf2af authored over 12 years ago

Do not bother looking for things that might not exist.

75041d82eac86a90437e497f7d44427ac0ba0e19 authored over 12 years ago

Fix taking screenshots whose width is not congruent to 0 mod 4.

Closes #3537.

62153e972fc7c6516f997c8182b1328cfd8dd990 authored over 12 years ago

Fix .gitignore.

The tools/image/image in .gitignore was mysteriously changed to be a directory only in
c346e9ebb...

c94112b6b33439157cc04e29a33676d9af07263e authored over 12 years ago

Unduplicate backdrop pixel blitting code slightly.

27dfe9753b2024b90dfd92d8bad01db9cd74fecd authored over 12 years ago

Add oil barrels to map preview.

5b07a7b755a529d37c5f308b5ecd6df52da05fec authored over 12 years ago

Allow queuing building on burning oil wells.

Actual construction only starts after the oil well finishes burning.

353357b1b6f3b8a12131abd7c2c2cef571402e5b authored over 12 years ago

Fix CB fire against mobile targets.

Steps to reproduce:
1) Player A builds a CB sensor.
2) Player B attacks the CB sensor with a mor...

193eba2a9f8d4a5fc2dd6ed58dabe4c42e1eaa1a authored over 12 years ago

Use a faster optipng option set that also strips metadata.

Requires optipng 0.7.1+ to work.

fbd757b51534e57b3dd5622591946d2345d80f9d authored over 12 years ago

Add a mac build for the image helper program.

c346e9ebb6abafc9be31325ce3b2ce1c2f42227a authored over 12 years ago

Don't desynch on dropped players.

Desynch was due to host-spoofed GAME_PLAYER_LEFT message being processed by clients at random ti...

35f301b1ba7f76be1bbfc80d8cdb924f12d6ae7e authored over 12 years ago

Simplify NETrecvGame() slightly.

No need to check for NET_* messages in game queues.

6af88a6289edf2e820c225f3fc7493cd0587c273 authored over 12 years ago

Don't send a value which is never read, anyway.

051f83c5121c349430786d11ca9ee49ed49fc1bf authored over 12 years ago

Do not return client broadcast messages to the sender.

Instead of sending a copy of broadcast messages back to the sender, which ignores them anyway, s...

58551ba9d07dd7c70d6443933463124084680ee8 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

49d60d4b6316e8839e548444ef8d90f9dc73c889 authored over 12 years ago

Fix joining games with some closed slots.

Although it no longer crashed when trying to join a game with some closed slots (see previous co...

7816f9f57a8ac8d213a8a2cc239bef43409db048 authored over 12 years ago

Fix host crash on failure in NET_CreatePlayer().

NET_CreatePlayer() should not be able to fail here, though. See following commit.

Crash was due...

7a0cd2eccfe733215ee43cab28243d7f29918b75 authored over 12 years ago

Don't continue to wait for a NET_ACCEPTED after processing a NET_REJECTED.

Don't wait for a NET_ACCEPTED after the socket is broken, either.

4d658c9157dbbef19ee7f161ae85bb96322fbee9 authored over 12 years ago

Don't use bsocket and tcp_socket at the same time.

Somehow fixes a client crash when failing to join a game. Possibly caused by deleting one of bso...

bf2483cbd7430bd81457a6931c1e526828c7d18a authored over 12 years ago

Fix some weird code that partly relied on sockets being blocking.

Exposed in 53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc.

e0939a02175e56f8a0f1468286f0cbd039053174 authored over 12 years ago

Increase precision of sorting in generate-statistics-html.py.

Fix by Emdek, closes #3519.

Also remove unneeded "import os".

2228e801981d73c35be9c483ab19bff141d48b65 authored over 12 years ago

Update translations.

b6c77bd603e134d18eeb30e7d01fe9f2eff9c30b authored over 12 years ago

French translation update by Amiral JCDG.

Closes #3512.

113796a9d6a8e34ced9c93bae213ba53b19d5944 authored over 12 years ago

Assert on cyclic research dependencies instead of doing an infinite loop.

Spurious assertions are possible in the case that the research tree is excessively interconnecte...

4079ff203fe6d5f46eb2cb572e170aa1fdd9f9c8 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

f996fa0bb430c48e20bfdc624675454cff949d9a authored over 12 years ago

Add missing header for last commit

3334b4db16bde9127841f2feb16e0f229300fc48 authored over 12 years ago

Add a work around and a assert to help out with the savegame issues described in said ticket.

Close ticket #3154

20f203e7eace960525c173d160ac142d3b2332ed authored over 12 years ago

Fix commander unit count on loading games.

Add error sound, and text when you can't add any more units to the Commander.

Fixes ticket:3513
...

b3f3b089f1438bf66fad0e3d4db4447bd2dd6d23 authored over 12 years ago

Fix game mechanics bug allowing one truck to claim 10 derricks at once.

Abandoned structures with no cost now slowly deconstruct over a period of one minute.

5ba90fec427096f6016867852ce696126514d378 authored over 12 years ago

Make sockets nonblocking as workaround for socket calls unexpectedly blocking.

For some weird reason, select() sometimes returns that a socket write would not block, but the s...

53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc authored over 12 years ago

Merge branch 'bugfixes' into 3.1

2738fe8ff929fa540f7cd697b798e81cfafd10c1 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

ddb696c28647a9816d26a45d60d7042db4db87c3 authored over 12 years ago

Only play ID_SOUND_ARTIFACT_RECOVERED to the player picking up the artefact.

Fixes ticket:3488.

acaf4620e0f14d50b0c1696e0236ef9e82ca8e6a authored over 12 years ago

Let CB sensors defend allies too.

313738ed235c69c64c83eb9b987d63efc95d8782 authored over 12 years ago

Don't spam assertions while artillery is assigned to allied sensors.

5d199046c8e4ba59e1b1c4b8871c0e2e7c1aa308 authored over 12 years ago

Update zlib to 1.2.7.

15aebc46f3b4fe78063dcb52aa777c5f437ca30e authored over 12 years ago

Show "[PlayerName] has left the game." to all players again.

Fixes ticket:3461.

00b1968184ff4f215ed7de8b217857f0d5866ad1 authored over 12 years ago

Fix unconventional reported unit count on selecting all units of same type.

Previous unconventional behaviour was to consider the set of previously-unselected droids becomi...

22799c2b2607949b1920e8d1f143311c167f7a39 authored over 12 years ago

Fix Nexus AI unable to build units.

Nexus was building units with an unresearched sensor (equivalent to the default sensor). Since
6...

f0eea791042c6baba6173c2d5da37f5eaf097813 authored over 12 years ago

Put the unused MAX_BYTESPERSEC define out of its misery.

a80f0408495e8357994b8ace0812d5f4ad817956 authored over 12 years ago

Be more consistent in ping display, show ping ≥ 4000 as ∞.

bedd8704f2aef5afd1c2acfa4566a0445d3b22fb authored over 12 years ago

Fix communication between remaining clients when one client freezes.

Problem persisted until the frozen client drops completely, or unfreezes (net connection is rest...

e14c39fb38ba8c6f11bb4f8e3f0e78a61cb86828 authored over 12 years ago

Merge branch 'bugfixes' into 3.1

f04b5ddb8bde2aa6476a296aa88cb8f749d1ab84 authored over 12 years ago

Fix flag loading code to work for out of sequence factories.

fixes ticket:3384

737b3d9d24ab1634dafd09558fc8b8a5354ffa9c authored over 12 years ago

fix an FTBFS with -Werror=format-security

Fixes ticket:3493.

e5d2242be00bdb665e0e8ea55adcbd90be462160 authored over 12 years ago

Fix some typos.

Thanks to pabs for noticing one of them. Closes #3495.

52511cec6003e389307859535853eb96a9cf60a4 authored over 12 years ago

Dutch translation update by nino_romans.

Closes #3484.

c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37 authored over 12 years ago

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

Closes #3486.

a400fe055fd5d176cd809bcfdc0973cf839a4a2c authored over 12 years ago

Hungarian translation update by mtomi78.

Closes #3485.

d74ebad6a32dbe49771223c347ad9515a101976b authored over 12 years ago

French translation update by Amiral JCDG.

Closes #3483.

badb8c05cb3e9e8a8e1af529288d57b96126e482 authored over 12 years ago

Polish translation update by Emdek.

Closes #1347.

9fc92b7d64200c65f7ea8baab617ed8d19a773cf authored over 12 years ago

Ecosyste.ms: OpenCollective

github.com/Warzone2100/archived-3.1-branch