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

10902 Commits (358dcb434a85083e415457d7f07afe95f47f0aa8)

Author SHA1 Message Date
safety0ff 358dcb434a Add swap interval support for SDL 1.2 backend on Windows and Linux. 
Refs #3054.
 2012-01-12 09:37:25 -05:00
vexed 96fdff1ca8 Upload forum member Jorzi new credit screen. 2012-01-11 22:38:34 -05:00
vexed 46f66ef71e Add a message for people who host games. 2012-01-11 17:45:14 -05:00
Cyp 9cdcadc266 Only ignore buildings at pathfinding destination, not source. 
Trucks would build a factory, then pathfind through it on the way to the next
factory, and get stuck driving into the newly-built factory.

See 0119eda53f.

Fixes ticket:3050.
 2012-01-11 22:19:09 +01:00
Per Inge Mathisen e94ba3dbba Balance changes from Iluvalar. 
BODIES

Tiger (Body9REC)
price: 71$ => 91$
prod:420 => 534
armour 20.25=>17
HP:284=>204

Scorpion (Body8MBT)
price: 39$ => 44$
prod:250 => 281
armour 12=>11
HP:125=>103

Retribution (Body7ABT)
price: 100$ => 120$
prod:600 => 718
armour 23=>19
HP:200=>142

Panther (Body6SUPP)
price: 57$ => 64$
prod:300 => 337
armour 15.75=>14
HP:193=>165

Cobra (Body5REC)
price: 46$ => 51$
prod:250 => 276
armour 12.75=>12
HP:130=>119

Bug (Body4ABT)
price: 25$ => 26$
prod:100 => 103
armour 8=>7
HP:55=>55

Retaliation (Body3MBT)
price: 68$ => 70$
prod:400 => 411
armour 18.75=>18
HP:100=>96

Leopard (Body2SUP)
price: 41$ => 40$
prod:220 => 215
armour 10.5=>11
HP:107=>115

Viper (Body1REC)
price: 30$ => 30$
prod:150 => 150
armour 8.5=>8
HP:65=>68

Dragon (Body14SUP)
price: 182$ => 216$
prod:1000 => 1182
armour 30=>25
HP:350=>215

Wyvern (Body13SUP)
price: 156$ => 156$
prod:900 => 899
armour 28=>28
HP:350=>350

Mantis (Body12SUP)
price: 52$ => 67$
prod:350 => 445
armour 18=>15
HP:180=>125

Python (Body11ABT)
price: 60$ => 71$
prod:350 => 410
armour 17.25=>16
HP:200=>170

Vengeance (Body10MBT)
price: 130$ => 160$
prod:800 => 980
armour 27.25=>23
HP:300=>212

PROPULSIONS

Tracks (tracked01)
HP:300=>237

Hover (hover01)
HP:150=>93

Half-tracks (HalfTrack)
HP:200=>160

WEAPONS

Incendiary Mortar (Mortar-Incenediary)
price: 150$ => 314$
prod:750 => 1567
HP:5=>1
DMG 90=>48

Incendiary Howitzer (Howitzer-Incenediary)
price: 250$ => 522$
prod:1000 => 2085
HP:10=>3
DMG 200=>102

Bombard (Mortar2Mk1)
price: 200$ => 169$
prod:1000 => 843
HP:5=>43
DMG 120=>129

Inferno (Flame2)
price: 80$ => 140$
prod:400 => 698
HP:75=>25
DMG 40=>29

Plasmite Flamer (PlasmiteFlamer)
price: 80$ => 154$
prod:400 => 769
HP:75=>25
DMG 63=>40

VTOL Plasmite Bomb Bay (Bomb5-VTOL-Plasmite)
price: 225$ => 303$
prod:1000 => 1345
HP:600=>438
DMG 1000=>864

VTOL Thermite Bomb Bay (Bomb4-VTOL-HvyINC)
price: 225$ => 322$
prod:1000 => 1431
HP:360=>218
DMG 400=>336

VTOL Cluster Bomb Bay (Bomb1-VTOL-LtHE)
price: 150$ => 72$
prod:600 => 288
HP:420=>782
DMG 120=>169

Nexus Link Turret (SpyTurret01)
price: 400$ => 205$
prod:1600 => 820
HP:200=>561
DMG 2=>2

EMP Cannon (EMP-Cannon)
price: 200$ => 41$
prod:800 => 161
HP:500=>1906
DMG 70=>143

B-2) Emplacements for mortars

Incendiary Mortar Pit (Emplacement-MortarPit-Incenediary)
price: 135$ => 111$
prod:425 => 350
armour 10=>12
HP:300=>365

Incendiary Howitzer Emplacement (Emplacement-Howitzer-Incenediary)
price: 325$ => 254$
prod:550 => 429
armour 10=>14
HP:400=>512
 2012-01-11 21:22:06 +01:00
Per Inge Mathisen 668aec6d06 qtscript: Fix result offset from pickStructLocation() 2012-01-11 20:23:20 +01:00
Per Inge Mathisen a4b11e14fc qtscript: Add removeReticuleButton() 2012-01-11 20:23:20 +01:00
Cyp aaf0fb8798 Fix dead pointer usage on factory destruction during secondary order editing of said factory. 
Right-clicking a factory just before it's destroyed no longer crashes.
 2012-01-11 17:50:22 +01:00
Cyp 2249996f1c Fix scrolling at ridiculously high framerates. 
Affects scrolling due to using the arrow keys or moving the mouse to the window edge.
Scrolling due to clicking on minimap no longer terminates at a GPU-dependent time.

Scrolling using the arrow keys or moving the mouse to the window edge now overrides
the fancy warcam. So clicking on the mini-map by accident no longer wastes several
seconds helplessly scrolling to somewhere random despite the user telling it to scroll
the other way.
 2012-01-11 17:50:21 +01:00
Cyp 52c74a4b0c Save droids/structures/features using alphabetically-increasing section names. 
Since the .ini sections are currently alphabetically sorted by QSettings, this means later
loading the droids/structures/features in the same order.

Leaving the hack in place which loads transporters first, for now.
 2012-01-11 17:49:49 +01:00
vexed 5d35cd67a5 Clean up some trivial warnings from last commit. 2012-01-10 21:52:01 -05:00
vexed 617e4c01e1 Redesign lobby screen. 
Now shows if the host has disabled tanks or cyborgs or VTOLs.
Legend: Red blip means can't join game (wrong version / mod or game full)
Amber blip means the game is password protected.
Green blip means no limitations on joining.
 2012-01-10 21:24:32 -05:00
dak180 0a4e841b1a Only require moc if we are going to use it for anything. 
Currently moc is only used if the Qt backend is in use.
 2012-01-10 10:34:30 -05:00
Cyp 03833edf3f Fix research cancellation not registering in UI. 
If cancelling a research, then the next completed research in the same facility would linger after completion.

Fixes ticket:3046.
 2012-01-10 14:04:59 +01:00
Cyp c67e49c7ec Add some (int) casts for C++11 compatibility. 
Reported by cybersphinx.
 2012-01-10 13:10:58 +01:00
Cyp 7656d2f84b Enable/disable the correct colours. 
Introduced in 5fa3d50f0c.

Fixes ticket:3043.
 2012-01-10 13:05:06 +01:00
Cyp 3879ebb935 Implement MMB rotation for Qt backend. 
RMB rotation broken in f32614b6e7.

Broken RMB rotation changed to broken MMB rotation in 52b91bfc53.

Except that MMB rotation was implemented in 09d73b0ba5, which was
in a different branch than 52b91bfc53.

So, if reading history correctly, it seems that MMB rotation was implemented only implemented
for the SDL backend (after the Qt backend was created).

Fixes ticket:2578.
 2012-01-10 12:50:02 +01:00
Cyp b06e3b3312 Remove left-over code in pre-multiplied tool. 
Made the brightness of the alpha-blended texture be treated as the alpha mask itself.
 2012-01-10 11:49:02 +01:00
vexed 4211ba77ed Fix console to handle strings that are multiline strings normally. (ie: hello\nblah now is handle as being given as two inputs to correct the line counters) 2012-01-09 19:35:48 -05:00
vexed f53811d5b6 Update MSVC solution broken in 545eb5c272 
MOD authors take note that if you used those, your mod is now broken.
 2012-01-09 18:23:01 -05:00
dak180 cb5842b3d1 Use a better naming scheme for the doc tarball. 2012-01-09 17:41:13 -05:00
Per Inge Mathisen 287be0d51c qtscript: Add setScrollParams(), addStructure(), loadLevel() 2012-01-09 20:10:43 +01:00
cybersphinx d94be63ad8 Fix ChangeLog. 2012-01-09 03:01:50 +01:00
dak180 9781a6e7c2 Merge remote-tracking branch 'nanotech/topic/mac-window-icons' 
* nanotech/topic/mac-window-icons:
  Qt: Don't set a window icon on OS X.
  SDL: Don't override the high-res OS X dock icon.
 2012-01-08 20:58:52 -05:00
dak180 6855e2a51d Use the included QuesoGLC. 
Adds Fribidi as an independent framework.
Also clean up some file references in the xcode project.

Refs #2828.
 2012-01-08 20:34:11 -05:00
dak180 600ae8525a Fix errors introduced by ac550ac. 2012-01-08 20:29:32 -05:00
cybersphinx d7adba90d4 Remove outdated win32 files from quesoglc. 2012-01-09 02:26:46 +01:00
cybersphinx bd495c0739 Update translations. 2012-01-09 01:42:56 +01:00
cybersphinx 048a97e3e6 Restore verbose lobby error message. 2012-01-09 01:41:57 +01:00
cybersphinx 27164ca3ed Update POTFILES.in. 2012-01-09 01:37:51 +01:00
cybersphinx 25d98aff42 Fix quesoglc Makefile.am. 2012-01-09 01:31:28 +01:00
cybersphinx f8a49e764f Fix ChangeLog date. 2012-01-09 01:28:30 +01:00
vexed 9387b398fe Show the backend we are using in the version string and also in the crash report file. 
Closes #3034.
 2012-01-08 23:58:50 +01:00
cybersphinx d757069023 Increase major netcode version. 2012-01-08 23:58:50 +01:00
vexed ac550acd58 Revert the new bsonlobby. 
Closes #3040.

Revert "Remove bson from project files."

This reverts commit 5c24f7b716.

Conflicts:

	lib/netplay/netlobby.h
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj

Revert "Merge branch 'refs/heads/topic/QJson'"

This reverts commit 6dd85baedf, reversing
changes made to 7d349eb214.

Conflicts:

	Makefile.am
	lib/netplay/netlobby.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
Revert "Fix various build issues for both 'qtgame' and the bson /new lobby stuff"

This reverts commit f76e960f7d.

Conflicts:

	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/gamelib/gtime.cpp
	lib/netplay/netplay.vcxproj
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj
	win32/Warzone2100.sln

Revert "Fix SSL errors on the Macs."

This reverts commit 4c387a199b.

Revert "Merge branch 'bsonlobby' into master"

This reverts commit 793c30a862, reversing
changes made to 5fa33b7209.

Conflicts:

	data/makefile.win32
	lib/netplay/netlobby.cpp
	lib/netplay/netlobby.h
	lib/netplay/netplay.cpp
	lib/widget/label.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	po/POTFILES.in
	src/configuration.cpp
	src/frontend.h
	src/multiint.cpp
 2012-01-08 23:10:26 +01:00
safety0ff 9cb0afa9b8 Integrate QuesoGLC. 
Since no fixed release is out at the moment, always use ours.

Closes #2828.
 2012-01-08 22:53:42 +01:00
cybersphinx 95d09c169b Update ChangeLog. 2012-01-08 22:53:41 +01:00
Per Inge Mathisen 03cc4b5394 Fix problem with loading savegames from skirmish. Problem was that we 
did not know what kind of game we are loading while loading it, so cannot
deploy special exceptions and ugly hacks like we should.
 2012-01-08 18:42:29 +01:00
dak180 f60f172b62 Externalize the WarzoneHelp bundle. 2012-01-08 12:08:29 -05:00
Cyp 532ff19b22 Add tool for composing an additive effect followed by an alpha-blended effect into a single pre-multiplied alpha effect. 2012-01-08 17:36:08 +01:00
Cyp 0dbf008bc4 Squelch enum abuse warning-errors. 2012-01-08 17:29:03 +01:00
Per Inge Mathisen 85e9598f21 Fix ticket:3033, loaded droids get zero resistance. 2012-01-08 14:05:15 +01:00
dak180 b169155944 Fix mac build broken by c6b5fdd. 2012-01-08 00:28:17 -05:00
Per Inge Mathisen 9799722c79 Fix bug that would add an empty string at end of research explanations. 2012-01-08 00:31:45 +01:00
Per Inge Mathisen 58d0295cf0 Only clean up the VIEWDATA relevant for the resource being destroyed. 
Apparently the resource destruction system is also fine grained.
 2012-01-07 23:45:36 +01:00
Per Inge Mathisen 3462f7b5cd Fix crash on placing beacons. 2012-01-07 23:02:53 +01:00
Per Inge Mathisen 2a8d1dab30 Even more message code cleanup. 2012-01-07 20:46:23 +01:00
Per Inge Mathisen c6b5fdd6a2 Use a QMap for holding the VIEWDATA array. Reduces the code size a bit. 2012-01-07 20:46:23 +01:00
Per Inge Mathisen c384c39647 Move VIEWDATA_LIST handling into local scope. 2012-01-07 20:46:23 +01:00
dak180 62e4c65b63 Adjust the xcode project for the changes made in 545eb5c. 2012-01-07 14:21:51 -05:00