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
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
675ddce69e
Rename the generic wzapp_c.h to wzapp.h.
...
The _c was a leftover from the good old days, when this was written in C and everyone used RFC 1149.
2011-12-12 00:07:02 +01:00
692b7f4207
Move some Qt-related stuff from lib/framework/wzapp.cpp and src/main.cpp to lib/qtgame/.
...
And restored scrap.cpp into lib/sdl/.
2011-12-11 22:54:18 +01:00
1206639cf8
Add wzconfig.(cpp|h) to the mac build.
2011-12-11 10:26:42 -05:00
69f6dc222c
Split out WzConfig class from the rest of the Qt-backend-specific code.
2011-12-11 15:51:31 +01:00
063fc63629
Initial build system for qt/sdl-backend switcher
2011-12-11 15:30:54 +01:00
db2feed5f6
Fix problem with saving due to QSettings not believing that files were writable
...
unless they were created beforehand. This is an ugly hack.
2011-12-11 01:11:48 +01:00
075e18828c
German translation update by Raymond and Kreuvf.
...
Closes #2967 .
2011-12-10 21:48:21 +01:00
6993b16c2c
Shutdown dangerThreadFunc() on closing program.
...
Valgrind appeared to be warning about a bad free() in _vgnU_freeres(), but the warning appears anyway with a different stack trace, possibly a valgrind bug.
2011-12-09 16:14:09 +01:00
23475069a9
Use repair delivery point when plonking down droids in debug mode, and squelch valgrind uninitialised warning.
...
Flipping !psPosition->selected && !blueprint to !blueprint && !psPosition->selected helps since blueprint ← true and psPosition->selected ← uninitialised.
==28422== Conditional jump or move depends on uninitialised value(s)
==28422== at 0x494CCC: renderDeliveryPoint(FLAG_POSITION*, bool) (display3d.cpp:2489)
==28422== by 0x496F0D: _ZL9drawTilesP5iView.clone.53 (display3d.cpp:1622)
==28422== by 0x496FAC: draw3DScene() (display3d.cpp:851)
==28422== by 0x49BD30: displayWorld() (display.cpp:1358)
==28422== by 0x50DEE6: gameLoop() (loop.cpp:614)
==28422== by 0x50FBDC: mainLoop() (main.cpp:907)
==28422== by 0x62EEDA: WzMainWindow::paintGL() (wzapp.cpp:264)
==28422== by 0x6D5A0EF: QGLWidget::glDraw() (qgl.cpp:4483)
==28422== by 0x6D58E38: QGLWidget::paintEvent(QPaintEvent*) (qgl.cpp:4281)
==28422== by 0x723D40C: QWidget::event(QEvent*) (qwidget.cpp:8405)
==28422== by 0x6D62580: QGLWidget::event(QEvent*) (qgl.cpp:4264)
==28422== by 0x71E78DB: QApplicationPrivate::notify_helper(QObject*, QEvent*) (qapplication.cpp:4462)
==28422== Uninitialised value was created by a stack allocation
==28422== at 0x4960DF: _ZL9drawTilesP5iView.clone.53 (display3d.cpp:918)
2011-12-09 14:43:18 +01:00
83af945516
Fix assertion spam on ordering a group containing some non-trucks to build something.
...
info |12:05:14: [orderDroidBase] Mini-Rocket Array Viper Hover cannot construct things!
info |12:05:14: [orderDroidBase] Assert in Warzone: ../../src/order.cpp:1563 (isConstructionDroid(psDroid)), last script event: 'N/A'
2011-12-09 13:49:11 +01:00
b62e7d3358
Use correct colour for scavengers in map preview.
2011-12-09 13:32:50 +01:00
d1e2f1a2cb
Fix crash on opening empty production menu after loading savegame containing commander templates.
...
Introduced in 9474ae3715
2011-12-08 20:40:14 +01:00
4bf70ca7c5
Fix remaining progress bar after research.
...
Was a missing popStatusPending().
Fixes ticket:2966.
2011-12-08 13:13:26 +01:00
0aeda2baa2
Use version_getVersionString() for net version.
...
Since any change that affects game state breaks synchronisation, and most changes
break synch, and it's not convenient for most commits to bump the version in
netplay.cpp, it's probably a good idea to announce the exact version when hosting.
2011-12-08 12:36:24 +01:00
5461ef45bd
Reorder GAME_* messages.
...
The GAME_* messages should now be better sorted by whether or not they are useful.
2011-12-08 12:04:37 +01:00
07c5c958bd
Remove dead function. getDerrick() is now unnecessary that we have all this info
...
available from global.
2011-12-07 22:22:02 +01:00
5e7bb703e2
Remove two excess log calls
2011-12-07 21:24:06 +01:00
247b8b2b49
qtscript: Functions for enumerating features and ordering droids to do things to objects.
...
Add access to structure types.
2011-12-07 00:28:03 +01:00
034c1d7c4b
Add beginnings of a port of semperfi to javascript
2011-12-06 20:51:38 +01:00
58d5bd4161
Add new qtscript functions for AI implementatation. The pick build position
...
function was ported pretty much as is from wzscript implementation, hence
its ugliness.
2011-12-06 20:51:38 +01:00
ae130a7a3f
Readd audio confirmation for trucks.
...
Got lost in ab3a8adf38Closes #2948 .
2011-12-06 17:45:04 +01:00
93a6d7ba74
Fix loading of droids in transporters.
...
Hopefully fixes ticket:2889 and ticket:2959, but does not handle the corrupted savegame in ticket:2959, which has duplicate droids in droid.ini and mdroid.ini.
2011-12-06 17:37:10 +01:00
2d4e1e1314
Fix missing visibility on game start.
...
Introduced in a74281b3b5
2011-12-06 17:37:10 +01:00
820e38bab1
Use large font for the loadsave dialog header.
...
Closes #2929 .
2011-12-06 16:39:35 +01:00
9ea22074d1
Turkish translation update by Ayhan Görgülü.
...
Closes #2963 .
2011-12-06 15:55:07 +01:00
5c2cf9fa06
Make UI respond instantly when holding/cancelling production/research.
2011-12-05 14:22:18 +01:00
a35ff1e8fe
Fix crash due to transporter trying to unload itself from itself when clicking fast.
...
Unloading single droids from transporters should now be more responsive, too.
2011-12-05 11:23:47 +01:00
0811be2b7d
Update ChangeLog.
2011-12-04 23:26:35 +01:00
0d75a3b629
Properly show delivery point numbers again.
...
Original patch by Safety0ff, closes #2497 .
2011-12-04 23:23:28 +01:00
a74281b3b5
Wait for pathfinding to finish, when loading droids, and improve bad droid position handling.
2011-12-04 23:03:03 +01:00
a58591d74c
Add debugBacktrace() for easier debugging.
2011-12-04 23:03:03 +01:00
e5d7318b0c
Speed boosts (for the mac build times).
...
Also PBXBuildRules simplification.
2011-12-04 14:23:43 -05:00
48eda8df50
Preview maps when hovering over them.
2011-12-04 11:09:48 +01:00
5718af7bd7
Show preview of the right map, in single-player skirmish.
2011-12-04 09:38:34 +01:00
695fe5fbd2
Update translations.
2011-12-03 19:47:58 +01:00
f2ff7ead52
Fix desynch on deleting templates.
...
Introduced in 9474ae3715
2011-12-03 19:20:29 +01:00
a0f13ff73e
Fix error using uninitialized variable if error was detected, when trying to report said error. Error in error reporting reported by Cyp.
2011-12-03 19:13:39 +01:00
482600d10a
Add some more logging to debug problems with building placements in scripts
2011-12-03 18:47:37 +01:00
5885b05129
Add comment to explain why structures are sometimes drawn as blips
2011-12-03 18:35:39 +01:00
Cyp
dak180
Per Inge Mathisen
Per Inge Mathisen
cybersphinx