93493f9b1d
Always create both lib/qtgame and lib/sdl makefiles.
...
Fixes make distcheck.
2011-12-17 23:18:55 +01:00
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
32a687fde8
Squelch compiler warning with dummy initialisation.
2011-12-17 18:21:52 +01:00
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
e9bdbdf331
Don't push flying VTOLs out of the way when building something.
...
Introduced in 9534b4c0bd
2011-12-17 18:21:52 +01:00
d6e55a2c47
Don't scale velocities by GAME_UPDATES_PER_SEC.
...
Movement should be slightly more precise.
2011-12-17 18:21:52 +01:00
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
7e3c8e4f4e
Remove DROID::sMove.ebit[XY], use gameTimeAdjustedAverage instead.
2011-12-17 18:21:52 +01:00
17e4e8febe
Update ChangeLog.
2011-12-17 18:17:35 +01:00
f8509ee7de
Update POTFILES.in.
2011-12-17 18:17:35 +01:00
ce4547e9b6
Redo the merge for the xcode project file.
2011-12-17 10:54:01 -05:00
d31836ccac
Fix one bad include for qt-sdl merge
2011-12-17 16:06:21 +01:00
a8d8d4b50e
Merge branch 'qt-sdl', remote-tracking branch 'origin'
2011-12-17 16:04:13 +01:00
b9a23ef98f
Merge branch 'master', remote-tracking branch 'origin' into qt-sdl
2011-12-17 16:03:14 +01:00
700bb7a56e
Merge branch 'master' into qt-sdl
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
2011-12-17 16:02:26 +01:00
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
9f47504584
Fix misleading tooltips
2011-12-17 14:03:52 +01:00
a75f645a10
qtscript: Add removeStruct() function. Fix building enums. Add static player information.
2011-12-17 00:33:48 +01:00
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
c52b5488cc
Clean up comments related to wreckage, which is no longer used. Style cleanup to.
2011-12-17 00:33:48 +01:00
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
66e4291b1b
Remove useless power check in debug menu.
2011-12-16 21:51:03 +01:00
8bd21a6ed9
Always use a valid non-crashy flag when placing droids in debug mode.
2011-12-16 21:51:03 +01:00
9534b4c0bd
Allow building on droids, but move the droids out of the way before building it.
2011-12-16 21:51:02 +01:00
6c8e465bc5
Move the map tools builds out of the main xcode project.
2011-12-16 15:35:02 -05:00
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
542a0f52fe
Add cursors_sdl.(cpp|h) and wz2100icon.h files to the xcode build.
2011-12-15 19:14:41 -05:00
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
6c6259c0d6
qt-sdl: Implement wzQuit(), don't crash on exit via menu.
2011-12-15 21:37:16 +01:00
b7b5da782f
Update Png to 1.5.7.
2011-12-15 13:54:59 -05:00
8c7c110c24
qt-sdl: Fix input, mouse cursor, skirmish.
...
Now runs, and is at least a bit usable.
2011-12-15 19:30:26 +01:00
8e1c6578a1
Simplify SDL includes (especially for the mac build).
2011-12-15 13:17:43 -05:00
7cfc7b7fc7
Get rid of input.cpp in the xcode project.
2011-12-15 09:24:48 -05:00
ed4fffd9d3
Move stuff around so that more stuff works. The game now actually runs. Sort of.
2011-12-15 00:11:16 +01:00
40aa61f276
Re-add SDL stuff from frameInitialise and screenInitialise.
...
It now compiles, links and even starts under SDL, even if it doesn't run for more than ¼ of a second.
2011-12-14 00:35:17 +01:00
7965939cc7
More updates to bring the xcode project inline with previous changes.
...
Also some #if and #include clarity.
2011-12-13 18:24:40 -05:00
0ee5bb3547
sdl backend now compiles and links, but doesn't yet run (missing mainloop)
2011-12-13 18:44:21 +01:00
8f047f71fd
Fix qt-backend compilation. Add forgotten file.
2011-12-13 18:21:57 +01:00
cc662f9ac9
Most SDL functions reimplemented.
2011-12-13 17:26:01 +01:00
fa5e6c73d3
sdl backend now actually compiles (but does not yet link).
2011-12-13 15:39:42 +01:00
432b9a6589
Make research variables in wzscript state saving more robust. Closes ticket:2979
2011-12-13 14:32:50 +01:00
d35b8b4111
cppcheck warning fixes, including a real fix for bad iterator code.
2011-12-12 23:37:31 +01:00
529e28530d
Add extra debug info to trace savegame corruption bug.
2011-12-12 22:17:42 +01:00
94f88b677a
Silence valgrind warnings. Fix wrong parameter numbering for ununsed enumFeatures().
2011-12-12 22:04:12 +01:00
1e2c71cccd
Do not pathfind through completed satellite uplinks.
2011-12-12 20:43:48 +01:00
0119eda53f
Ignore buildings on source or destination when pathfinding.
...
Droids should now go to the nearest point instead of a point which might not even be accessible, when trying to build modules or derricks.
Fixes ticket:2978.
2011-12-12 20:17:49 +01:00
322bbc6163
Remove REPAIR_FACILITY::{timeStarted, currentPtsAdded}.
2011-12-12 17:01:31 +01:00
f6d963963c
Adjust the xcode build to moves and additional files.
...
Some additional changes to set up support SDL for mac builds.
2011-12-12 09:40:49 -05:00
4b355aa060
Remove RESEARCH_FACILITY::timeStarted, don't finish research when cancelling it.
...
Fixes ticket:2977.
2011-12-12 12:04:15 +01:00
295be0e273
Fix desynch when melting scavengers.
...
Droid animations should not affect game state...
Even if you're melting scavengers with lasers or bombs.
2011-12-12 11:07:08 +01:00
cybersphinx
Cyp
dak180
Per Inge Mathisen