Commit Graph

15077 Commits

Author SHA1 Message Date
Oliver Brakmann
39d13dc654 Merge pull request #7121 from pchote/switchmods
Add Launch.Connect command and on-connect mod switching.
2014-12-24 16:06:00 +01:00
Matthias Mailänder
34a793c246 Merge pull request #7186 from Mailaender/ts-modchooser-png
Added mod chooser graphics to the Tiberian Sun mod
2014-12-24 15:13:01 +01:00
Oliver Brakmann
659d677cdb Merge pull request #7052 from Mailaender/gdi01-polishing
Fixed GDI01 secondary objectives and mission descriptions
2014-12-24 14:30:40 +01:00
Matthias Mailänder
c97aaa3064 add modchooser graphics 2014-12-24 14:22:55 +01:00
Matthias Mailänder
4b913d423e Merge pull request #7162 from penev92/bleed_moveFiles
Further RA project cleanup
2014-12-24 11:02:23 +01:00
Matthias Mailänder
0cc95b8cfa Merge pull request #7184 from abcdefg30/fixsoviets
Fix soviets01
2014-12-24 10:48:58 +01:00
abcdefg30
e577f3d7f8 map.yaml cleanup 2014-12-24 10:09:26 +01:00
abcdefg30
366be4585a Fix soviets01 2014-12-24 09:56:23 +01:00
Matthias Mailänder
849d7ce0b3 Merge pull request #7175 from pchote/hardware-cursors
Closes #7015
2014-12-24 09:37:17 +01:00
Matthias Mailänder
4e4a14ae0b Merge pull request #7181 from pchote/d2k-leavemap
Fix d2k ingame-leavemap.yaml.
2014-12-24 09:16:38 +01:00
Paul Chote
54f3c1e7ac Fix d2k ingame-leavemap.yaml. 2014-12-24 09:54:34 +13:00
Matthias Mailänder
c460769442 Merge pull request #7176 from Mailaender/wormspawner-icon
Replaced the wormspawner editor icon
2014-12-23 15:41:33 +01:00
penev92
681042caec Further RA project cleanup 2014-12-23 15:18:07 +02:00
Matthias Mailänder
77ad98fa69 replace wormspawner editor icon 2014-12-23 11:46:32 +01:00
Paul Chote
6923046564 Expose the cursor mode setting. 2014-12-23 22:09:22 +13:00
Paul Chote
1317101662 Add support for hardware cursors. 2014-12-23 22:09:22 +13:00
Paul Chote
75b046ae2a Reorganize cursor plumbing in preparation for hardware cursors. 2014-12-23 22:09:22 +13:00
Paul Chote
202247cf6a Include no-extension workaround for FrameCache too. 2014-12-23 22:09:22 +13:00
Paul Chote
380b0e1561 Capitalise cursor properties. 2014-12-23 22:09:21 +13:00
Matthias Mailänder
7c19f710b8 Merge pull request #7134 from pchote/map-class
Introduce map Class field to replace Selectable/UseAsShellmap
2014-12-22 22:23:41 +01:00
Paul Chote
dc211cc729 Fix an unrelated editor regression. 2014-12-23 10:00:23 +13:00
Paul Chote
bd2518649a Upgrade shipped maps to the latest format. 2014-12-23 10:00:19 +13:00
Paul Chote
96b5b1fc66 Automatically switch mods when connecting to a server / replay. 2014-12-23 09:20:21 +13:00
Paul Chote
660f6682ff Add Launch.Connect parameter for launching directly to a server. 2014-12-23 09:20:21 +13:00
Paul Chote
7bfffeadc2 Simplify mod content installation plumbing. 2014-12-23 09:20:21 +13:00
Paul Chote
ec7a32184e Move the mod-level initialisation code back into the load screen. 2014-12-23 09:20:19 +13:00
Paul Chote
6f0927069a Allow outside code to specify the map chooser visibility filter. 2014-12-23 09:08:00 +13:00
Paul Chote
2ed594fd86 Introduce map Visibility field.
This replaces the Selectable, UseAsShellmap, and special-cased Type = "Mission" fields.
2014-12-23 09:08:00 +13:00
Paul Chote
b4c9c19cce Don’t crash when saving automatically-upgraded maps. 2014-12-23 09:08:00 +13:00
Paul Chote
14deb1efdf Drop support for map format 5. 2014-12-23 09:08:00 +13:00
Matthias Mailänder
711a1ca5fc Merge pull request #6830 from RoosterDragon/dispose-renderer-resources
Closes #5116
2014-12-22 19:59:41 +01:00
Matthias Mailänder
ea410d0688 Merge pull request #7096 from ScottNZ/countries
Closes #5928
2014-12-22 19:20:43 +01:00
Oliver Brakmann
4f4501ccb6 Merge pull request #7165 from Mailaender/appveyor
Added AppVeyor support
2014-12-22 18:49:23 +01:00
Matthias Mailänder
967d6b6ea0 Merge pull request #7161 from reaperrr/dissolve-namespaces03
Dissolve Move, Infiltration and Crates namespaces
2014-12-22 18:43:05 +01:00
RoosterDragon
b28d999131 Made SheetBuilder rely on global settings rather than global renderer.
Additionally exposed an InitializeSettings method on game to initialize the global settings so that other classes can set up all the secret dependencies on the global settings required.
2014-12-22 17:39:19 +00:00
RoosterDragon
9cbac2d5e1 Clean up style of files affected by the last commit. 2014-12-22 17:34:02 +00:00
RoosterDragon
f0f02dff5c Dispose of graphics resources deterministically.
Textures, FrameBuffers and VertexBuffers allocated by the Sdl2 Renderer were only being released via finalizers. This could lead to OpenGL out of memory errors since resources may not be cleaned up in a timely manner. To avoid this, IDisposable has been implemented and transitively applied to classes that use these resources.

As a side-effect some static state is no longer static, particularly in Renderer, in order to facilitate this change and just for nicer design in general.

Also dispose some bitmaps.
2014-12-22 17:34:01 +00:00
reaperrr
070a3839d4 Remove obsolete D2k sln
Closes #7163.
2014-12-22 18:13:31 +01:00
reaperrr
370c3c65b6 Moved AttackLeap to Mods.RA.Traits, moved AttackPopupTurreted to
Mods.Cnc.Traits
2014-12-22 18:13:30 +01:00
reaperrr
65a140afa5 Dissolve Crates namespace, move CrateActions and Crate trait to Traits/Crates 2014-12-22 18:13:29 +01:00
reaperrr
52219b1c7a Dissolve Infiltration namespace 2014-12-22 18:13:28 +01:00
reaperrr
5c5210f5e3 Dissolve Move namespace into Activities & Traits 2014-12-22 17:32:08 +01:00
Matthias Mailänder
b0181b6d7b don't run tests that will fail due to known issues 2014-12-22 10:18:44 +01:00
Matthias Mailänder
c04bb13e71 fix redeploying failing the secondary objective
code cleanup
2014-12-22 09:56:36 +01:00
Matthias Mailänder
b294816489 left-click orders have been deprecated 2014-12-22 09:45:18 +01:00
Matthias Mailänder
38b579a081 Merge pull request #7169 from pchote/revert-attackmove
Closes #7128
2014-12-22 09:43:42 +01:00
Paul Chote
9fc8726a5e Merge pull request #7171 from chrisforbes/fix-mission-nre
Fix NRE in start game MissionBrowser IsDisabled query
2014-12-22 16:34:06 +13:00
Chris Forbes
2790748587 Fix NRE in start game MissionBrowser IsDisabled query 2014-12-22 16:12:53 +13:00
Paul Chote
488f0d1140 Revert "Fixes AttackMove moving even if an enemy is within range."
This reverts commit a155c7b7ac.
2014-12-22 15:17:51 +13:00
Paul Chote
e212517bbb Merge pull request #7126 from penev92/bleed_sandworm
Fix worms not releasing targets when they move deep onto rock
2014-12-22 14:46:08 +13:00