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

Russian translation update by Vadim S. Sabinich.

See https://github.com/Warzone2100/warzone2100/pull/29.

519b83fbd3cd086b1c29f4215a2cbbd46114f534 authored almost 13 years ago

Russian translation update by rustamv.rman.

Closes #3184.

b7541ac45b9babe0dd0e0b0ffeb3cbd6b9477a2e authored almost 13 years ago

Update translations.

ba33e2c0e423a6d8aa27cee790e31e437a85ee5d authored almost 13 years ago

Fix looping through selections.

Introduced in 8379fb2f8b843a50a5dca16331319b6b8648a63b. Fixes #3189.

e076ad57a430ffbfc9423ac75039c06c60110dbb authored almost 13 years ago

Update Png to 1.5.9.

79772c82b5145a388dd177f12576a3a4a7e0c1e0 authored almost 13 years ago

Allow configuring default skirmish colour to any colour, or to random.

cefd4179f7704e6207e4edc22e33c51363764cb6 authored almost 13 years ago

Bring back to life old VBO hack for unlucky OpenGL 1.4 users, GLEW edition this time. Closes #3166.

Removed some duplicated code for gfx info dump.

a7d2c06c280c867fea61173d25c25d69012db489 authored almost 13 years ago

Add a --fallback-mode option that makes the game only use OpenGL 1.5. See #3166.

f7b2351e1ae5e7002092e271cfbf18e030c51803 authored almost 13 years ago

Merge branch 'bugfixes' into 3.1

3d36a2a69f75dece11787565f4253afbb0c9d3c7 authored almost 13 years ago

Play the correct sounds when we are getting attacked.

Broken in f35de0d51304f68e104d1673d4e284e335472f99

NOTE: see aforementioned commit b18b76ea8a55...

001ef35faf1b1207db0e45ed18fbf072356372f6 authored almost 13 years ago

Correctly define the function for compilers that aren't broken enough to allow bool blah() == void blah() which should throw a error since we don't overload it.

Broken in 68639f734fd3d5a8b5f29b0becd7dc03b5ca0c1f

9a66b4e0d64a1d95e466b0347ec65b79adef42c1 authored almost 13 years ago

Don't hide possible misnamed or non-existent function calls in qtscript's backend. We now give a LOG_WARNING to notify us of the possible error. NOTE: might be better to promote this to LOG_ERROR, so we can tell in-game that we have issues instead of parsing log files.

b18b76ea8a553b06c4f7258fc8432c7db280b9aa authored almost 13 years ago

Make sure we clear the tile with the feature on it after it has been destroyed.

Not really a cherry-pick (functions changed), however, it is the same logic so wanted
to keep tr...

db74b52388325c511cbcf8c0f420693bb16890f1 authored almost 13 years ago

Clean up includes from 24db01ae102e99d848bec402aadc06abe32935c2

abd869b0796275f6dcbbcdad66b42232073047ee authored almost 13 years ago

Tone down the text color of the level name/time

b5ab238e23b5efdce21c4ed818076fbe1c8edeeb authored almost 13 years ago

Add a 'Need more resources' indicator in the power bar when needed.

845d423cb28cfb1818d92719e759a40a61f27d9f authored almost 13 years ago

Only copy javascript doc if we build out of tree.

Also run hevea twice to get cross-references right.

f1fd685071a4c8c7d05e3745b189e10a3f6be128 authored almost 13 years ago

Fix lassat firing too many times when clicking fast.

Fixes ticket:3163.

ea8d833e5c3e9dcd46f9ac799643ec0f513dadbe authored almost 13 years ago

Rename game debug messages to GAME_DEBUG_*.

Also, avoid unexpected triggering of debug code.

Note that this code was actually originally pa...

ea37769188eccee43f5e24a97d41e8b382187a9e authored almost 13 years ago

Synchronise enabling of debug mode.

68639f734fd3d5a8b5f29b0becd7dc03b5ca0c1f authored almost 13 years ago

Remove legacy synch code.

Some of it would run in the case of desynchs, but didn't help with anything.

24db01ae102e99d848bec402aadc06abe32935c2 authored almost 13 years ago

Update Vorbis to 1.3.3.

a369971dbffba855e70c086d8ed14c677553b051 authored almost 13 years ago

In reference to 3e15039 bump the year in the mac files.

Also update the copying.* files included in the mac builds.

04bc8b8045d0b9acc8b51da8fc06863ac87a02e6 authored almost 13 years ago

Fix unit speeds.

Units now actually move at the speeds given in the design menu, which in the case of
VTOLs is up...

5a3925391ea12cda73a6feab687eeec646292091 authored almost 13 years ago

Fix ping times for clients. broken in 74261ad65283f75f7190975fc877a36a13eecb77

65e7c826fedd2db2b74432a91a8e347266ef93bc authored almost 13 years ago

Add a A_O_R to prevent crashing on null pointer

46d1e62c8e0bbc0a0caae48a55e748331a25655b authored almost 13 years ago

Unfortunately, the Project can't stop time, so bump the year.

3e15039aa690bbacd7a8fa51372b6509985bc17e authored almost 13 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
qtscript: Add an html target using hevea for the docs.
qtscript: Use lstlisting ...

119ac53c2ef73a75e256fdc26606034736e02f2d authored almost 13 years ago

qtscript: Add an html target using hevea for the docs.

dfaadbc5d20e2f556af4da746837f4ec6edffd1a authored almost 13 years ago

qtscript: Use lstlisting in the docs.

f8b54fd60f6bdeaf60f6d071d0d708f7d3dc0b9e authored almost 13 years ago

Fix radar/unit design in campaign for away missions.

391ffb621e4d43d67d0cb61c5aa6c28a5375c81a authored almost 13 years ago

qtscript: Add function to enumerate base structures in away missions.

911dda38c64ded43e6d19185fc268e5515ba63de authored almost 13 years ago

qtscript: Add selection by structure type to enumStruct.

1266a795e650de2ee8595f16056d673fb8c9dc1d authored almost 13 years ago

Clean up src/selection.cpp/h.

8379fb2f8b843a50a5dca16331319b6b8648a63b authored almost 13 years ago

qtscript: Document add/removeReticuleButton parameters.

cb94218e10f22409adf6e004a6a98fc75ef8d72c authored almost 13 years ago

qtscript: Remove OPTIONS as an alias for the COMMAND button.

Even in wzscript this was only for backwards compatibility.

eda532db29d74be610d8d4756ba937870113c7fe authored almost 13 years ago

Add new shortcuts for unit selection.

Ctrl+C: All cyborgs
Shift+C: All cyborgs with weapons
Shift+E: All cyborg engineers
Shift+G: All...

37cf6b4d2ab9a525df44c2c14e41f858a987b1a4 authored almost 13 years ago

Change new PIE modes to use flags instead of connectors.

Introduced in 82e00bf7747af4962a32b67e4215d40298bbf9b3:

Roll to camera uses TYPE x1x instead ...

97a7c6a1daa528a83dfed1a6801f35472f6a78bf authored almost 13 years ago

Fix incorrect rounding 1% HP as 0 HP (indestructible features)

Fixes ticket:3134
This fixes the problem where the map has features with 1% HP which
are incorre...

2fc761a304091080a91c5c3660c7b8e0196ffe2a authored almost 13 years ago

Fix incorrect speed bars for vtol.

Fixes ticket:3143

2e0393130739d963b205f18ae55cfddb9a96e9e4 authored almost 13 years ago

Fix ticket:3137 - Nexus AIs loaded for javascript AIs

9d616939ecbf289d97baf7be7a2ec86b7e03d31c authored almost 13 years ago

Allow PMs to player 8 and 9.

Fixes ticket:3141.

e581b840d6ca3e5f0e22bcf3272b8589a68dc962 authored almost 13 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
Fix ChangeLog date.

231b63831c42b9bf7a473a416cffc00183aed0a6 authored almost 13 years ago

Fix ChangeLog date.

1f9165d57fe2a3f41195e3b9de5172ee86e225a2 authored almost 13 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
Update ChangeLog.
Update translations.
Change "System message" to "Server mess...

b11396537768ba977b6e61b3316ab16a0868856b authored almost 13 years ago

Update ChangeLog.

d19550738dd98603abf4eb782ef265dd9389894a authored almost 13 years ago

Update translations.

8e3391a9edcbe34ff5fe899a1bed9ba478dfe731 authored almost 13 years ago

Fix libvorbis linking.

Possibly fixes #2962.

411e4acda351cbdad11193182317c8e7bde5dbc5 authored almost 13 years ago

Only show "player x joined" message in the lobby when it is someone else.

f04bd71542d1ac55903ad8149d5fceddc4567861 authored almost 13 years ago

Change "System message" to "Server message" for the MOTD.

ddd113f992f6bdc0052e71dfee8780840fa40fa2 authored almost 13 years ago

Make research button flash more consistently.

Flash research button, if there is a free lab and a new research becomes available, or if
a lab ...

8d925946763711fb7c345b7ba34f1f24b72a8ec1 authored almost 13 years ago

Always show droids in production, even if obsolete.

This allows cancelling production of obsolete droids, without cancelling all production in the f...

24d0d1b64c115a82ea52cd06e8dd7322c7d8beea authored almost 13 years ago

Fix another research cancellation not registering in UI.

If cancelling a research by clicking on the current research, in the research menu (not
right-cl...

ae59186a07a026ae6dfb4acc78c657f7ca10d279 authored almost 13 years ago

Merge branch 'bugfixes' into 3.1

fd753a6c341886719621d6557ba14943be7de6cb authored almost 13 years ago

Misc fixes for netcode.

Only kick people out once, not them, their color, and their color again.

a2712860d60353e854dd660f3b51ec306862867d authored almost 13 years ago

Fix randomly disabled teams and ready buttons.

Teams of unallocated players affected team and ready-button availability.

108b5ef10a889ae2d3fe74267d3eba646d1ef4d9 authored almost 13 years ago

Only highlight own ready button, when hovering with the mouse.

51b92cd05ff9d536089085132d9d7d42f5c3dade authored almost 13 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
Update ChangeLog.
qt script: Document problem with case sensitivity in script de...

6d476a85d667e2e4ed97b7b30802c9d6b71d3220 authored almost 13 years ago

Update ChangeLog.

bf1689459433b2b86b8be504d784e8f387af9e25 authored almost 13 years ago

qt script: Document problem with case sensitivity in script defined globals.

5a6e1f70a7ffd17a30bd098b708d7ef80c5c564e authored almost 13 years ago

qtscript: Do not save c++ defined special variables to the savegame.

083351a0f54aebbfeee87e0e29f9ba6a040f8624 authored almost 13 years ago

Quick workaround for scavs going inactive after savegame loading.

2417ba4f4b5ec495f52aff72c249ea9e6b821784 authored almost 13 years ago

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

43fc328aeaa5438d5032ced842e48997fc59e896 authored almost 13 years ago

If you save, the load, then save again, then game.scavengers value was set to false

even if you have scavengers in the game, and the scavenger script context is not
created, leading...

d11b13c422b1b1364410a64778ef0fcd8d3644e9 authored almost 13 years ago

Update the docs for xcode builds.

Also restructure the script so it will require less changes in the future.

c7f3d99d54c647147d9a7a9c375f1ce7a0bd66e8 authored almost 13 years ago

qtscript: enumBlips() isn't 3.2-only anymore.

94d7d61b3837c964664d12c031146e5442e283b3 authored almost 13 years ago

qtscript: Improve documentation

d82a0fbfbd1b9acccab0236235ad57e81d5cba83 authored almost 13 years ago

Make sure we do not start multiple AIs for each player when loading a game.

58160f69c5a5208b6683997b82e87686b4a15a9a authored almost 13 years ago

Fix desynch on offering an AI an alliance.

Only triggers in the rarely-used 'Allow Alliances' game mode, in games with AIs. When
offering a...

b4f24bf44f228c34088198a9093a469d098d077b authored almost 13 years ago

When people are kicked, don't lock them out from all other games.

They can't join the game they were kicked from anyway.

(cherry picked from commit 370ce6c9016fc6...

415f6fe590133114f3a68ee783f16b2456ff9187 authored almost 13 years ago

Make latency guesser less optimistic.

Hopefully reduces Zzz microfreezes a bit, in the case of laggy connections.

There's probably a ...

8ab7ba79bc9fb000f91ac16545e09ea5a97d05cb authored almost 13 years ago

Improve screen while waiting for game to start.

Always display the chat console, instead of only flashing it while pressing Esc
repeatedly. Fix ...

fc708d67870dfb6eb218209d776bf7c82be8db02 authored almost 13 years ago

Hopefully make it so conflicts in the xcode project files are automatically resolved.

This is done by making them not actually merge (it still will need to be done though just by han...

d9010d186f322d9a75cf12faa0cf126b035a6fb1 authored almost 13 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
Check if we actually need to hide widgets before hiding them
Fix player counts f...

74c3a8983aac6a95c1b0425689d11ec3b2636511 authored almost 13 years ago

Merge branch 'bugfixes'

* bugfixes:
Check if we actually need to hide widgets before hiding them
Fix player counts f...

73ec38c34711746c98d989164124bc210ca246c4 authored almost 13 years ago

Check if we actually need to hide widgets before hiding them

91853401ad55299c6f6f057e99fd1293834a15e3 authored almost 13 years ago

Fix player counts for both AI & humans & 'closed' slots in MP games

32a7fe731c983adcc02284c7b7f30d2b220ff6fb authored almost 13 years ago

Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104

7859582f13e1f777eaa4e0658fae1629b5b4b923 authored almost 13 years ago

Fix calling batch file for autorevision.sh script refs: 17596232cc207da5007d2120aec849b8db5ea943

0e107e7197b78d19cc2df875ac599abd76afc1b3 authored almost 13 years ago

Don't go past the map's player limits when allocating players. fixes ticket:3089

7f7390cb7e1085a5c22cbb55440e679eb9d6506f authored almost 13 years ago

Fix issues that were overlooked from the revert(s) in ac550acd58b9f65bf0a4f68b02131b0f108d1021

407220868ef69d79a0169200c1016ac70520bf02 authored almost 13 years ago

qtscript: Add a note about local variables to the documentation.

22056fb5c3be663ace0b3b80990558aea1ee2d90 authored almost 13 years ago

Set radarOnScreen to true by default.

Otherwise when loading a campaign game with HQ the minimap is missing.

1d123dffac5deb5bd9fefea79adfaa4ed84d4321 authored almost 13 years ago

Splice in the Changelog from 2.3.

224c1c8d02746053af0aed0f19e2eb1d09f77dc0 authored almost 13 years ago

Add general rules script for the campaign.

Enable design and minimap only when an HQ exists.

4a71db9e9b9f5884324943350776a7099b478250 authored almost 13 years ago

Run eventStartLevel always, not only for skirmish.

78dee1c706577217542752a1455118e107c16aa0 authored about 13 years ago

qtscript: Add function enumBlips(player) to get a list of non-transient radar blips.

0b1fbf7e8fa39fa6e2adfc0d30489826d9701697 authored about 13 years ago

Merge branch 'bugfixes' into 3.1

* bugfixes:
Fix the help bundle.
Bring back the WarzoneHelp info.plist which was lost in the...

ea820dc77031474bfff818ab975ace6cfe8a96ba authored about 13 years ago

Merge branch 'bugfixes' into 'master'.

* bugfixes:
Fix the help bundle.
Bring back the WarzoneHelp info.plist which was lost in the...

6ceb3d7977d6a0310d477569e3c2b832dfd08ad7 authored about 13 years ago

Add OS X help menu items for the man page and scripting docs.

Closes #3109.

* nanotech/topic/help-menu-links:
Add OS X help menu items for the man page and...

9dfe04a7a860229a438cab5afa2e9bb07e58db6e authored about 13 years ago

Fix the help bundle.

The info.plist file is now once again included in the bundle.

fb7c7ccdf1c5e3d0a11ac047391ef5e3a2eeab1b authored about 13 years ago

Bring back the WarzoneHelp info.plist which was lost in the shuffle.

44d8bf7b75aa1614088f169f268626c8ebba40ff authored about 13 years ago

Misc Xcode Fixes

Xcode (4, at least) parses out the 'error:'s in the log and halts the build. This is probably n...

3c9b149a7b51e29a3023b491ce96c8f8940b39c1 authored about 13 years ago

Get all of the scripts that are likely to change with any regularity out of the xcode project.

c5d4acf77391b732c48d704bbafb4f670f13c60b authored about 13 years ago

OS X: Fetching new build dependency versions is not an error.

f273c9ddf065c5651b27b53c9eacc0d2b9ec0b02 authored about 13 years ago

Update Zlib to 1.2.6 and Png to 1.5.8.

15d0fc5bbc7d0503c138d0c6c31adbe52a035c06 authored about 13 years ago

Add the error tag back.

This way message will actually show up in xcode builds if reached.

7cc9072fe11460e1d26ce7788366a39fba1d0bb3 authored about 13 years ago

Fix breakage in the mac builds due to changes in 395cb1b and 5506dae.

c6a37b4590c316a25ddc00dd163d734fc7091a7c authored about 13 years ago

Don't assume Xcode's build products are in the source tree.

Fixes builds in Xcode 4 with the default external
derived data directory.

1ea990ebd480686eff6bfb43caf5f68f66ba04d7 authored about 13 years ago

Add OS X help menu items for the man page and scripting docs.

9c1bb0cf094162991688ddcbba5c52633f941935 authored about 13 years ago

Ecosyste.ms: OpenCollective

github.com/Warzone2100/archived-3.1-branch