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
dak180 2b0dc1bce3 Make sure to remove the leading `v`. 2013-11-17 14:34:45 -05:00
Cyp 35745a79a3 Fix build with C++11 and/or Qt. 
"blah"PRIu64 was interpreted as a string literal, and wzDelay was missing.
 2013-11-17 20:06:02 +01:00
dak180 5d5a6eb8b7 Quote all possible spaces the mkdmgs script. 2013-11-17 11:22:36 -05:00
cybersphinx ea8e66a9e3 Fix Hungarian translation. 
Refs #4112.
 2013-11-17 17:10:12 +01:00
cybersphinx feafcad20c Hungarian translation update by mtomi78. 
Closes #4112.
 2013-11-17 16:26:37 +01:00
per 143c5dafff Reinitialize AI data and player names each time frontend is reloaded. This closes ticket:3994. 2013-11-17 16:02:07 +01:00
per f0bb142e45 Add workaround for null pointer reference bug on recycling in factory. Closes ticket:4035. 2013-11-17 15:18:46 +01:00
per 6d34c718db When writing performance sampling data, respect the PHYSFS write dir. 
Patch by vexed, closes ticket:4098.
 2013-11-17 14:59:38 +01:00
per 491c1c3f4a Fix copy-paste bug introduced in de42fd3547 whereby 
saved effects would be erased. Closes ticket:4099. Closes ticket:4103.
 2013-11-17 14:40:10 +01:00
per d4dda2323a Update Readme by removing out of date information regarding 
command-line options. Refer instead to wiki and --help option.
Closes ticket:4104
 2013-11-17 14:29:28 +01:00
vexed d2e1519908 Merge branch 'bugfixes' 
Thanks to NoQ for the conversion

Conflicts:
	data/mp/stats/assignweapons.txt
	data/mp/stats/functions.txt
	data/mp/stats/propulsion.txt
	data/mp/stats/research/multiplayer/prresearch.txt
	data/mp/stats/research/multiplayer/research.txt
	data/mp/stats/research/multiplayer/resultcomponent.txt
	data/mp/stats/structuremodifier.txt
	data/mp/stats/templates.txt
	data/mp/stats/weaponmodifier.txt
	data/mp/stats/weapons.txt
 2013-11-16 00:20:41 -05:00
vexed cb407b558d Note, this is *only* for MP, not campaign! 
* Cyborg transporter weapon removed. [assignweapons.txt]
 * Machine gun upgrades: [functions.txt]
 -First ROF Upgrade 17->20.
 -Second ROF Upgrade 34->38.
 -Third ROF Upgrade 50->46.
 * Hovercraft [propulsion.txt]
 -Price 100->150.
 -Hit Points 150->100.
 * Lasers [prreseach.txt]
 -Pre-requisites: NSRB Mk2->NSRB Mk1 (move up on tech tree, available earlier)
 * Cannons [research.txt]
 -Research Points 2400->1800.
 * Lasers [resultcomponent.txt]
 -Don't auto-upgrade to Pulse Laser
 * Strucutre Modifiers (ANTI PERSONNEL) [structuremodifier.txt]
 -vs. Medium structures: 80->65.
 -vs. Hard structures: 50->40.
 -vs. Bunkers: 75->50
 * Remove weapon from Cyborg transporter [templates.txt]
 * Weapon Modifiers (ANTI PERSONNEL) [weaponmodifier.txt]
 -vs. Halftracks: 60->50.
 -vs. Tracks: 50->40.
 *[Weapons.txt]
 *PlasmiteFlamer
 -Price 130->160.
 -Weight 750->5000.
 -Incendiary Damage 50->42.
 *Mortar-Incenediary
 -Incendiary Radius 192->128.
 -Splash Damage 70 -> 50.
 -Damage 90 -> 80.
 *Twin Assault Gun  (MG5TWINROTARY)
 -Hit Points 300->125.
 *Assault Gun (MG4ROTARYMk1)
 -Hit Points  250->125.
 *VTOL Assault Gun (MG4ROTARY-VTOL)
 -Hit Points 250->185.
 *Pillbox (MG4ROTARY-Pillbox)
 -Hit Points 250->175.
 *Heavy Machinegun (MG3Mk1)
 -Hit Points 150->75.
 *VTOL Heavy Machinegun (MG3-VTOL)
 -Hit Points 150->95.
 *Heavy Machinegun Bunker (MG3-Pillbox)
 -Hit Points 150->95.
 *Twin Machinegun (MG2Mk1)
 -Hit Points 125->75.
 *VTOL Twin Machinegun (MG2-VTOL)
 -Hit Points 125->95.
 *Twin Machinegun Bunker (MG2-Pillbox)
 -Hit Points 125->95.
 *Flashlight (Laser3BEAMMk1)
 -Damage 80 -> 100.
 *Ground Shaker (Howitzer150Mk1)
 -Long range 9984->8192.
 *Howitzer (Howitzer105Mk1)
 -Long range 4992->5120.
 -Fire Pause 150->110 (faster).
 *Incendiary Howitzer (Howitzer-Incenediary)
 -Incendiary Damage 32->24.
 -Radius 256->192.
 *Inferno (Flame2)
 -Weight 500->5000.
 -Incendiary Damage 32->28.
 -Hit Points 75->45.
 *Flamer (Flame1Mk1)
 -Hit points 40->10.
 -Price 40->60.
 -Incendiary Damage 28->20.
 *Flamer (CyborgFlamer01)
 -Hit points 40->10.
 -Incendiary Damage 22->16.
 -Price 50->65.
 *Cybrog Thermite Weapon (Cyb-Wpn-Thermite)
 -Price  80->100.
 -Incendiary Damage 32->26.
 *Cyb-Wpn-Laser (Cyb-Wpn-Laser)
 -Damage 70->90.
 *Assault Cannon (Cannon5VulcanMk1)
 -Damage 35->40.
 -Splash Damage 25->35.
 *Hyper Velocity Cannon (Cannon4AUTOMk1)
 -Fire Pause 50->43.
 *Light Cannon (Cannon1Mk1)
 -Hit Points 200->250.
 *VTOL Cannon (Cannon1-VTOL)
 -HitPoints 200->250.
 *VTOL Plasmite Bomb Bay (Bomb5-VTOL-Plasmite)
 -Change back to ARTILLERY ROUND.  refs:1c090d7bff38
 -Build Points 1000->2000.
 -Incendiary Damage 140->115.
 -Splash Damage 1000 -> 875.
 *VTOL Thermite Bomb Bay (Bomb4-VTOL-HvyINC)
 -Build Points 1000->1500.
 -Incendiary Damage 120->95.
 -Damage 400 -> 370

 Changes by NoQ, crab, and vexed

(cherry picked from commit c9e76aa05c61a801af7aad1f3ad1b45a9c164944)
 2013-11-16 00:14:28 -05:00
cybersphinx 4f5a7c3d2e Merge branch 'bugfixes' 
* bugfixes:
  Hungarian translation update by mtomi78.
  If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them.
 2013-11-16 03:57:25 +01:00
cybersphinx 3106ec26ba Hungarian translation update by mtomi78. 
Closes #4110.
 2013-11-16 03:56:28 +01:00
vexed 75ede1da1d If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them. 2013-11-15 20:34:43 -05:00
vexed fdc3b7d4cb Fix capacity clobber. 
refs:4458c8b2edece39175bda25ecf8ac84c2633feca
 2013-11-14 22:26:19 -05:00
vexed c142724c2a Merge branch 'bugfixes' 
Conflicts:
	src/template.cpp
 2013-11-14 21:14:26 -05:00
vexed 4458c8b2ed Allow VTOL factories to produce SUPER_HEAVY units. 2013-11-14 20:57:01 -05:00
vexed 0fc924f7c1 Revert "Add fix for backwards terrain shadows by Berg" 
This reverts commit 85ecd9a393.

    This caused the mini-map to render incorrectly.
    Fixes ticket:4105
 2013-11-12 22:18:40 -05:00
per c3d3e9693d Remove default values from ini files. Patch by Duha. Closes ticket:4100. 2013-11-12 00:29:58 +01:00
per 4d74cddeff Move name field from names.txt to templates.ini. Patch by Duha. Closes ticket:4106. 2013-11-12 00:27:55 +01:00
automerge 8b058539e7 Merge branch 'bugfixes' 2013-11-08 08:00:05 +01:00
per 83cd123e74 Fix possible crash in campaign when returning home to factory that does not exist. Discovered by Coverity scanner. 2013-11-07 00:17:55 +01:00
per dda1585f95 Fix various minor issues pointed out by Coverity scanner. 2013-11-07 00:17:07 +01:00
cybersphinx 0f7a152599 Update translations. 2013-11-04 14:37:14 +01:00
cybersphinx 7e24f1f5f3 Update POTFILES.in and custom translations. 2013-11-04 14:37:12 +01:00
cybersphinx dd9a750e13 French translation update by machintruc/cpasmoi. 2013-11-04 14:33:34 +01:00
vexed b366d80ca5 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-11-01 22:48:12 -04:00
vexed 1498b6c40e Reformat some messages to fit correctly in the console area. 
Don't retry UPnP configuration after it failed, and while still in the game lobby screen.
(You need to exit out of the game lobby screen to retry UPnP configuration.)
Remove UPnP entry in router on game quit.
 2013-11-01 22:09:42 -04:00
haonoq 4fda6753bc Merge branch 'bugfixes' 
Conflicts:
	data/mp/multiplay/skirmish/nullbot-main.js.inc
 2013-11-02 01:00:04 +04:00
haonoq c86552aca0 Update NullBot to the latest version, include Turtle and Hover AI 2013-11-02 00:56:30 +04:00
vexed 9c370f9896 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-10-31 23:17:24 -04:00
vexed cd3c925169 Updata changelog 2013-10-31 23:06:04 -04:00
vexed 14aa458f09 Remove/hide filter icon when needed. 2013-10-31 22:10:02 -04:00
vexed 76ed7aed41 Show kick message when kicked, and show host has quit message if host quit (in lobby). 
Fixes ticket:4007
 2013-10-31 22:10:01 -04:00
vexed aac6622fa3 Add a wzDelay function to be used to delay things 2013-10-31 22:10:00 -04:00
vexed 352ba4a38c Fix merge clobber 2013-10-31 21:56:38 -04:00
per 26e52dc851 Add explanatory headers to ini files. Patch by Duha. Closes ticket:4101. 2013-11-01 00:49:00 +01:00
vexed 163dfc3d9c Fix bad C&P from previous commit 2013-10-30 23:36:03 -04:00
vexed 9f005d25a7 Merge branch 'bugfixes' 
Conflicts:
	data/base/images/frontend.img
	src/Makefile.am
	src/frend.h
	src/multiint.cpp
 2013-10-30 23:19:20 -04:00
vexed 854b22c770 Add filter icon by duha 
Add refresh icon by slate

Fix button states.
 2013-10-30 22:45:39 -04:00
vexed 4086e93c16 Portable Warzone fixes for windows. 
Fix windows paths.

Windows portable icon by forum member Duda.
Portable header & welcome images from forum member Aubergine.
Image fixes supplied by Berg.

Note: In configure stage (Windows only!), you can specify --enable-portable [default no] to
      create a portable installer. (That is, everything is self-contained in the directory
      you install Warzone 2100 to.  It will *not* use any other directory on the system.)
      If you pass --with-videos [default no], then it will add the videos with the portable
      installer and looks for the video file in \opt\sequences.wz

FIXME: Need: RUSSIAN, GERMAN, DUTCH, tranlations fixes for the warzone2100.nsi file.
(cherry picked from commit c1b29c1f5e)

Conflicts:
	src/Makefile.am
 2013-10-30 20:06:26 -04:00
vexed 43bf1a8b30 Only need to show the UPnP stuff for Hosts. 2013-10-30 00:11:54 -04:00
vexed 3eda8704b8 Merge branch 'bugfixes' 
Conflicts:
	data/mp/stats/assignweapons.txt
	data/mp/stats/body.txt
 2013-10-29 23:25:51 -04:00
vexed 4de83bcb7d Fix picky compile issue reported by buildbot. :P 2013-10-29 23:06:17 -04:00
vexed e3279f6d03 Fix the SuperTransport body type to be SUPER HEAVY, not HEAVY. 
Try harder not to have them be on top of each other (only in MultiPlayer games).
Fix explosion type.
Fix damage calculations when they are on the ground.
Try to better balance the Super Transport, hitpoints now at 500, Armor types changed to 35 & 20 and make weapon MG1-VTOL instead of MG3-VTOL.
 2013-10-29 22:49:00 -04:00
vexed 15c1e5c5d8 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
(Note, this merge is more or less a dummy commit, since most of this was already
in master anyway... just trying to sync everything up)
 2013-10-28 21:44:21 -04:00
vexed d5428b94e4 Fix a off by one error for AI count. 2013-10-28 20:16:17 -04:00
vexed c2ded00ed4 Fix AI picking to show at most 8 AIs, because of the limitations of the GUI. closes ticket:3147 
(cherry picked from commit 20c7024a9b)
 2013-10-28 20:12:45 -04:00
per cf317799ad Fix off-by-one memory error 
(cherry picked from commit 1e6e097e7a)
 2013-10-28 20:11:36 -04:00