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

11618 Commits (091e7bb02885f69d7c0ee70d042edeb26cf5ac72)

Author SHA1 Message Date
Per Inge Mathisen 087ab8c505 Fix missing decals in Rocky Mountains tileset that were specially made for it 
but never mentioned in the rockiedecals.txt file. It also fixes the ground
types of certain urban and rocky tiles to resemble the old 2.3 terrain more
exactly. Patch by NoQ. Closes ticket:3621
 2012-08-08 13:16:55 +02:00
Cyp 552a60b099 Add files missing from 1e5fafabb3. 
Fixes ticket:3646.
 2012-08-06 19:19:52 +02:00
Cyp 2ca39e5fc7 Add header for std::sort. 2012-08-06 08:58:50 +02:00
Cyp 1e5fafabb3 Warn when uplink and/or lassat is disabled. 2012-08-05 23:03:24 +02:00
Cyp 26bb105885 Split frontend*.png and intfac*.png into individual images. 
The images are now combined into texture pages at runtime.

This should simplify adding/removing images.
 2012-08-05 22:33:34 +02:00
Cyp f879b83605 Correctly handle interface image texture pages which are not 256x256. 
Game logo now appears full size.
 2012-08-05 22:33:02 +02:00
Cyp 74c153cf7b Assert on collision of hashes of resource types or filenames. 
This should be a minor improvement over silently retreiving the wrong resource on filename hash collisions.
 2012-08-03 00:17:22 +02:00
Per Inge Mathisen 398f77ede0 No longer save default map, max players and map hash. Patch originally by vexed. Closes ticket:3618 2012-08-02 21:18:07 +02:00
Per Inge Mathisen 2c2822664f Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100 into bugfixes 2012-08-01 10:07:44 +02:00
Per Inge Mathisen 44947ad4a8 Remove unused lines of code from display.cpp 2012-08-01 10:06:52 +02:00
dak180 93f54a4531 Make improvements to the case where there is no codesign id. 2012-07-31 14:33:55 -04:00
dak180 c4edfed60d Use codesigning for the mac builds. 
Requires the presence of 'macosx/configs/CS-ID.xcconfig' containing a valid codesign id listed in a CODE_SIGN_IDENTITY property.
 2012-07-30 21:43:49 -04:00
Per Inge Mathisen bf0d92dab4 Update the changelog 2012-07-30 23:07:11 +02:00
Per Inge Mathisen feb7476af6 Update nullbot to latest version. Rename nullbot include files to avoid spurious qslint errors. 2012-07-30 23:04:51 +02:00
Per Inge Mathisen fdb1c0b521 Do not use std::string in a memory structure that is memset(). 
Patch by tnmurphy, closes ticket:3620
 2012-07-30 22:21:30 +02:00
Cyp df32833ab8 qt: Use QImage instead of QImageReader to load mouse cursor images. 
Some combination of QImageReader, QImage, QPixmap, QCursor and the wzfs wz:: virtual file system apparently doesn't
work in Qt 4.8.2 (but works in Qt 4.8.1).

The following error was printed (multiple times) to the shell:
QCursor: Cannot create bitmap cursor; invalid bitmap(s)

Fixes ticket:3562.
 2012-07-30 20:21:40 +02:00
Per Inge Mathisen 06f10ca89f Run astyle over transport code to make it readable. 2012-07-28 14:14:25 +02:00
Per Inge Mathisen b307efb4dd Run astyle over mission code to make it readable. 2012-07-28 14:08:01 +02:00
Per Inge Mathisen 9d82dea37a Remove dead code 2012-07-28 14:02:05 +02:00
Cyp ee95d785bd Don't rename AI players. 
With multiple AI's, Nexus, Nexus, Nexus would be renamed to Nexus, Nexus_2, Nexus_3, or similar.
 2012-07-22 11:36:25 +02:00
Per Inge Mathisen 95677b02b9 Fix reading of scavenger parameter in challenge files. Reported by KukY, closes ticket:3630 2012-07-21 19:45:23 +02:00
dak180 62c8c727dc Update glew to 1.8.0. 2012-07-20 13:03:50 -04:00
vexed 0bfee185a3 Fix reported [-Werror=format] issue. 2012-07-15 22:29:51 -04:00
vexed 646f6d7b82 NullBot by NoQ 2012-07-15 17:02:48 -04:00
vexed 329572779a Add last part of net patch (needs updated server code). 2012-07-15 17:02:47 -04:00
dak180 d2a8a134a6 Update png to 1.5.12. 2012-07-11 20:10:44 -04:00
Linus Lüssing 64173cbd08 Fix reverse balanced tree lookup 
"Rechts ist da, wo der Daumen links ist."

Fixes ticket:3589.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
 2012-07-09 07:26:31 +02:00
cybersphinx 0800da0d25 Update custom translations. 2012-07-05 22:20:38 +02:00
cybersphinx da43686ad3 Turkish translation update by Ayhan Görgülü. 
Closes #3591.
 2012-07-05 22:16:50 +02:00
cybersphinx 3b261c24d2 Catalan translation update by mecatxis. 
Closes #3582.
 2012-07-05 22:14:14 +02:00
cybersphinx 875be5fda1 French translation update by Amiral JCDG. 
Closes #3577.
 2012-07-05 22:12:06 +02:00
cybersphinx 44c810bc73 German translation update by Kreuvf. 
Closes #3564.
 2012-07-05 22:08:00 +02:00
cybersphinx 0cec33c0fc Polish translation update by Emdek. 
Closes #1347.
 2012-07-05 21:59:39 +02:00
Cyp ab44eafb7b Bump MAX_TERRAIN_TILES from 100 to 512. 2012-07-05 21:44:55 +02:00
safety0ff caabd96741 Fix moving repair delivery points. 
Closes #3581.
 2012-06-29 21:07:52 -04:00
Cyp 6a04b6ad67 Reset research pending state even if research facility is destroyed. 
Destroyed research facilities can no longer permanently hog a research.

Steps to reproduce: Enable debug mode, slow down game speed to 0, destroy facility with Alt+K, start research, speed
  up game to normal speed. Research remained missing even after the facility exploded.

Fixes ticket:3570.
 2012-06-29 10:03:00 +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 134c51c890 Add a bit of overly-paranoid checking, to detect hard drive failures, or similar. 2012-06-29 09:01:42 +02:00
safety0ff ef2b23681b Always initialize shader usage setting. 2012-06-27 09:33:58 -04:00
safety0ff 7e3be754d4 Add settings / UI support for shaders without tex_env_crossbar (added in 64a3cc1). 2012-06-26 22:03:22 -04:00
safety0ff 64a3cc13de Don't require texture_env_crossbar for shaders. 
Refs. #3575.
 2012-06-26 10:12:15 -04:00
vexed 845903e5b6 And even more log spam to help track down current issues. 2012-06-25 22:32:40 -04:00
vexed 3640b024f2 Let's not hide error messages, and add more debugging to track down a few 
issues
 2012-06-25 22:31:25 -04:00
safety0ff 3c5e8792be Revert "Fix blueprint alignment and snap modules." 
This reverts commit 581d65411e.
 2012-06-23 15:29:12 -04:00
Cyp 032956e649 Fix minor memory leak on loading/unloading transporters. 
DROID::sMove.asPath is set to NULL on unloading droids, but was never freed.

Also, clear any remaining pathfinding job for the droid on loading transporter.
 2012-06-23 17:04:18 +02:00
Cyp 88e9439166 Fix uninitialised variable usage on removing repair facilities. 
See previous commit.
 2012-06-23 17:04:18 +02:00
Per Inge Mathisen 67b2a6210a qtscript: Add new function that returns unit limit(s). 2012-06-23 13:06:58 +02:00
safety0ff 6c6180495c Fix compilation on non-x86 platforms. 
Refs. #3558.
 2012-06-21 18:45:05 -04:00
safety0ff 6382bbb08e Fix dangling pointer when structures are destroyed and you are repositioning the delivery point. 
Untangles delivery points code from building placement code.
You can no longer "quick queue" units from the debug menu.

Fixes #2041.
 2012-06-21 18:44:27 -04:00
safety0ff 581d65411e Fix blueprint alignment and snap modules. 
Closes #3466.
 2012-06-21 18:22:55 -04:00