Commit Graph

68 Commits (master)

Author SHA1 Message Date
per c0abe4efe3 qtscript: Add two new functions: showInterface() and hideInterface(). They currently
only serve to assist modifications of the reticule, but will eventually control
hide/show of the larger user interface widgets. Also fix alpha values on two reticule
images.
2013-08-02 21:53:53 +02:00
per cd54d3880c qtscript: Add setReticuleButton(id, tip, filename, filenameDown) to define the look of reticule UI buttons. 2013-08-02 21:53:53 +02:00
per 5bdc9c29e9 Add new image access method using filenames instead of hard-coded IDs.
Convert reticule GUI code to use this new method.
2013-08-02 21:53:53 +02:00
Cyp 714727e241 Allow designing and building obsolete tanks.
Since you sometimes might want to a bunch of cheap MG tanks as a decoy, even if you have twin AG researched.

Also, remove an unrelated uselessly-duplicated test in action.cpp.
2013-05-22 23:57:45 +02:00
Cyp 685e77c884 widget: Convert the intelmap stuff from W_TABFORMs to ListTabWidgets. 2013-03-12 09:12:55 +01:00
Cyp 4194dbf27e widget: Convert the design menu from W_TABFORMs to ListTabWidgets. 2013-03-10 14:29:28 +01:00
Cyp 33fe25fc56 widget: Convert the build/research menu from W_TABFORM to ListTabWidget. 2013-03-08 20:46:19 +01:00
Cyp c6274f3d33 widget: Make IntFormAnimate self-delete after closing.
This eliminates boilerplate code growing in src/hci.cpp for each animated form.
2013-02-28 10:07:36 +01:00
Cyp c7c6534c7c Merge branch 'bugfixes'
Conflicts:
	lib/widget/bar.cpp
	lib/widget/button.cpp
	lib/widget/button.h
	lib/widget/editbox.cpp
	lib/widget/form.cpp
	lib/widget/form.h
	lib/widget/label.cpp
	lib/widget/slider.cpp
	lib/widget/slider.h
	lib/widget/widgbase.h
	lib/widget/widget.cpp
	src/hci.cpp
	src/intdisplay.cpp
2013-01-29 16:22:16 +01:00
Cyp b6b6265e4e allyresearch: Also show in the bottom menu, if allies are researching the same as us. 2013-01-21 22:48:19 +01:00
vexed 6c6fe7c38a Merge branch 'bugfixes'
Conflicts:
	src/e3demo.cpp
	src/e3demo.h
2013-01-16 15:44:22 -05:00
vexed e34e7e4e0c Seems time don't stop, so bump the year to 2013. 2013-01-16 15:34:57 -05:00
automerge d24719344d Merge branch 'bugfixes' 2013-01-11 08:08:21 +01:00
Cyp 40cbe8067b cleanup: Remove some unused defines. 2013-01-09 12:53:03 +01:00
Per Inge Mathisen 6dc1ea15dd Remove unused order. Add new unused icons. Fix reticule tooltips.
Remove some unused remains of internal map editor.
2012-12-30 00:14:41 +01:00
Per Inge Mathisen 3b766d7043 Run astyle over HCI code. 2012-12-21 16:35:35 +01:00
Per Inge Mathisen d7b34c8481 More HCI cleanup. Preparing for astyle run. 2012-12-21 16:32:23 +01:00
Per Inge Mathisen 2acf859725 More misc cleanup 2012-12-21 15:50:06 +01:00
vexed 37a8ee7409 Don't prevent the use of the scroll wheel when the build / research / design / whatever window isn't up yet. 2012-04-03 21:15:43 -04:00
crabster 60fb815bf3 Extending components limit in unit design GUI
Fixes ticket:3160
Limit of components to design increased to 128.
2012-02-20 01:01:41 +04:00
vexed 845d423cb2 Add a 'Need more resources' indicator in the power bar when needed. 2012-02-15 21:48:03 -05:00
vexed 3e15039aa6 Unfortunately, the Project can't stop time, so bump the year. 2012-02-11 16:50:52 -05:00
Cyp 8d92594676 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.
2012-02-07 18:15:40 +01:00
Cyp 23fb1b0607 Show progress of ally research. 2011-03-19 00:34:44 +01:00
abomination a72c41aeec fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
2011-03-13 12:32:24 +01:00
Cyp a6e2291025 Update ally research information in real-time.
Old behaviour was to wait for you to click on something (for example, to start the research), before showing that the ally was already researching.
2011-02-28 23:33:57 +01:00
Cyp ae2ce18314 Bump year.
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:45:27 +01:00
Cyp e862a993cb Split droid template list into game-state list and UI list.
This simplifies things a bit and fixes a desynch.
2011-02-13 18:57:25 +01:00
Cyp 7dcfef76ee Don't let wall dragging affect where it's possible to build, unless bCheckBuildQueue is true.
Probably fixes a desynch.

Also, removed unused outlineTile, outlineOK and outlineNotOK variables.
2011-01-08 15:38:31 +01:00
Cyp 4a34b821ad Fix parts of UI that break if increasing MAX_FACTORY. 2011-01-04 22:32:52 +01:00
Per Inge Mathisen 67e9635f9f Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart. 2010-12-31 22:37:14 +01:00
Cyp 23d5dcd5dd Remove extern "C" {} from most places, due to longer being needed. 2010-12-21 17:20:48 +01:00
Per Inge Mathisen 40ef0f5788 Fix warning about unused statements in switch statement. Remove unused define. 2010-12-17 20:38:04 +01:00
Per Inge Mathisen e2d83d483d Fix AI script event not triggering on production done. Also fix lack of UI updates when AI produces something. Thanks to Cyp for infinite reviews. 2010-12-07 21:58:37 +01:00
buginator 714b465743 Fix missing declaration from
d0217d5d4e
(cherry picked from commit 55cf2a4f85dac4570aca592e165a4041c8cd0940)
2010-10-21 19:01:36 -04:00
Christian Ohm 114b1ff046 Get rid of the "reopen build menu" option.
Obsoleted by build queueing with shift. Refs #2102.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11513 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-23 16:35:32 +02:00
Cyp b59b089ca5 Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/nettypes.c
	src/multibot.c
2010-07-30 22:51:33 +02:00
Buginator edb644a03b Fix (and add missing) headers to files.
2009  Warzone Resurrection Project -> 2010  Warzone 2100 Project

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:33 +02:00
Cyp d7db005f71 Merge remote branch 'origin/master' into newnet
Conflicts:
	.gitignore
	configure.ac
	data/base/images/intfac.img
	data/base/images/intfac5.png
	lib/netplay/makefile.win32
	lib/netplay/netlog.c
	lib/netplay/netplay.c
	lib/netplay/netplay.h
	lib/netplay/netplay.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	po/POTFILES.in
	src/hci.c
	src/intfac.h
	src/keybind.c
	src/multibot.c
	src/multiint.c
	src/multijoin.c
	src/multiplay.c
	src/multistruct.c
	src/multisync.c
	src/scriptai.c
2010-06-15 08:35:52 +02:00
Per Inge Mathisen 338bc9e322 Move all hard-coded colours (except map preview ones) into the palette file. Pass a PIELIGHT to widgSetColour() instead of RGB.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10466 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-12 11:59:30 +02:00
Cyp 79f5ef2f7a Merge remote branch 'origin/master' into newnet
Conflicts:
	lib/netplay/netplay.c
	lib/netplay/netplay.h
	lib/netplay/nettypes.c
	lib/netplay/nettypes.h
	src/multibot.c
	src/multistruct.c
	src/multisync.c
	src/order.c
	src/orderdef.h
	src/wavecast.cpp
2010-03-05 16:09:21 +01:00
Christian Ohm 42ed0032a4 Include/declaration cleanup for src/intorder.c/h.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10140 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-04 19:37:10 +01:00
Cyp 7eed990301 newnet: Fix production queues.
Rename quantity variable which was used for two completely different things in a confusing manner. Disable stopping/resuming unsynchronised production and research.
2010-02-23 18:43:18 +01:00
Christian Ohm 1c26f7ddd5 Fix a few graphical off-by-one errors.
Put the bottom left menu one pixel to the right, so the distance to both bottom
and left edge is 24 pixels. Move the menu buttons two pixels up, so it's in the
middle. Put the radar into the middle of its border. Make the bright rectangle
fill the complete selection.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9548 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:53 +01:00
Cyp 6ddb1eadb2 cpp: Add extern "C" {} in headers.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9336 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:21 +01:00
Buginator 79037573f0 frontport r8717
"Add new flag to keep track of when Host is alive.

Add a popup window notification for when the Host drops, and also notify the host when *they* quit, that the game will be over for everyone else (because of the network model)

Fix heap corruption when the host's connection was severed in the NET_fillBuffer() function.

Fix a socket error when we tried to write to a NULL socket.

Note: added two strings that need translating"


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8743 4a71c877-e1ca-e34f-864e-861f7616d084
2010-01-30 20:26:47 +01:00
Dennis Schridde aac41748dc Bump copyright
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6617 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-10 18:01:48 +00:00
Giel van Schijndel 7ab0ef51ce Clean up:
* Lets ''not'' save on the characters required to have function names make sense
 * Make DeleteButtonData a static function (because it's only used in the source file where it's defined)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6203 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-22 20:04:16 +00:00
Giel van Schijndel 931f87f70a * Remove whitespace from the end of lines
* Add a FIXME note about needing to control the calling frequency of handleAbandonedStructures externally
 * Moved variable reductionAmount into the most local scope
 * Rename iterator `i` to `player`


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4406 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-29 13:27:54 +00:00
Giel van Schijndel 0e522201e0 Cleanup:
* Turn some file-level comments into Doxygen comments
 * Add #include guards to some headers that didn't have them yet


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4210 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-21 21:37:01 +00:00