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

10704 Commits (93493f9b1d3b8faf861b255aead69072bbe70f0e)

Author SHA1 Message Date
Per Inge Mathisen 8173191863 Merge pull request #19 from nanotech/topic/mac-screen-res 
Settable screen resolution on Mac OS X.
 2011-09-25 10:28:53 -07:00
NanoTech 4d589a95b3 Settable screen resolution on Mac OS X. 
Also, only show resolutions available for
the main window's screen.
 2011-09-23 22:38:01 -06:00
dak180 cb857bba9c Merge remote-tracking branch 'nanotech/window-title' 
Closes #2897.

* nanotech/window-title:
  Set a window title.
 2011-09-22 18:24:39 -04:00
dak180 06872ce2c9 Update Png to 1.5.5. 2011-09-22 12:08:07 -04:00
dak180 790a205f5b Add the backup url to the prebuilt script. 2011-09-22 11:35:27 -04:00
NanoTech 28b31b22d6 Set a window title. 2011-09-22 00:32:36 -06:00
cybersphinx 8bd313920d Update .gitignore. 2011-09-21 21:22:30 +02:00
cybersphinx 54a91f3575 Update ChangeLog. 2011-09-20 23:19:37 +02:00
dak180 af83dc1098 Merge branch 'dak180/topic/TypeConfig' 
Mac builds no longer require X11 to be installed to run.

* topic/TypeConfig:
  Try to ensure linking to the correct versions of FontConfig and Freetype.
  Use AT&T's binaries of fontconfig and freetype for QuesoGLC.
 2011-09-18 14:59:26 -04:00
Per Inge Mathisen defe8dc7ac Make sure we can't divide by zero in base speed calculation. Reported indirectly by ticket:2892 2011-09-18 16:07:30 -04:00
dak180 381250690b Try to ensure linking to the correct versions of FontConfig and Freetype. 
The linker on the mac prefers dynamic libs over static, so if any are in the path it will use them instead.
 2011-09-18 14:49:48 -04:00
vexed 4e9df51d09 Fix a slight issue in log filename, since tm_mon is a cardinal not a ordinal. 2011-09-17 22:38:55 -04:00
cybersphinx ba1e1b5eb7 Small update of the Doxygen files. 
Run "doxygen -u" to update the config file, and fix some links.
 2011-09-16 22:24:51 +02:00
cybersphinx 118a58b070 Include wzapp.h.qwth/qtgame.h.qwth from the right Makefile.ams. 2011-09-15 23:54:15 +02:00
cybersphinx 7b13a1e0fa Remove stray backslash. 2011-09-15 23:19:38 +02:00
dak180 294d62bd13 Merge pull request #16 from nanotech/mac-screen-res 
Screen resolution detection on Mac.

Closes #2886.
 2011-09-15 14:06:07 -07:00
nanotech 44c1f1023b Merge pull request #1 from dak180/topic/mac-screen-res 
Small fixes for Mac builds from tarballs and elimination of warnings.
 2011-09-15 12:37:45 -07:00
dak180 30a429ce0d Make sure that Mac builds work from the tarball. 2011-09-15 12:29:26 -04:00
dak180 9b4b81c797 Knock out 20 warnings cased by system frameworks in the mac build. 2011-09-15 12:27:43 -04:00
NanoTech b30d3ae526 cocoa_wrapper, macosx_screen_resolutions: Move to EXTRA_DIST 2011-09-14 21:38:44 -06:00
NanoTech 03681c62a4 Fix typo in lib/qtgame/Makefile.am. 2011-09-14 19:05:50 -06:00
NanoTech a9925074c7 Move cocoaAppendAvailableScreenResolutions to lib/qtgame. 2011-09-14 17:09:48 -06:00
NanoTech 6feee75494 Fix compilation of OS X screen resolution code with the 10.5 SDK. 2011-09-14 16:43:29 -06:00
Cyp 850e0e5e00 Save/load factory subjects correctly. 
Otherwise factories don't actually build anything after loading a game.
 2011-09-14 18:41:16 +02:00
Per Inge Mathisen 006263776f Merge pull request #15 from littlepig/master 
Fixed a crash on the game due to trying to change resolution on Mac
 2011-09-14 02:34:52 -07:00
Jorge Cardoso Leitão d2076a7c6e Fixed small error on a debug() function. 2011-09-14 10:25:13 +01:00
Jorge Cardoso Leitão 33b8197acb Changed from qWarning to debug. 2011-09-14 09:59:06 +01:00
Jorge Cardoso Leitão bec7182975 Small fix on the indentations. 2011-09-14 09:22:10 +01:00
NanoTech 5efce67461 Add cocoa_wrapper.* to lib/framework/Makefile.am 2011-09-13 15:35:42 -06:00
Cyp d74a73a34d Completely clear order queues, including orders queued to be placed in an order queue. 
Should be a sendQueuedDroidInfo() to flush the order-queue queue.

This fixes droids moving or even attacking own structures after loading a game, due to left-over orders.
 2011-09-12 16:30:25 +02:00
NanoTech 5eadd17340 Detect available screen resolutions on Mac OS X. 2011-09-12 01:09:40 -06:00
Cyp 99ca8043a5 Fix useless warning. 
Stopped build with -Werror.
 2011-09-12 09:07:25 +02:00
dak180 d890e63f46 Use AT&T's binaries of fontconfig and freetype for QuesoGLC. 
This eliminates the dependency on X11 for the mac builds.
 2011-09-12 01:42:15 -04:00
Jorge Cardoso Leitão d8eaaabeb3 Added this exception to avoid game crash. 2011-09-11 19:00:50 +01:00
Cyp 1c8d7e4e04 Partial danish translation. 2011-09-11 13:32:58 +02:00
Per Inge Mathisen db9eb14b9b Clean up calcDroidIllumination() - fix crash if called on an empty map. Fix possible unsigned underflow. 2011-09-11 11:49:41 -04:00
vexed 818e9b4236 Fix Vtols so they calculate pathing routes instead of assuming otherwise. 
refs ticket:2534
 2011-09-10 20:33:59 -04:00
cybersphinx 939a751cf1 Always show map preview in the game setup screen. 2011-09-09 15:41:25 +02:00
vexed 4de9642cd9 Bring back a missed function in the conversion to ini. 
refs: 09eb6e79f3
 2011-09-08 20:05:55 -04:00
vexed 0d6a27380d When reading in map values from a map, don't do any conversions on said map for the 
player's starting position.  They should __not__ be remaped.

fixes ticket:2859
refs: 09eb6e79f3
 2011-09-08 20:05:24 -04:00
vexed a7e177cad3 When installing Warzone for windows, we will now show the version of the game 
in the start menu, and also shown in the 'Uninstall programs' list in the
control panel, and the desktop shortcut as well.

This fixes ticket:2856
 2011-09-07 23:55:44 -04:00
cybersphinx 31da7b5d4d Turkish translation update by Ayhan Görgülü. 
Closes #2884.
 2011-09-07 21:15:06 +02:00
cybersphinx bb16ff9ee3 Update translations. 2011-09-07 21:15:06 +02:00
cybersphinx 715a47e8a3 Put all .gmo and asciidoc-generated files into srcdir. 
This way they will always be in the same location, regardless of
building from tarball or source, and in or out of the srcdir.

.gmo fix adapted from patch by cazfi.

Closes #1473.
 2011-09-07 21:15:05 +02:00
cybersphinx 9a72ebd45f Really don't include moc'ed files in the tarballs. 
Really fixes #2846.
 2011-09-07 21:15:05 +02:00
Per Inge Mathisen f3fcb9c100 There is no such thing as page-31-features-rockies.png, reported in ticket:2881 2011-09-06 21:53:45 -04:00
Per Inge Mathisen d2009baa89 "make distcheck" errors about some files required for complete build missing 
from tarball. Patch by cazfi, closes ticket:2882
 2011-09-06 21:16:52 -04:00
Per Inge Mathisen 3ebb55a23d autogen.sh always instructs user to run configure in current directory - even 
when autogen.sh has been run from separate builddir. Patch by cazfi, closes ticket:2883
 2011-09-06 21:15:18 -04:00
cybersphinx 8ec7e2cab4 Add note about a2x being from asciidoc. 2011-09-05 22:05:23 +02:00
vexed bc9577bfc9 Platform specific headers should be checked after we import the defines. 2011-09-04 18:44:48 -04:00