Commit Graph

10726 Commits (4f1b79d3d95a8624cd151b016126f20559468ad7)

Author SHA1 Message Date
cybersphinx 4f1b79d3d9 New icon for store/delete templates. 2011-12-19 00:52:12 +01:00
dak180 13885c0d07 Add template.(cpp|h) and rational.h to the xcode project. 2011-12-18 18:33:13 -05:00
Per Inge Mathisen 7b87b26716 Merge branch 'master' of github.com:Warzone2100/warzone2100 2011-12-18 23:58:16 +01:00
Per Inge Mathisen e3a981c4f8 Check number of weapons in a stored template to prevent stored template cheating. 2011-12-18 23:42:25 +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
Per Inge Mathisen 579e1502cb Add possibility to balance weapons against body types, not just propulsion types. 2011-12-18 19:06:34 +01:00
Cyp 281dfd0d24 Fix out-of-control effects when the graphics is running too fast or too slow. 2011-12-18 16:58:10 +01:00
Cyp ceb339939e Avoid doing extra game state updates if the game state updates are somehow slower than graphical updates. 2011-12-18 16:53:58 +01:00
Per Inge Mathisen f248a4c61d Fix crash when saving null research in wzscript. Closes ticket:2982 2011-12-18 16:00:45 +01:00
Cyp a5ad6ef0e9 Simplify game time logic. 2011-12-18 15:17:05 +01:00
Cyp 8d04e51f26 Add Rational class for rational numbers. 2011-12-18 15:16:32 +01:00
Per Inge Mathisen 5d3b2654fb Make life easier for translators by using ngettext for plurals of 'player'. Closes ticket:2988 2011-12-18 15:04:25 +01:00
Per Inge Mathisen 3e1a7a9c11 Do not distribute unused SVG files for now. Closes ticket:2986 2011-12-18 14:43:41 +01:00
Per Inge Mathisen d19681daab Update research headers. Closes ticket:2952 2011-12-18 14:17:19 +01:00
Per Inge Mathisen a6fa286dcf Implement stored templates. Button graphics is a placeholder for now. Loosely based
on original patch by EvilGuru. Closes ticket:1946.
2011-12-18 12:20:48 +01:00
Per Inge Mathisen cde2208ca5 Move template-related code to separate file. 2011-12-18 00:23:51 +01:00
cybersphinx e879fbd712 Retranslate all menu options when changing the language.
Closes #2989.
2011-12-17 23:35:01 +01:00
cybersphinx 7638364f41 Return to the challenge menu from the challenge setup. 2011-12-17 23:33:27 +01:00
cybersphinx c38ce8f039 Reload backdrop when cancelling the challenge setup.
Closes #2987.
2011-12-17 23:18:55 +01:00
cybersphinx 7d2d70d893 Update translations. 2011-12-17 23:18:55 +01:00
cybersphinx 93493f9b1d Always create both lib/qtgame and lib/sdl makefiles.
Fixes make distcheck.
2011-12-17 23:18:55 +01:00
Cyp acd0587f82 Fix 99.9% broken target prediction for direct fire.
Projectile flight time was calculated in seconds, instead of milliseconds.

Also, assume ground unit altitudes will follow the terrain.

Lancers can now hit moving targets, again.
2011-12-17 22:52:02 +01:00
Cyp 32a687fde8 Squelch compiler warning with dummy initialisation. 2011-12-17 18:21:52 +01:00
Cyp fb7245c7d2 Round displayed power up slightly.
Avoids a corner case where the power is a nice round number like 1300, but displayed as 1299.
2011-12-17 18:21:52 +01:00
Cyp e9bdbdf331 Don't push flying VTOLs out of the way when building something.
Introduced in 9534b4c0bd.
2011-12-17 18:21:52 +01:00
Cyp d6e55a2c47 Don't scale velocities by GAME_UPDATES_PER_SEC.
Movement should be slightly more precise.
2011-12-17 18:21:52 +01:00
Cyp 14234a6a07 Accelerate/decelerate at intended rate, instead of 256 times faster.
Acceleration/deceleration is no longer instant.
2011-12-17 18:21:52 +01:00
Cyp 7e3c8e4f4e Remove DROID::sMove.ebit[XY], use gameTimeAdjustedAverage instead. 2011-12-17 18:21:52 +01:00
cybersphinx 17e4e8febe Update ChangeLog. 2011-12-17 18:17:35 +01:00
cybersphinx f8509ee7de Update POTFILES.in. 2011-12-17 18:17:35 +01:00
dak180 ce4547e9b6 Redo the merge for the xcode project file. 2011-12-17 10:54:01 -05:00
Per Inge Mathisen d31836ccac Fix one bad include for qt-sdl merge 2011-12-17 16:06:21 +01:00
Per Inge Mathisen a8d8d4b50e Merge branch 'qt-sdl', remote-tracking branch 'origin' 2011-12-17 16:04:13 +01:00
Per Inge Mathisen b9a23ef98f Merge branch 'master', remote-tracking branch 'origin' into qt-sdl 2011-12-17 16:03:14 +01:00
Per Inge Mathisen 700bb7a56e Merge branch 'master' into qt-sdl
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
2011-12-17 16:02:26 +01:00
Per Inge Mathisen e7aa1a7e97 Moves implementation of base settings into rules.js script. Handling of 'some base' option
is not the same as current, but since few play with that anyway, we can take some time to
think about what to do about that. Network sync is handled with an ugly hack for now.
2011-12-17 14:29:19 +01:00
Per Inge Mathisen 9f47504584 Fix misleading tooltips 2011-12-17 14:03:52 +01:00
Per Inge Mathisen a75f645a10 qtscript: Add removeStruct() function. Fix building enums. Add static player information. 2011-12-17 00:33:48 +01:00
Per Inge Mathisen 7b66301950 Remove the rule that you get the cost of a power generator back when it is destroyed. This was exploitable, and made no sense. 2011-12-17 00:33:48 +01:00
Per Inge Mathisen c52b5488cc Clean up comments related to wreckage, which is no longer used. Style cleanup to. 2011-12-17 00:33:48 +01:00
Cyp 1646499fcb Allow transporters to unload near cliffs.
This way, unloading a transporter is less likely to result in the droids getting unloaded some random place 20 tiles away.
2011-12-16 23:06:47 +01:00
Cyp 66e4291b1b Remove useless power check in debug menu. 2011-12-16 21:51:03 +01:00
Cyp 8bd21a6ed9 Always use a valid non-crashy flag when placing droids in debug mode. 2011-12-16 21:51:03 +01:00
Cyp 9534b4c0bd Allow building on droids, but move the droids out of the way before building it. 2011-12-16 21:51:02 +01:00
dak180 6c8e465bc5 Move the map tools builds out of the main xcode project. 2011-12-16 15:35:02 -05:00
dak180 1e03b2760f Exclude .svg files from the final build since they are currently unused.
Also fix up some build rules.

Refs #2986.
2011-12-16 15:32:08 -05:00
dak180 542a0f52fe Add cursors_sdl.(cpp|h) and wz2100icon.h files to the xcode build. 2011-12-15 19:14:41 -05:00
Per Inge Mathisen 100d30a26a Partial revert of 5e6480371f - now we again check
for units on tiles we want to build structures. This prevents the AI from making
poor building placement choices that really confuses it, among other things.
2011-12-15 23:15:51 +01:00