warzone2100:mainline.git
5 years agoUpdate version numbers for 3.1 beta4. v3.1_beta4
cybersphinx [Tue, 21 Feb 2012 21:00:15 +0000 (22:00 +0100)]
Update version numbers for 3.1 beta4.

5 years agoUse lower-res textures as default.
vexed [Sun, 19 Feb 2012 01:35:35 +0000 (20:35 -0500)]
Use lower-res textures as default.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Tue, 21 Feb 2012 20:22:26 +0000 (21:22 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update ChangeLog.
  Make debug messages work in campaign mode.

5 years agoUpdate ChangeLog.
cybersphinx [Tue, 21 Feb 2012 20:21:39 +0000 (21:21 +0100)]
Update ChangeLog.

5 years agoMake debug messages work in campaign mode.
Cyp [Tue, 21 Feb 2012 19:41:15 +0000 (20:41 +0100)]
Make debug messages work in campaign mode.

Fixes scavenger walls not exploding from scripts.

Fixes ticket:3194.

5 years agoMerge branch 'bugfixes' into 3.1
vexed [Tue, 21 Feb 2012 00:44:45 +0000 (19:44 -0500)]
Merge branch 'bugfixes' into 3.1

5 years agofix menu defaults
vexed [Mon, 20 Feb 2012 07:07:13 +0000 (02:07 -0500)]
fix menu defaults

5 years agoUpdate ChangeLog.
cybersphinx [Mon, 20 Feb 2012 19:26:28 +0000 (20:26 +0100)]
Update ChangeLog.

5 years agoTurkish translation update by Ayhan Görgülü.
cybersphinx [Mon, 20 Feb 2012 19:24:18 +0000 (20:24 +0100)]
Turkish translation update by Ayhan Görgülü.

Closes #3192.

5 years agoMerge branch 'bugfixes' into 3.1
vexed [Mon, 20 Feb 2012 07:07:26 +0000 (02:07 -0500)]
Merge branch 'bugfixes' into 3.1

5 years agoTry to find which messages are not getting processed correctly.
vexed [Mon, 20 Feb 2012 07:06:25 +0000 (02:06 -0500)]
Try to find which messages are not getting processed correctly.

5 years agoMerge branch 'bugfixes' into 3.1
dak180 [Mon, 20 Feb 2012 01:31:25 +0000 (20:31 -0500)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update the docs for xcode builds.
  Update translations.
  Update ChangeLog.
  Search data/mp for map files in addition to data/base.
  Bump netcode, since I forgot in last commit.
  Let the host kick people in non alliance games. (left+right click over ready button of the player you want kicked)

5 years agoUpdate the docs for xcode builds.
dak180 [Mon, 20 Feb 2012 00:10:40 +0000 (19:10 -0500)]
Update the docs for xcode builds.

Also get rid of some odd warnings

5 years agoUpdate translations.
cybersphinx [Sun, 19 Feb 2012 23:32:57 +0000 (00:32 +0100)]
Update translations.

5 years agoUpdate ChangeLog.
cybersphinx [Sun, 19 Feb 2012 23:19:41 +0000 (00:19 +0100)]
Update ChangeLog.

5 years agoSearch data/mp for map files in addition to data/base.
cybersphinx [Sun, 19 Feb 2012 22:18:06 +0000 (23:18 +0100)]
Search data/mp for map files in addition to data/base.

Refs 779b4edcbd2ce1204bb97dbb795ca7e341cc666f.

5 years agoBump netcode, since I forgot in last commit.
vexed [Sun, 19 Feb 2012 23:22:06 +0000 (18:22 -0500)]
Bump netcode, since I forgot in last commit.

5 years agoLet the host kick people in non alliance games. (left+right click over ready button...
vexed [Sun, 19 Feb 2012 22:49:49 +0000 (17:49 -0500)]
Let the host kick people in non alliance games. (left+right click over ready button of the player you want kicked)

close ticket:3100
close ticket:3121
Fix kick routines that got clobbered by the merge a long time ago, and also implement a in-game kick.

Currently, you hold down the right mouse button over the channel icon of the person you want to kick, and it will kick them.

There is no more room for a new icon. :(

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11490 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit da30725d967cf7076456f56122b28ddbc3202488)

Conflicts:

src/multiint.cpp
src/multimenu.cpp
src/multiplay.cpp

Allow the host to kick the AI only in 'cheat mode' in skirmish games.

Closes ticket:2139

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11596 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 7a083b154dab6b6fa8f421042db0670a671127f5)

Conflicts:

src/multimenu.cpp

When kicking, make sure they are an actual human player before adding them to the list.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11506 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 43b180768c71853b3de97d71fa091e6a0fdfc10e)

Conflicts:

lib/netplay/netplay.c

general networking improvements by popular request.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11568 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 052d03d19ec967d4b8cee5d79446fe5ec1f2b040)

Conflicts:

lib/netplay/netplay.c
src/multiint.cpp
src/multijoin.cpp
src/multiplay.cpp
src/multiplay.h
src/multisync.c

Fix client side messages.

refs ticket:2144

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/2.3@11601 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit 98723c00a9b7d6a46eab204ccd474df4a62fbd93)

Conflicts:

lib/netplay/netplay.c
src/multiint.cpp
src/multiplay.cpp

5 years agoMerge branch 'bugfixes' into 3.1
vexed [Sun, 19 Feb 2012 22:32:38 +0000 (17:32 -0500)]
Merge branch 'bugfixes' into 3.1

5 years agoTry a alternative fix for 5694a6fded95e7128c6b8222f6895ba200b75432
vexed [Sun, 19 Feb 2012 22:10:12 +0000 (17:10 -0500)]
Try a alternative fix for 5694a6fded95e7128c6b8222f6895ba200b75432

5 years agoFix a missed file, broken in 5694a6fded95e7128c6b8222f6895ba200b75432
vexed [Sun, 19 Feb 2012 21:55:14 +0000 (16:55 -0500)]
Fix a missed file, broken in 5694a6fded95e7128c6b8222f6895ba200b75432

5 years agoRemove broken old-1.10 mod Update NSIS for the removal
vexed [Sun, 19 Feb 2012 21:47:48 +0000 (16:47 -0500)]
Remove broken old-1.10 mod Update NSIS for the removal

5 years agoTry to improve the host screen to fit all 10p and move
vexed [Sat, 18 Feb 2012 04:28:38 +0000 (23:28 -0500)]
Try to improve the host screen to fit all 10p and move
limits & start hosting buttons to a better(?) location.

Fixes ticket:3157

5 years agoAdjust the Super Transport gfx, thanks to Mysteryem & Berg.
vexed [Sat, 18 Feb 2012 04:25:02 +0000 (23:25 -0500)]
Adjust the Super Transport gfx, thanks to Mysteryem & Berg.
Adjust speed to make it faster.
Adjust armor to make it much weaker.
Fix Research name.
This is the PIE 2 version model.

5 years agoFix radar/minimap size to adapt to lower resolutions better.
vexed [Sun, 19 Feb 2012 20:08:57 +0000 (15:08 -0500)]
Fix radar/minimap size to adapt to lower resolutions better.
Fixes ticket:2694

5 years agoExtending components limit in unit design GUI
crabster [Sat, 11 Feb 2012 11:24:24 +0000 (15:24 +0400)]
Extending components limit in unit design GUI

Fixes ticket:3160
Limit of components to design increased to 128.

5 years agoSet 3.1's qtscript version properly.
Per Inge Mathisen [Sun, 19 Feb 2012 20:44:48 +0000 (21:44 +0100)]
Set 3.1's qtscript version properly.

5 years agoRussian translation update by Vadim S. Sabinich.
vadim s. sabinich [Fri, 17 Feb 2012 02:37:25 +0000 (11:37 +0900)]
Russian translation update by Vadim S. Sabinich.

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

5 years agoRussian translation update by rustamv.rman.
cybersphinx [Sun, 19 Feb 2012 20:27:16 +0000 (21:27 +0100)]
Russian translation update by rustamv.rman.

Closes #3184.

5 years agoUpdate translations.
cybersphinx [Sun, 19 Feb 2012 20:22:37 +0000 (21:22 +0100)]
Update translations.

5 years agoFix looping through selections.
cybersphinx [Sun, 19 Feb 2012 20:20:56 +0000 (21:20 +0100)]
Fix looping through selections.

Introduced in 8379fb2f8b843a50a5dca16331319b6b8648a63b. Fixes #3189.

5 years agoUpdate Png to 1.5.9.
dak180 [Sat, 18 Feb 2012 21:58:01 +0000 (16:58 -0500)]
Update Png to 1.5.9.

5 years agoAllow configuring default skirmish colour to any colour, or to random.
Cyp [Tue, 14 Feb 2012 21:18:35 +0000 (22:18 +0100)]
Allow configuring default skirmish colour to any colour, or to random.

5 years agoBring back to life old VBO hack for unlucky OpenGL 1.4 users, GLEW edition this time...
iNoDlite [Thu, 16 Feb 2012 21:37:35 +0000 (01:37 +0400)]
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.

5 years agoAdd a --fallback-mode option that makes the game only use OpenGL 1.5. See #3166.
cybersphinx [Thu, 16 Feb 2012 21:15:57 +0000 (01:15 +0400)]
Add a --fallback-mode option that makes the game only use OpenGL 1.5. See #3166.

5 years agoMerge branch 'bugfixes' into 3.1
vexed [Thu, 16 Feb 2012 03:07:14 +0000 (22:07 -0500)]
Merge branch 'bugfixes' into 3.1

5 years agoPlay the correct sounds when we are getting attacked.
vexed [Thu, 16 Feb 2012 01:08:29 +0000 (20:08 -0500)]
Play the correct sounds when we are getting attacked.

Broken in f35de0d51304f68e104d1673d4e284e335472f99

NOTE: see aforementioned commit b18b76ea8a553b06c4f7258fc8432c7db280b9aa
on why we should be spitting out warnings/errors, not ignore these issues.

Fixes ticket:3102

5 years agoCorrectly define the function for compilers that aren't broken enough to allow bool...
vexed [Thu, 16 Feb 2012 01:14:40 +0000 (20:14 -0500)]
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

5 years agoDon't hide possible misnamed or non-existent function calls in qtscript's backend...
vexed [Thu, 16 Feb 2012 01:10:03 +0000 (20:10 -0500)]
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.

5 years agoMake sure we clear the tile with the feature on it after it has been destroyed.
vexed [Tue, 14 Feb 2012 21:06:56 +0000 (16:06 -0500)]
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 track of the cherry-pick.

fixes ticket:3155

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

refs ticket:2534
(cherry picked from commit d1c93494dee2f1b929776edadc3bad1f7d364491)

Conflicts:
src/feature.c

5 years agoClean up includes from 24db01ae102e99d848bec402aadc06abe32935c2
vexed [Mon, 13 Feb 2012 21:17:02 +0000 (16:17 -0500)]
Clean up includes from 24db01ae102e99d848bec402aadc06abe32935c2

5 years agoTone down the text color of the level name/time
vexed [Sun, 12 Feb 2012 05:51:07 +0000 (00:51 -0500)]
Tone down the text color of the level name/time

5 years agoAdd a 'Need more resources' indicator in the power bar when needed.
vexed [Sun, 12 Feb 2012 05:48:31 +0000 (00:48 -0500)]
Add a 'Need more resources' indicator in the power bar when needed.

5 years agoOnly copy javascript doc if we build out of tree.
cybersphinx [Wed, 15 Feb 2012 22:09:18 +0000 (23:09 +0100)]
Only copy javascript doc if we build out of tree.

Also run hevea twice to get cross-references right.

5 years agoFix lassat firing too many times when clicking fast.
Cyp [Mon, 13 Feb 2012 11:39:34 +0000 (12:39 +0100)]
Fix lassat firing too many times when clicking fast.

Fixes ticket:3163.

5 years agoRename game debug messages to GAME_DEBUG_*.
Cyp [Mon, 13 Feb 2012 08:26:00 +0000 (09:26 +0100)]
Rename game debug messages to GAME_DEBUG_*.

Also, avoid unexpected triggering of debug code.

Note that this code was actually originally part of the pre-newnet synchronisation
mechanism, but is no longer useful outside of debugging.

5 years agoSynchronise enabling of debug mode.
Cyp [Sun, 12 Feb 2012 23:45:37 +0000 (00:45 +0100)]
Synchronise enabling of debug mode.

5 years agoRemove legacy synch code.
Cyp [Sun, 12 Feb 2012 17:05:18 +0000 (18:05 +0100)]
Remove legacy synch code.

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

5 years agoUpdate Vorbis to 1.3.3.
dak180 [Sun, 12 Feb 2012 13:50:06 +0000 (08:50 -0500)]
Update Vorbis to 1.3.3.

5 years agoIn reference to 3e15039 bump the year in the mac files.
dak180 [Sun, 12 Feb 2012 13:37:45 +0000 (08:37 -0500)]
In reference to 3e15039 bump the year in the mac files.

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

5 years agoFix unit speeds.
Cyp [Sun, 12 Feb 2012 12:11:39 +0000 (13:11 +0100)]
Fix unit speeds.

Units now actually move at the speeds given in the design menu, which in the case of
VTOLs is up to 2.5 times faster, and which in the case of land units up to 1.2 times
faster on one particular terrain type, instead of moving at a maximum of
DROID::baseSpeed, which is the speed before terrain modifiers.

Introduced in 4b08dd0b0ca210b9ad08a192fb8267e35b94cd7f.

Fixes ticket:3140.

5 years agoFix ping times for clients. broken in 74261ad65283f75f7190975fc877a36a13eecb77
vexed [Sat, 11 Feb 2012 19:53:01 +0000 (14:53 -0500)]
Fix ping times for clients. broken in 74261ad65283f75f7190975fc877a36a13eecb77

5 years agoAdd a A_O_R to prevent crashing on null pointer
vexed [Thu, 12 Jan 2012 05:42:06 +0000 (00:42 -0500)]
Add a A_O_R to prevent crashing on null pointer

5 years agoUnfortunately, the Project can't stop time, so bump the year.
vexed [Thu, 12 Jan 2012 21:57:38 +0000 (16:57 -0500)]
Unfortunately, the Project can't stop time, so bump the year.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Fri, 10 Feb 2012 22:04:22 +0000 (23:04 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  qtscript: Add an html target using hevea for the docs.
  qtscript: Use lstlisting in the docs.
  Fix radar/unit design in campaign for away missions.
  qtscript: Add function to enumerate base structures in away missions.
  qtscript: Add selection by structure type to enumStruct.
  Add new shortcuts for unit selection.
  Clean up src/selection.cpp/h.
  qtscript: Document add/removeReticuleButton parameters.
  qtscript: Remove OPTIONS as an alias for the COMMAND button.
  Change new PIE modes to use flags instead of connectors.
  Fix incorrect rounding 1% HP as 0 HP (indestructible features)
  Fix incorrect speed bars for vtol.
  Fix ticket:3137 - Nexus AIs loaded for javascript AIs
  Allow PMs to player 8 and 9.

5 years agoqtscript: Add an html target using hevea for the docs.
cybersphinx [Fri, 10 Feb 2012 21:37:04 +0000 (22:37 +0100)]
qtscript: Add an html target using hevea for the docs.

5 years agoqtscript: Use lstlisting in the docs.
cybersphinx [Fri, 10 Feb 2012 21:36:21 +0000 (22:36 +0100)]
qtscript: Use lstlisting in the docs.

5 years agoFix radar/unit design in campaign for away missions.
cybersphinx [Fri, 10 Feb 2012 05:08:23 +0000 (06:08 +0100)]
Fix radar/unit design in campaign for away missions.

5 years agoqtscript: Add function to enumerate base structures in away missions.
cybersphinx [Fri, 10 Feb 2012 05:07:24 +0000 (06:07 +0100)]
qtscript: Add function to enumerate base structures in away missions.

5 years agoqtscript: Add selection by structure type to enumStruct.
cybersphinx [Fri, 10 Feb 2012 19:29:41 +0000 (20:29 +0100)]
qtscript: Add selection by structure type to enumStruct.

5 years agoAdd new shortcuts for unit selection.
cybersphinx [Thu, 9 Feb 2012 22:12:25 +0000 (23:12 +0100)]
Add new shortcuts for unit selection.

Ctrl+C: All cyborgs
Shift+C: All cyborgs with weapons
Shift+E: All cyborg engineers
Shift+G: All ground based attack units including hovers
Shift+M: All cyborg mechanics
Shift+P: All transporters
Shift+R: All tanks with repair turrets
Shift+S: All sensor units
Shift+T: All trucks

Original patches by JDW and Wolfbyte. Closes #3150.

5 years agoClean up src/selection.cpp/h.
cybersphinx [Thu, 9 Feb 2012 21:13:17 +0000 (22:13 +0100)]
Clean up src/selection.cpp/h.

5 years agoqtscript: Document add/removeReticuleButton parameters.
cybersphinx [Thu, 9 Feb 2012 19:52:56 +0000 (20:52 +0100)]
qtscript: Document add/removeReticuleButton parameters.

5 years agoqtscript: Remove OPTIONS as an alias for the COMMAND button.
cybersphinx [Thu, 9 Feb 2012 19:40:54 +0000 (20:40 +0100)]
qtscript: Remove OPTIONS as an alias for the COMMAND button.

Even in wzscript this was only for backwards compatibility.

5 years agoChange new PIE modes to use flags instead of connectors.
cybersphinx [Sun, 5 Feb 2012 16:18:29 +0000 (17:18 +0100)]
Change new PIE modes to use flags instead of connectors.

Introduced in 82e00bf7747af4962a32b67e4215d40298bbf9b3:

  Roll to camera uses TYPE x1x instead of a "1 x 0" connector.

  Pitch to camera uses TYPE x2x instead of a "2 x 0" connector.

  Additive uses TYPE xx1/xx2 to dis/enable instead of a "x 1 0"/"x 2 0" connector.

Introduced in f3ba2378e54ab0557db4a20c876043f8be059906:

  Premultiplied uses TYPE xx4 instead of a "x 3 0" connector.

Refs #3024.

5 years agoFix incorrect rounding 1% HP as 0 HP (indestructible features)
crabster [Fri, 10 Feb 2012 18:05:44 +0000 (22:05 +0400)]
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 incorrectly converted to 0 HP

5 years agoFix incorrect speed bars for vtol.
crabster [Fri, 10 Feb 2012 13:15:33 +0000 (17:15 +0400)]
Fix incorrect speed bars for vtol.

Fixes ticket:3143

5 years agoFix ticket:3137 - Nexus AIs loaded for javascript AIs
Per Inge Mathisen [Wed, 8 Feb 2012 21:44:16 +0000 (22:44 +0100)]
Fix ticket:3137 - Nexus AIs loaded for javascript AIs

5 years agoAllow PMs to player 8 and 9.
Cyp [Wed, 8 Feb 2012 12:55:33 +0000 (13:55 +0100)]
Allow PMs to player 8 and 9.

Fixes ticket:3141.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Tue, 7 Feb 2012 23:57:46 +0000 (00:57 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Fix ChangeLog date.

5 years agoFix ChangeLog date.
cybersphinx [Tue, 7 Feb 2012 23:31:33 +0000 (00:31 +0100)]
Fix ChangeLog date.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Tue, 7 Feb 2012 20:07:04 +0000 (21:07 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update ChangeLog.
  Update translations.
  Change "System message" to "Server message" for the MOTD.
  Only show "player x joined" message in the lobby when it is someone else.
  Fix libvorbis linking.
  Make research button flash more consistently.
  Always show droids in production, even if obsolete.
  Fix another research cancellation not registering in UI.

5 years agoUpdate ChangeLog.
cybersphinx [Tue, 7 Feb 2012 19:34:34 +0000 (20:34 +0100)]
Update ChangeLog.

5 years agoUpdate translations.
cybersphinx [Tue, 7 Feb 2012 17:41:49 +0000 (18:41 +0100)]
Update translations.

5 years agoChange "System message" to "Server message" for the MOTD.
cybersphinx [Fri, 3 Feb 2012 23:23:46 +0000 (00:23 +0100)]
Change "System message" to "Server message" for the MOTD.

5 years agoOnly show "player x joined" message in the lobby when it is someone else.
cybersphinx [Fri, 3 Feb 2012 23:21:30 +0000 (00:21 +0100)]
Only show "player x joined" message in the lobby when it is someone else.

5 years agoFix libvorbis linking.
cybersphinx [Sun, 5 Feb 2012 15:57:44 +0000 (16:57 +0100)]
Fix libvorbis linking.

Possibly fixes #2962.

5 years agoMake research button flash more consistently.
Cyp [Tue, 7 Feb 2012 17:15:40 +0000 (18:15 +0100)]
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 becomes available and there is something to research.

Stop flashing the research button, if there is nothing to research, or no free labs; for
example, due to a lab being upgraded or destroyed.

Available researches which are already being researched by an ally no longer count towards
the button flashing.

Do not randomly start flashing the research button again, even if there are still free
labs which are not researching.

Fixes ticket:1835.

5 years agoAlways show droids in production, even if obsolete.
Cyp [Mon, 6 Feb 2012 13:37:22 +0000 (14:37 +0100)]
Always show droids in production, even if obsolete.

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

5 years agoFix another research cancellation not registering in UI.
Cyp [Mon, 6 Feb 2012 12:54:32 +0000 (13:54 +0100)]
Fix another research cancellation not registering in UI.

If cancelling a research by clicking on the current research, in the research menu (not
right-clicking on the facility), then the next completed research in the same facility
would linger after completion.

Research is cancelled twice when clicking on the current research, but was incorrectly
registered as cancelling three times, confusing the facility. Also, when cancelling, the
second cancellation would fail to be registered, due to the ID of the research facility
not being sent.

Fixes ticket:3130.

5 years agoMerge branch 'bugfixes' into 3.1
vexed [Mon, 6 Feb 2012 02:56:37 +0000 (21:56 -0500)]
Merge branch 'bugfixes' into 3.1

5 years agoMisc fixes for netcode.
vexed [Mon, 6 Feb 2012 02:43:45 +0000 (21:43 -0500)]
Misc fixes for netcode.
Only kick people out once, not them, their color, and their color again.

5 years agoFix randomly disabled teams and ready buttons.
Cyp [Sun, 5 Feb 2012 12:13:04 +0000 (13:13 +0100)]
Fix randomly disabled teams and ready buttons.

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

5 years agoOnly highlight own ready button, when hovering with the mouse.
Cyp [Sun, 5 Feb 2012 11:32:46 +0000 (12:32 +0100)]
Only highlight own ready button, when hovering with the mouse.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Sat, 4 Feb 2012 22:40:57 +0000 (23:40 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update ChangeLog.
  qt script: Document problem with case sensitivity in script defined globals.
  qtscript: Do not save c++ defined special variables to the savegame.
  Quick workaround for scavs going inactive after savegame loading.
  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 to an assert and lack of scavenger action in the game. Fixed.
  Update the docs for xcode builds.
  qtscript: enumBlips() isn't 3.2-only anymore.
  qtscript: Improve documentation
  Make sure we do not start multiple AIs for each player when loading a game.
  Fix desynch on offering an AI an alliance.
  When people are kicked, don't lock them out from all other games. They can't join the game they were kicked from anyway.
  Make latency guesser less optimistic.
  Improve screen while waiting for game to start.
  Hopefully make it so conflicts in the xcode project files are automatically resolved.
  qtscript: Add function enumBlips(player) to get a list of non-transient radar blips.

5 years agoUpdate ChangeLog.
cybersphinx [Sat, 4 Feb 2012 22:40:02 +0000 (23:40 +0100)]
Update ChangeLog.

5 years agoqt script: Document problem with case sensitivity in script defined globals.
Per Inge Mathisen [Sat, 4 Feb 2012 22:11:54 +0000 (23:11 +0100)]
qt script: Document problem with case sensitivity in script defined globals.

5 years agoqtscript: Do not save c++ defined special variables to the savegame.
Per Inge Mathisen [Sat, 4 Feb 2012 22:07:20 +0000 (23:07 +0100)]
qtscript: Do not save c++ defined special variables to the savegame.

5 years agoQuick workaround for scavs going inactive after savegame loading.
Per Inge Mathisen [Sat, 4 Feb 2012 21:42:56 +0000 (22:42 +0100)]
Quick workaround for scavs going inactive after savegame loading.

5 years agoMerge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes
Per Inge Mathisen [Sat, 4 Feb 2012 21:07:55 +0000 (22:07 +0100)]
Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes

5 years agoIf you save, the load, then save again, then game.scavengers value was set to false
Per Inge Mathisen [Sat, 4 Feb 2012 21:06:30 +0000 (22:06 +0100)]
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 to an assert and lack of scavenger action in the game. Fixed.

5 years agoUpdate the docs for xcode builds.
dak180 [Sat, 4 Feb 2012 20:25:40 +0000 (15:25 -0500)]
Update the docs for xcode builds.

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

5 years agoqtscript: enumBlips() isn't 3.2-only anymore.
Per Inge Mathisen [Sat, 4 Feb 2012 20:05:16 +0000 (21:05 +0100)]
qtscript: enumBlips() isn't 3.2-only anymore.

5 years agoqtscript: Improve documentation
Per Inge Mathisen [Fri, 3 Feb 2012 22:06:03 +0000 (23:06 +0100)]
qtscript: Improve documentation

5 years agoMake sure we do not start multiple AIs for each player when loading a game.
Per Inge Mathisen [Fri, 3 Feb 2012 21:04:05 +0000 (22:04 +0100)]
Make sure we do not start multiple AIs for each player when loading a game.

5 years agoFix desynch on offering an AI an alliance.
Cyp [Sat, 4 Feb 2012 15:12:45 +0000 (16:12 +0100)]
Fix desynch on offering an AI an alliance.

Only triggers in the rarely-used 'Allow Alliances' game mode, in games with AIs. When
offering an AI an alliance, the AI would sometimes accept instantly, and the acceptance
was not synchronised.

5 years agoWhen people are kicked, don't lock them out from all other games.
Buginator [Sat, 4 Sep 2010 20:26:54 +0000 (20:26 +0000)]
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 370ce6c9016fc6bba390fcf498d2be770f77f240)

5 years agoMake latency guesser less optimistic.
Cyp [Fri, 3 Feb 2012 12:31:22 +0000 (13:31 +0100)]
Make latency guesser less optimistic.

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

There's probably a better way of guessing latency than this, but it works for now.

5 years agoImprove screen while waiting for game to start.
Cyp [Fri, 3 Feb 2012 09:14:43 +0000 (10:14 +0100)]
Improve screen while waiting for game to start.

Always display the chat console, instead of only flashing it while pressing Esc
repeatedly. Fix weird font sizes. Show which players have loaded so far. Show
joining status for everyone, not just the host.

5 years agoHopefully make it so conflicts in the xcode project files are automatically resolved.
dak180 [Fri, 3 Feb 2012 23:06:06 +0000 (18:06 -0500)]
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 hand on a platform where it can be tested).