warzone2100:mainline.git
4 years agoMerge branch 'bugfixes' into 3.1 3.1
vexed [Sun, 31 Mar 2013 02:49:12 +0000 (22:49 -0400)]
Merge branch 'bugfixes' into 3.1

4 years agoTry to filter out bad maps
vexed [Sun, 31 Mar 2013 02:44:37 +0000 (22:44 -0400)]
Try to filter out bad maps

fixes ticket:3982

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 18 Mar 2013 07:10:10 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years ago3.1, widget: Don't open/close forms too far, even when not displayed regularly.
Cyp [Sat, 16 Mar 2013 08:16:32 +0000 (09:16 +0100)]
3.1, widget: Don't open/close forms too far, even when not displayed regularly.

Redundant in master since 6a714109276353b6d10dbf1c11d5f181c6511ce1.

Probably fixes ticket:3532.

4 years ago3.1, widget: Process widget callbacks before widget display.
Cyp [Fri, 15 Mar 2013 20:17:04 +0000 (21:17 +0100)]
3.1, widget: Process widget callbacks before widget display.

Previously, widget callbacks were not always called, even when displayed.

Fixes ticket:3844, "Drag select freezes build progress bar".

4 years agoRemove lop-sided oil barrels from 4c-pyramidal.
Cyp [Thu, 14 Mar 2013 21:51:24 +0000 (22:51 +0100)]
Remove lop-sided oil barrels from 4c-pyramidal.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 4 Mar 2013 07:10:08 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoMake sure that template designs contain only designable components. This closes ticke...
per [Sun, 3 Mar 2013 21:57:16 +0000 (22:57 +0100)]
Make sure that template designs contain only designable components. This closes ticket:3971.

4 years ago3.1: Don't double-submit editboxes.
Cyp [Sat, 2 Mar 2013 09:08:33 +0000 (10:08 +0100)]
3.1: Don't double-submit editboxes.

Don't know if this has any actual effect. Would not have had an effect before supporting multiple widget-related
events in the same update, so not a bugfix over 3.1.0.

4 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Tue, 26 Feb 2013 13:07:05 +0000 (14:07 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update translations.
  Polish translation update by Emdek.
  Hungarian translation update by mtomi78.

4 years agoRevert "make -Cpo update-po"
cybersphinx [Tue, 26 Feb 2013 13:06:46 +0000 (14:06 +0100)]
Revert "make -Cpo update-po"

This reverts commit 7ac192b384b7542be12eec29bb4c68980f546d40.

4 years agoUpdate translations.
cybersphinx [Sun, 24 Feb 2013 21:22:18 +0000 (22:22 +0100)]
Update translations.

4 years agoPolish translation update by Emdek.
cybersphinx [Sun, 24 Feb 2013 21:21:11 +0000 (22:21 +0100)]
Polish translation update by Emdek.

Closes #1347.

4 years agoHungarian translation update by mtomi78.
cybersphinx [Sun, 24 Feb 2013 21:19:59 +0000 (22:19 +0100)]
Hungarian translation update by mtomi78.

Closes #3934.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 18 Feb 2013 07:10:09 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoAdd a lobby filter to toggle between, showing all games or just your version.
vexed [Sun, 17 Feb 2013 03:18:26 +0000 (22:18 -0500)]
Add a lobby filter to toggle between, showing all games or just your version.

(NOTE: Need a better icon)

4 years agoWe now only show games that are newer, or the same version. (Until the time we have...
vexed [Sat, 16 Feb 2013 03:32:37 +0000 (22:32 -0500)]
We now only show games that are newer, or the same version. (Until the time we have a good way to filter games via GUI control)

4 years agoDon't keep trying to query server if we get a error message.
vexed [Sat, 16 Feb 2013 02:53:12 +0000 (21:53 -0500)]
Don't keep trying to query server if we get a error message.

fixes ticket:3762

4 years agoMerge branch 'bugfixes' into 3.1
vexed [Thu, 14 Feb 2013 04:09:13 +0000 (23:09 -0500)]
Merge branch 'bugfixes' into 3.1

4 years agoSlight cleanup of various commits ;; -> ;
vexed [Thu, 14 Feb 2013 02:22:17 +0000 (21:22 -0500)]
Slight cleanup of various commits ;; -> ;

4 years agoFix memory leak in effects
vexed [Thu, 15 Mar 2012 02:12:57 +0000 (21:12 -0500)]
Fix memory leak in effects

4 years agoPrevent scavenger AI from producing trikes over limits.
haoNoQ [Mon, 11 Feb 2013 15:48:48 +0000 (19:48 +0400)]
Prevent scavenger AI from producing trikes over limits.
Make it use firetruck body.
Make it use DORDER_SCOUT for attack, instead of DORDER_MOVE.
Remove useless conversion to world coordinates (3.1 only)

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 11 Feb 2013 07:10:08 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoqtscript: Fix a typo in structure health calculation. Fixes ticket:3930.
haoNoQ [Sat, 9 Feb 2013 18:31:57 +0000 (22:31 +0400)]
qtscript: Fix a typo in structure health calculation. Fixes ticket:3930.

4 years agoChange gridStartIterate interface to safely allow recursive calls.
Cyp [Sat, 9 Feb 2013 11:33:00 +0000 (12:33 +0100)]
Change gridStartIterate interface to safely allow recursive calls.

Probably fixes ticket:3894.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 8 Feb 2013 07:10:08 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agocpp: Remove old fixcppbuild script.
Cyp [Thu, 7 Feb 2013 09:10:07 +0000 (10:10 +0100)]
cpp: Remove old fixcppbuild script.

Redundant since ea4e99a92dc76a1fded791328d9584f9385c358c, as everything that should be compiled as C++ already is.

4 years agonewnet: Remove very-out-of-date newnet.TODO, since newnet is done.
Cyp [Thu, 7 Feb 2013 09:08:08 +0000 (10:08 +0100)]
newnet: Remove very-out-of-date newnet.TODO, since newnet is done.

4 years agoAllocate joining players in topmost available slot.
Cyp [Sat, 2 Feb 2013 07:57:07 +0000 (08:57 +0100)]
Allocate joining players in topmost available slot.

4 years agoUpdate NullBot to latest version.
haoNoQ [Sun, 3 Feb 2013 16:51:39 +0000 (20:51 +0400)]
Update NullBot to latest version.

4 years agoMerge remote-tracking branch 'origin/bugfixes' into 3.1
per [Sun, 3 Feb 2013 15:19:11 +0000 (16:19 +0100)]
Merge remote-tracking branch 'origin/bugfixes' into 3.1

4 years agoGet rid of an unnecessary addition from f910611e.
dak180 [Sat, 2 Feb 2013 18:05:26 +0000 (13:05 -0500)]
Get rid of an unnecessary addition from f910611e.

4 years agoqtscript: Add parameter checking for buildings that do not exist. Fix one such error...
per [Thu, 31 Jan 2013 20:11:36 +0000 (21:11 +0100)]
qtscript: Add parameter checking for buildings that do not exist. Fix one such error in semperfi.js.

4 years agoFix build warning
per [Thu, 31 Jan 2013 19:25:30 +0000 (20:25 +0100)]
Fix build warning

4 years agoBuild a local, up to date, copy of the docs if possible.
dak180 [Wed, 30 Jan 2013 19:41:30 +0000 (14:41 -0500)]
Build a local, up to date, copy of the docs if possible.

4 years agoMore specific matching.
dak180 [Wed, 30 Jan 2013 16:47:10 +0000 (11:47 -0500)]
More specific matching.

4 years agoFix building on OpenBSD due to lack of sys/ucontext.h header.
per [Wed, 30 Jan 2013 07:52:21 +0000 (08:52 +0100)]
Fix building on OpenBSD due to lack of sys/ucontext.h header.
Patch by brad@comstyle.com. This closes ticket:3917.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 28 Jan 2013 07:10:08 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agowidget: Try to eat less mouse clicks.
Cyp [Sun, 27 Jan 2013 08:02:31 +0000 (09:02 +0100)]
widget: Try to eat less mouse clicks.

The widgRunScreen() function now returns a std::vector, and the most important mouse clicks (on in-game menus, that
is) are less likely to be ignored.

4 years agowidgets: Cleanup, replace remnants of C-style virtual functions calls with native...
Cyp [Sat, 26 Jan 2013 19:19:36 +0000 (20:19 +0100)]
widgets: Cleanup, replace remnants of C-style virtual functions calls with native C++ virtual functions.

4 years agowidgets: Queue up clicks, such that all mouse clicks are processed.
Cyp [Sat, 26 Jan 2013 16:48:54 +0000 (17:48 +0100)]
widgets: Queue up clicks, such that all mouse clicks are processed.

The widgRunScreen() still only returns one value, so the effect of some mouse clicks is still lost, but a few less
mouse clicks should be randomly thrown away, now. Only the widget system currently reads the click queue.

Extending KEY_PRESSED, KEY_RELEASED and KEY_PRESSRELEASE with KEY_PRESSRELEASEPRESSRELEASEPRESSPRESSRELEASE didn't
seem like the optimal approach to fix the issue.

4 years agowidgets: Cleanup, replace C-style virtual functions calls with native C++ virtual...
Cyp [Fri, 25 Jan 2013 07:50:58 +0000 (08:50 +0100)]
widgets: Cleanup, replace C-style virtual functions calls with native C++ virtual functions.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 25 Jan 2013 07:10:08 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoUpdate the mac build's png to 1.5.14.
dak180 [Thu, 24 Jan 2013 14:00:25 +0000 (09:00 -0500)]
Update the mac build's png to 1.5.14.

4 years agoUpdate autorevision with latest, portable, version from git
Dmitry Marakasov [Mon, 21 Jan 2013 18:15:38 +0000 (22:15 +0400)]
Update autorevision with latest, portable, version from git

4 years agoFix compile error on *BSD systems.
Cyp [Mon, 21 Jan 2013 19:57:10 +0000 (20:57 +0100)]
Fix compile error on *BSD systems.

Patch by brad@comstyle.com.
Fixes ticket:3845.

4 years agoallyresearch: Also show in the bottom menu, if allies are researching the same as us.
Cyp [Mon, 21 Jan 2013 19:43:02 +0000 (20:43 +0100)]
allyresearch: Also show in the bottom menu, if allies are researching the same as us.

4 years agoallyresearch: Keep showing allied research even while facilities are upgraded.
Cyp [Mon, 21 Jan 2013 12:52:40 +0000 (13:52 +0100)]
allyresearch: Keep showing allied research even while facilities are upgraded.

4 years agoallyresearch: Simplify logic for display of ally research.
Cyp [Mon, 21 Jan 2013 08:43:47 +0000 (09:43 +0100)]
allyresearch: Simplify logic for display of ally research.

4 years agoFix bug that made droids produced by scripts get human player's upgrades.
per [Mon, 21 Jan 2013 21:17:58 +0000 (22:17 +0100)]
Fix bug that made droids produced by scripts get human player's upgrades.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 21 Jan 2013 07:10:06 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoUpdate changelog
per [Sun, 20 Jan 2013 14:31:05 +0000 (15:31 +0100)]
Update changelog

4 years ago3.1: Fix group counting off-by-one bug.
per [Sun, 20 Jan 2013 14:30:04 +0000 (15:30 +0100)]
3.1: Fix group counting off-by-one bug.

4 years agoDon't let other objects set text color of desync/quit/drop icons' player numbers.
Subsentient [Sat, 19 Jan 2013 02:13:58 +0000 (19:13 -0700)]
Don't let other objects set text color of desync/quit/drop icons' player numbers.

(Same for font size. — Cyp)

4 years agoRemove old autogenerated notice, add notice that tools/image is no longer useful.
Cyp [Fri, 18 Jan 2013 07:53:36 +0000 (08:53 +0100)]
Remove old autogenerated notice, add notice that tools/image is no longer useful.

Icons are now always in separate image files (and joined at run-time), so there is currently no tool which
autogenerates the header. The header should be updated manually, if adding new icons.

Fixes ticket:3886.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 18 Jan 2013 07:10:10 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoSquelch warnings.
Cyp [Thu, 17 Jan 2013 14:28:33 +0000 (15:28 +0100)]
Squelch warnings.

Fixes ticket:3880 and ticket:3882.

4 years agoUpdate the copyright year in the mac strings.
dak180 [Thu, 17 Jan 2013 03:06:05 +0000 (22:06 -0500)]
Update the copyright year in the mac strings.

4 years agoFix Super & Cyborg transports sizes in intel display
vexed [Wed, 16 Jan 2013 23:42:41 +0000 (18:42 -0500)]
Fix Super & Cyborg transports sizes in intel display

fixes ticket:3781

4 years agoMerge branch 'bugfixes' into 3.1
vexed [Wed, 16 Jan 2013 21:29:19 +0000 (16:29 -0500)]
Merge branch 'bugfixes' into 3.1

4 years agoRemove unsued and unmaintained betawidget library from Source tree.
vexed [Wed, 16 Jan 2013 21:15:53 +0000 (16:15 -0500)]
Remove unsued and unmaintained betawidget library from Source tree.

This should be moved to a experimental branch until something comes out of it.

4 years agoRemove EditWorld from source tree.
vexed [Wed, 16 Jan 2013 21:11:48 +0000 (16:11 -0500)]
Remove EditWorld from source tree.

This only worked on windows, used DX (5/6), and MFC, and will not compile 'as is'.
Even if you could get it to compile, the data it produces will not work with the
current Warzone builds.

For a map editor, it is highly suggested you use FLaME. https://github.com/Warzone2100/flaME

4 years agoMerge branch 'bugfixes' into 3.1
vexed [Wed, 16 Jan 2013 20:46:56 +0000 (15:46 -0500)]
Merge branch 'bugfixes' into 3.1

4 years agoSeems time don't stop, so bump the year to 2013.
vexed [Wed, 16 Jan 2013 20:34:57 +0000 (15:34 -0500)]
Seems time don't stop, so bump the year to 2013.

4 years agoMake sure the right sequences.wz gets copied.
dak180 [Tue, 15 Jan 2013 04:29:18 +0000 (23:29 -0500)]
Make sure the right sequences.wz gets copied.

4 years agoActivate the high quality vids for the mac build.
dak180 [Tue, 15 Jan 2013 02:07:50 +0000 (21:07 -0500)]
Activate the high quality vids for the mac build.

4 years agoUpdate translation deactivations for the mac build.
dak180 [Tue, 15 Jan 2013 02:04:47 +0000 (21:04 -0500)]
Update translation deactivations for the mac build.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 14 Jan 2013 07:10:10 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoMove the OV_EXCLUDE_STATIC_CALLBACKS define out of the code.
dak180 [Sun, 13 Jan 2013 15:31:49 +0000 (10:31 -0500)]
Move the OV_EXCLUDE_STATIC_CALLBACKS define out of the code.

4 years agoRemove another "shadow".
cybersphinx [Sat, 12 Jan 2013 23:21:49 +0000 (00:21 +0100)]
Remove another "shadow".

4 years agoRemove shadow parts from a few models.
cybersphinx [Sat, 12 Jan 2013 20:52:36 +0000 (21:52 +0100)]
Remove shadow parts from a few models.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 11 Jan 2013 07:13:34 +0000 (08:13 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoFix GUI bug where scav button pretends to be clickable even when not the host.
Subsentient [Thu, 15 Nov 2012 13:58:08 +0000 (06:58 -0700)]
Fix GUI bug where scav button pretends to be clickable even when not the host.

4 years agocleanup: Remove some unused defines.
Cyp [Wed, 9 Jan 2013 11:49:04 +0000 (12:49 +0100)]
cleanup: Remove some unused defines.

4 years agoMerge branch 'bugfixes' into 3.1
dak180 [Mon, 7 Jan 2013 16:08:35 +0000 (11:08 -0500)]
Merge branch 'bugfixes' into 3.1

* topic/bugfixes:
  Make configure fail if it doesn't find flex.
  Update the default layout for CS-ID.xcconfig.
  Emit warnings on improperly / unsigned frameworks.
  Do not rely on the default Designated Requirements.
  stats: Prevent double-counting of wins/losses.
  stats: Use actual number of games played when drawing medals.
  stats: Actually save stats, so players aren't stuck with the pacifier forever.
  Prevent updating autorevision.h's timestamp when its contents haven't changed
  Prevent out-of-bounds array access
  map2preview: handle unknown tilesets

Conflicts:
macosx/configs/mkdmgs.sh

4 years agoMake configure fail if it doesn't find flex.
cybersphinx [Sun, 6 Jan 2013 20:51:39 +0000 (21:51 +0100)]
Make configure fail if it doesn't find flex.

Fixes #3859.

4 years agoUpdate the default layout for CS-ID.xcconfig.
dak180 [Sun, 6 Jan 2013 02:14:27 +0000 (21:14 -0500)]
Update the default layout for CS-ID.xcconfig.

4 years agoEmit warnings on improperly / unsigned frameworks.
dak180 [Sun, 6 Jan 2013 01:36:21 +0000 (20:36 -0500)]
Emit warnings on improperly / unsigned frameworks.

4 years agoDo not rely on the default Designated Requirements.
dak180 [Sat, 5 Jan 2013 23:20:02 +0000 (18:20 -0500)]
Do not rely on the default Designated Requirements.

Also, sign the frameworks earlier.

4 years agostats: Prevent double-counting of wins/losses.
Per [Sat, 5 Jan 2013 22:31:15 +0000 (23:31 +0100)]
stats: Prevent double-counting of wins/losses.

Fixes ticket:3855.

4 years agostats: Use actual number of games played when drawing medals.
Cyp [Sat, 5 Jan 2013 09:55:06 +0000 (10:55 +0100)]
stats: Use actual number of games played when drawing medals.

Players are no longer stuck with the pacifier forever.

4 years agostats: Actually save stats, so players aren't stuck with the pacifier forever.
Cyp [Fri, 4 Jan 2013 09:27:57 +0000 (10:27 +0100)]
stats: Actually save stats, so players aren't stuck with the pacifier forever.

Stats were only saved in multiGameShutdown(), which apparently never gets called if closing the game.

4 years agoPushing 3.1.0.
vexed [Sat, 5 Jan 2013 03:52:53 +0000 (22:52 -0500)]
Pushing 3.1.0.
Update to release builds.
Bump netplay to a higher version (0x10).
Update win32's rc file.
Change version to 3.1.0

4 years agomake -Cpo update-po
vexed [Sat, 5 Jan 2013 04:20:44 +0000 (23:20 -0500)]
make -Cpo update-po

4 years agoMerge branch 'build-problems' into bugfixes
Giel van Schijndel [Fri, 4 Jan 2013 10:07:05 +0000 (11:07 +0100)]
Merge branch 'build-problems' into bugfixes

Signed-off-by: Giel van Schijndel <me@mortis.eu>
4 years agoPrevent updating autorevision.h's timestamp when its contents haven't changed
Giel van Schijndel [Thu, 3 Jan 2013 13:59:24 +0000 (14:59 +0100)]
Prevent updating autorevision.h's timestamp when its contents haven't changed

Signed-off-by: Giel van Schijndel <me@mortis.eu>
4 years agoPrevent out-of-bounds array access
Giel van Schijndel [Thu, 3 Jan 2013 13:58:41 +0000 (14:58 +0100)]
Prevent out-of-bounds array access

GCC actually gives a warning for this.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
4 years agomap2preview: handle unknown tilesets
Giel van Schijndel [Thu, 3 Jan 2013 13:57:54 +0000 (14:57 +0100)]
map2preview: handle unknown tilesets

Signed-off-by: Giel van Schijndel <me@mortis.eu>
4 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 4 Jan 2013 07:10:07 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoDo not update autorevision.h's time stamp if the content has not changed.
dak180 [Fri, 4 Jan 2013 01:43:26 +0000 (20:43 -0500)]
Do not update autorevision.h's time stamp if the content has not changed.

Also rewrite the driving script for more clarity.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Mon, 24 Dec 2012 07:10:09 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoimages: Make retreat setting buttons show colours of health bars.
Cyp [Sun, 23 Dec 2012 12:41:11 +0000 (13:41 +0100)]
images: Make retreat setting buttons show colours of health bars.

New images by aubergine.

4 years agoFuture proof building on later xcodes.
dak180 [Sat, 22 Dec 2012 22:49:31 +0000 (17:49 -0500)]
Future proof building on later xcodes.

4 years agoClean up a few scripts.
dak180 [Sat, 22 Dec 2012 05:11:56 +0000 (00:11 -0500)]
Clean up a few scripts.

4 years agoMerge branch 'bugfixes' into 3.1
automerge [Fri, 21 Dec 2012 07:10:07 +0000 (08:10 +0100)]
Merge branch 'bugfixes' into 3.1

4 years agoAlso check if vertex array is supported on restoring GL state, not just saving it.
Per Inge Mathisen [Wed, 19 Dec 2012 22:01:22 +0000 (23:01 +0100)]
Also check if vertex array is supported on restoring GL state, not just saving it.
This removes OpenGL errors reported repeatedly, and closes ticket:3834.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Fri, 14 Dec 2012 13:29:55 +0000 (14:29 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update POTFILES.in again.

5 years agoUpdate POTFILES.in again.
cybersphinx [Fri, 14 Dec 2012 13:23:56 +0000 (14:23 +0100)]
Update POTFILES.in again.

The last update included some stray files that shouldn't have been
there.

5 years agoMerge branch 'bugfixes' into 3.1
cybersphinx [Fri, 14 Dec 2012 13:05:05 +0000 (14:05 +0100)]
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update POTFILES.in.
  Update the mac docs (changes in generation).
  QuesoGLC: Fix potential crash when some OpenGL features are disabled.
  Greek translation update by Nikos Papadopoylos.

5 years agoUpdate POTFILES.in.
cybersphinx [Fri, 14 Dec 2012 13:04:08 +0000 (14:04 +0100)]
Update POTFILES.in.