Commit Graph

24 Commits (master)

Author SHA1 Message Date
Cyp c1cb8e4343 Merge branch 'bugfixes'
Conflicts:
	src/ai.cpp
	src/combat.cpp
	src/mapgrid.cpp
	src/mapgrid.h
	src/projectile.cpp
	src/qtscriptfuncs.cpp
2013-02-10 13:46:55 +01:00
Cyp 5c7788784b Change gridStartIterate interface to safely allow recursive calls.
Probably fixes ticket:3894.
2013-02-09 12:33:00 +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
Per Inge Mathisen 2772636b58 qtscript: Add enumArea() function for quickly iterating over objects in a rectangular area. 2012-04-19 22:25:52 +02:00
cybersphinx 6c73cd9e8b Merge branch 'bugfixes'
* bugfixes: (24 commits)
  Don't change radar option when clicking on scanlines.
  Use the same text for the unit colour options everywhere.
  Improve factory selection.
  cleanup: Remove some useless code.
  French translation update by Amiral JCDG.
  Load and save factory numbers.
  Properly disable unit design/radar without HQ in mp/sk.
  Add __LINE__ to debug() routines to show exact line it is being called from. On LOG_WARNING, only ouput the warning one time and supress the rest.
  Change it so you can deconstruct anything but blueprints. Fixes ticket:3312
  When debug mode is enabled also enable the flag
  Change defaults to window mode & 640x480, so people can see the system dialog popups if something goes wrong on init.
  Fix spacing a bit for host lobby screen
  Fix Assert to check for Super Transporter as well
  update MSVC solution file Disable mimimalRebuild since it was slower than doing /Mp
  Fix suboptimal paths on multiple droids pathfinding to same location.
  Show correct AI names, even when AI list differs from the host's.
  Remove unused SS_BEING_DEMOLISHED.
  Update droid height after unloading specific droid from transport.
  Show health as well as build progress when selecting incomplete enemy structures.
  Set »ingame.JoiningInProgress[i] = false;« in NET_InitPlayer().
  ...
2012-03-17 23:05:52 +01:00
Cyp fbc600ecdf Fix gridStartIterate in moveCalcDroidSlide clobbered by the one in moveShuffleDroid.
This caused crashes and probably general weird behaviour.

Introduced due to horrible grid system API involving global variables in 0b7605c4ee.

Fixes ticket:3287 and ticket:3301.
2012-03-16 09:41:48 +01:00
Per Inge Mathisen 38bb0831bf Remove ugly constant PREVIOUS_DEFAULT_GRID_SEARCH_RADIUS. Now search sensor targets
in actual sensor range. Also do not try to suggest targets that indirect weapons
cannot fire at since they are outside their vision range and they have no fire designator.
2012-03-04 16:55:48 +01:00
vexed 3e15039aa6 Unfortunately, the Project can't stop time, so bump the year. 2012-02-11 16:50:52 -05: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 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 23d5dcd5dd Remove extern "C" {} from most places, due to longer being needed. 2010-12-21 17:20:48 +01: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 2c900bbc39 Cleanup and code that could be used to make clusters (whatever that means) spend a lot less time updating (if that wouldn't break anything).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9545 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:52 +01:00
Cyp a19eb86fda visibility: Make object-object visibility less weird and less inefficient.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9544 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:52 +01:00
Cyp b4919db163 pointtree: Remove grid system calls which are no longer used.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9265 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +01:00
Cyp 78389d6bb2 pointtree: Remove "naybor" from droids.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9262 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +01:00
Cyp d6d0070530 pointtree: Kill mapgrid.c. Reincarnate as mapgrid.cpp, using the new PointTree.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9261 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:10 +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 2f7817c772 * Replace some uses of BASE_OBJECT* with DROID* to reduce yet some casting
* Fix indentation


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4653 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-16 00:15:29 +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
Per Inge Mathisen 04d0562712 Clean up mapgrid code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3442 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-12 16:35:50 +00:00
Dennis Schridde 49ceba7503 Add GPL notices to all sourcecode files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1014 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 20:09:25 +00:00
No Author 5ba7ddac6b Create final repository structure.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@362 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-28 17:47:08 +00:00