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

12728 Commits (master)

Author SHA1 Message Date
vexed 1c5e5739e0 Merge branch 'bugfixes' 2013-10-28 00:00:26 -04:00
vexed dc7c28bdfb Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-10-27 23:42:37 -04:00
dak180 992113d98c
Fix the mac build for 8f4adda2. 
Refs. ticket:4095.
 2013-10-27 23:19:24 -04:00
vexed 9a1e472e42 Only display the UPnP messages for MP games, not for skirmish. 2013-10-27 22:52:44 -04:00
vexed 2f217ab602 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-10-27 21:15:49 -04:00
vexed f6dea54529 Update ChangeLog 2013-10-27 21:03:36 -04:00
vexed 8f4adda206 Upgrade miniupnp to miniupnpc-1.8.20131007 *NOTE* mimiupnp source has been modified so we can compile it without errors! 
Fix UPnP so it actually works on windows & linux & most likely mac.
Add more information about UPnP progress in console.

closes ticket:4095
 2013-10-27 20:57:38 -04:00
vexed e482b58e7f fix flickering of trees (and some other objections) see 5ef1eff3ea for initial changes. 2013-10-27 19:20:02 -04:00
vexed 853179f2de Fix compile issue broken in 5f32c3eafe 2013-10-27 19:20:01 -04:00
vexed 77f37c0a0f Merge branch 'bugfixes' 
Conflicts:
	src/scriptfuncs.cpp
 2013-10-27 19:09:42 -04:00
per 2a3a480b43 Move build fix in ChangeLog to correct location 2013-10-27 09:12:01 +01:00
Per Inge Mathisen 8480d6d92b Merge pull request #45 from Cjkjvfnby/cleanup-names 
remove names present in ini files from names.txt
 2013-10-27 01:06:05 -07:00
Cjkjvfnby c6ff86135f remove names present in ini files from names.txt 2013-10-27 03:19:08 +04:00
Cjkjvfnby 09277597b5 Revert "remove names present in ini files from names.txt" 
This reverts commit 21482dc96a.
 2013-10-27 03:12:33 +04:00
Cjkjvfnby 21482dc96a remove names present in ini files from names.txt 2013-10-27 02:55:23 +04:00
per 53bf0afaf4 Update Changelog 
(cherry picked from commit 8d015ad27b5317877b8b9ee8f69c1a291c9278e8)
 2013-10-25 20:32:31 +02:00
per 99e6ab52dd Update changelog 
(cherry picked from commit 6b0ceca623f710dc5444d35cb1e1fa7965ee684a)
 2013-10-25 20:32:31 +02:00
haonoq b8bdf44737 Add new maps: Gamma (3p) and Melting (6p) 2013-10-24 22:57:45 +04:00
per cea585162d Fixes for various bugs noticed by Coverity static analysis tool. 2013-10-21 22:04:27 +02:00
automerge 0428d5d14a Merge branch 'bugfixes' 2013-10-21 08:00:04 +02:00
per 60006e06ef Remove duplicate model files. Closes ticket:4088 2013-10-20 15:59:59 +02:00
cybersphinx 8c5d8d35ab Only check for OpenGL errors in debug builds. 
Might speed up rendering a bit.
 2013-10-20 13:57:15 +02:00
per de42fd3547 Fix saving of effects 2013-10-20 12:57:10 +02:00
per 76edcb87fd Unify muzzle flash drawing code between structures and droids to reduce code duplication. 2013-10-20 11:45:49 +02:00
per e779457906 Remove unused/useless code from console code 2013-10-20 10:31:57 +02:00
per 439bee7ae3 Merge implementations of displayStructureStatButton() and displayStructureButton(). 2013-10-20 01:05:10 +02:00
per d9353c1701 Remove useless parameter from PIE button display functions. 2013-10-20 01:05:10 +02:00
Per Inge Mathisen 38731a9030 Merge pull request #43 from Cjkjvfnby/ini-cleanup 
Ini cleanup
 2013-10-16 14:29:18 -07:00
Ivan Vasilov 290d95fc14 Fix spaces to tabs. 2013-10-14 00:08:58 +02:00
Ivan Vasilov 9a2563de97 Minor fixes for bugs which can cause segfaults. 2013-10-14 00:08:25 +02:00
per 151a6a5084 Do not use texture compression on GUI images. Patch by zaaak@laposte.net. Closes ticket:4086 2013-10-13 23:27:44 +02:00
Cjkjvfnby 800e05f39d remove time = 0 2013-10-08 02:18:39 +04:00
Cjkjvfnby 57a5ad2486 remove all repairArmour entries this value is not used 2013-10-08 02:18:38 +04:00
Cjkjvfnby 5358f0966b remove repairPoints = 0 2013-10-08 02:18:37 +04:00
Cjkjvfnby 0099af76d2 remove researchPoints = 0 2013-10-08 02:18:36 +04:00
Cjkjvfnby bc8d3e479f remove researchPower = 0 2013-10-08 02:18:35 +04:00
Cjkjvfnby 04eb360967 remove speed = 0 2013-10-08 02:18:34 +04:00
Cjkjvfnby 8ab58c826b remove skidDeceleration = 600 2013-10-08 02:18:34 +04:00
Cjkjvfnby 31895a8363 remove lineOfSight = 1 2013-10-08 02:18:33 +04:00
Cjkjvfnby afb7ac283a remove armour = 1 2013-10-08 02:18:32 +04:00
Cjkjvfnby 7be96c8cc4 remove startVisible = 1 2013-10-08 02:18:31 +04:00
Cjkjvfnby 042f833719 remove damageable = 1 2013-10-08 02:18:30 +04:00
Cjkjvfnby 21d780a338 remove range = 0 2013-10-08 02:18:29 +04:00
Cjkjvfnby 0f674a7868 remove constructPoints = 0 2013-10-08 02:18:28 +04:00
Cjkjvfnby 53a6cc0a09 remove hitpoints = 0 from construct.ini 2013-10-08 02:18:27 +04:00
Cjkjvfnby 00f6ab8a64 remove armourHeat = 0 2013-10-08 02:18:27 +04:00
Cjkjvfnby 26c7d3759a remove armourKinetic = 0 2013-10-08 02:18:26 +04:00
Cjkjvfnby 5627d211de remove hitpoints = 0 from components 2013-10-08 02:18:25 +04:00
Cjkjvfnby 82e98e07bd remove buildPoints = 0 2013-10-08 02:18:24 +04:00
Cjkjvfnby 9e18c476f4 remove weight = 0 2013-10-08 02:18:23 +04:00