Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,728 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

52 Commits (master)

Author SHA1 Message Date
vexed fdc3b7d4cb Fix capacity clobber. 
refs:4458c8b2edece39175bda25ecf8ac84c2633feca
 2013-11-14 22:26:19 -05:00
vexed c142724c2a Merge branch 'bugfixes' 
Conflicts:
	src/template.cpp
 2013-11-14 21:14:26 -05:00
vexed 4458c8b2ed Allow VTOL factories to produce SUPER_HEAVY units. 2013-11-14 20:57:01 -05: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
per d769794e72 Silence extremely chatty debug line 2013-05-21 23:10:57 +02:00
per 9ac0e6ae4c Merge cyborg bodies into two classes, light and heavy. This conforms to how 
the guide explains it, and eliminates a number of ugly hacks in the code. It
should not change anything for the player.
 2013-05-19 21:06:24 +02:00
per 100f5e9560 Use 'names' fields in ini files instead of looking up names in names.txt 2013-05-12 23:50:57 +02:00
per 678e281b50 Convert templates to ini file format. Thanks to Duha for file conversions. 
This closes ticket:4005.
 2013-05-09 23:17:05 +02:00
per 36d0e3e7be Trim size of template structure 2013-05-09 13:25:40 +02:00
per 8701e80a79 Remove useless template variable 2013-05-09 13:25:40 +02:00
per 2459f78bd5 Clean up component definition, remove useless COMP_UNKNOWN and wrong comments. 2013-05-05 20:50:51 +02:00
per 9e16fc5e1d Move number of building modules (its "capacity") to parent class, 
simplifying a great deal of code.
 2013-04-17 00:15:04 +02:00
automerge 6e25b89653 Merge branch 'bugfixes' 2013-03-04 08:00:27 +01:00
per 2faeb8ffb4 Make sure that template designs contain only designable components. This closes ticket:3971. 2013-03-03 22:57:16 +01:00
per 457f53514b Fix memory leaks in 'jsdebug' GUI code (hopefully all). Try to plug some more valgrind warnings. 2013-02-03 23:23:39 +01:00
per 13dbbf1b4d Merge remote-tracking branch 'origin/bugfixes' 
Conflicts:
	src/qtscriptfuncs.cpp
	src/scriptfuncs.cpp
 2013-01-21 22:21:02 +01:00
per 8149dc94c0 Fix bug that made droids produced by scripts get human player's upgrades. 2013-01-21 22:17:58 +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 93e1fd8e35 Merge branch 'bugfixes', remote-tracking branch 'origin' 
Conflicts:
	src/structure.cpp
 2012-11-26 18:07:59 +01:00
Per Inge Mathisen 2884e6d607 Do not crash on build cancelations. Hopefully closes ticket:3807 2012-11-24 17:36:45 +01:00
Per Inge Mathisen 41738d947c Merge branch 'bugfixes'. Kept master fix for stored template filenames. 
Conflicts:
	src/intdisplay.cpp
	src/multiint.cpp
	src/template.cpp
	tools/map/mapload.cpp
 2012-10-27 00:19:18 +02:00
Cyp d969dd7756 Use separate stored-template file for skirmish and campaign. 
Fixes ticket:3702.
 2012-10-04 12:19:56 +02:00
Per Inge Mathisen 511dda48c9 Add better error message for template production errors. 2012-08-04 18:12:44 +02:00
Per Inge Mathisen ed671bb6f4 Merge branch 'bugfixes' 
Conflicts:
	src/structure.cpp
 2012-07-07 22:21:52 +02:00
Cyp 7621581c8f Do not halt production on template becoming redundant. 
Production would halt until the redundant tank was manually removed from the build order.
 2012-06-29 09:44:21 +02:00
Cyp 001f33a83c Merge remote branch 'origin/bugfixes' 
Conflicts:
	src/combat.cpp
 2012-05-29 00:44:05 +02:00
Cyp f0eea79104 Fix Nexus AI unable to build units. 
Nexus was building units with an unresearched sensor (equivalent to the default sensor). Since
6365f2dbec, Nexus can no longer build unresearched units.

In the tutorial, the designed MG viper wheels would also use the same unresearched sensor.

Replaced unresearched DefaultSensor1Mk1 with ZNULLSENSOR. Removed special case for tutorial in
7079ad2951, which is no longer required.
 2012-05-21 16:05:10 +02:00
automerge e03bfe06ee Merge branch 'bugfixes' 2012-05-11 08:00:10 +02:00
vexed 7079ad2951 Fix tutorial that was broken in a6fa286dcf and e862a993cb 
Fixes ticket:3058
 2012-05-09 22:44:23 -04:00
automerge d2f0082ceb Merge branch 'bugfixes' 2012-04-26 08:00:09 +02:00
vexed 0de0c41629 Only populate unique entries for the UI template list. 
Fixes #3369
 2012-04-25 20:51:57 -04:00
automerge 0eeffa516b Merge branch 'bugfixes' 2012-04-24 06:00:10 +02:00
vexed 28c10b00a8 Do away with apsStaticTemplates completely, it caused multiple issues. There is no difference in accessing the templates for the AI or Humans now. Only write templates out for active players. Make each template's group unique to each player. Fix clone wars templates. Remove hacky functions GetHumanDroidTemplate & GetAIDroidTemplate fixes ticket:3146 close ticket:3369 
refs b99e845d97
refs 0cc7c315db
 2012-04-23 21:40:01 -04:00
cybersphinx d04b86ba24 Merge branch 'bugfixes' 2012-03-12 23:29:56 +01:00
Cyp 2985840f55 Return power on changing template in production. 
If changing a template which was currently in production, the production was cancelled
without returning the power.

Fixes ticket:3266.
 2012-03-10 16:06:43 +01:00
Per Inge Mathisen b57e1828c9 Fix problem with stored templates being invalidated by mods. Now stored templates 
are stored per mod. In this context, campaign and skirmish are each counted as
separate mods. To make additional mods, create your own ruleset.ini and add a unique
tag in it. Rename stored templates file to storedtemplates.ini.
 2012-03-04 22:51:38 +01:00
vexed 123e5a3a65 Merge branch 'bugfixes' 
Conflicts:
	src/droiddef.h
	src/qtscriptfuncs.cpp
 2012-02-27 21:46:51 -05:00
vexed fcede64e42 Create new droid type, DROID_SUPERTRANSPORTER. 
fixes ticket:3196
 2012-02-25 19:21:29 -05:00
cybersphinx d78970cc7a Merge branch 'bugfixes' 
* bugfixes:
  Only copy javascript doc if we build out of tree.
  Fix lassat firing too many times when clicking fast.
  Rename game debug messages to GAME_DEBUG_*.
  Synchronise enabling of debug mode.
  Remove legacy synch code.
  Update Vorbis to 1.3.3.
  In reference to 3e15039 bump the year in the mac files.
  Fix unit speeds.
  Fix ping times for clients. broken in 74261ad652
  Add a A_O_R to prevent crashing on null pointer
  Unfortunately, the Project can't stop time, so bump the year.
 2012-02-15 23:10:06 +01:00
vexed 3e15039aa6 Unfortunately, the Project can't stop time, so bump the year. 2012-02-11 16:50:52 -05:00
Per Inge Mathisen 4f030f4b6d Fix ticket:3133 - Unable to order cyborg engineer production via JS api. 
The problem was that a simplified droidType was passed in as a function
parameter to buildDroid(), and those droid types simplified out could not
be built. Solution chosen was to remove the droidType parameter - it is now
unused. Instead, the body stats can set the droid type, allowing us to know
which droid type we mean when we have specified a body component.
 2012-02-07 22:09:10 +01:00
Cyp 24d0d1b64c Always show droids in production, even if obsolete. 
This allows cancelling production of obsolete droids, without cancelling all production in the factory.
 2012-02-06 14:37:22 +01:00
Per Inge Mathisen 599dddf05b Allow scripts to control whether new designs are allowed. Default off. 2012-01-18 22:25:34 +01:00
Per Inge Mathisen 46cfc343fb qtscript: First baby steps for template handling code 2011-12-27 01:18:53 +01:00
Cyp 4edc0d77a6 Synchronise stored templates. 
Fixes ticket:3013.
 2011-12-25 17:29:29 +01:00
Per Inge Mathisen 7481b39a77 Make sure we do not duplicate stored templates when loading a savegame. 2011-12-19 13:01:45 +01:00
Per Inge Mathisen 95bdafdffb Fix cyborg and transport production - for these only check availability of their bodies, 
not anything else.
 2011-12-18 23:26:44 +01:00
Per Inge Mathisen 4e66209506 Fix long-standing bug where we did not reset our default components between games. 
Fix template store on removing store-ness. Do not store default values.
 2011-12-18 21:56:06 +01:00
Per Inge Mathisen add866851b Fix bug in stored templates that made commanders not be saved. Also save list 
to disk for every change, since Cyp prefers to close down the game by killing it.
 2011-12-18 20:12:57 +01:00