Permalink
Browse files

Merge pull request #224 from FranciscoDA/master

use subforms in a/vequipscreen and transactionscreen for stats
  • Loading branch information...
JonnyH committed Nov 3, 2017
2 parents 39db10b + 7f4040b commit b3c9a82825b0f3c26002ddfad67a28576ec74e63
Showing with 1,036 additions and 1,548 deletions.
  1. +53 −0 data/common_patch/gamestate/ufopaedia.xml
  2. +7 −0 data/forms/{aequipscreen_main.form → aequipscreen.form}
  3. +0 −47 data/forms/aequipscreen_item_armor.form
  4. +0 −55 data/forms/aequipscreen_item_grenade.form
  5. +0 −36 data/forms/aequipscreen_item_other.form
  6. +0 −143 data/forms/aequipscreen_item_weapon.form
  7. +4 −116 data/forms/battle/prestart.form
  8. +4 −1 data/forms/recruitscreen.form
  9. +2 −2 data/forms/sheet_agent_item.form
  10. +47 −46 data/forms/{aequipscreen_agent_stats.form → sheet_agent_stats.form}
  11. +20 −20 data/forms/sheet_vehicle_item.form
  12. +0 −1 data/forms/transactionscreen.form
  13. +5 −133 data/forms/vequipscreen.form
  14. +15 −2 game/state/city/vehicle.cpp
  15. +1 −0 game/state/city/vehicle.h
  16. +10 −0 game/state/rules/aequipmenttype.cpp
  17. +7 −0 game/state/rules/aequipmenttype.h
  18. +1 −1 game/state/rules/city/vehicletype.h
  19. +6 −0 game/ui/CMakeLists.txt
  20. +20 −6 game/ui/base/recruitscreen.cpp
  21. +2 −0 game/ui/base/recruitscreen.h
  22. +8 −296 game/ui/base/transactionscreen.cpp
  23. +36 −203 game/ui/base/vequipscreen.cpp
  24. +5 −0 game/ui/base/vequipscreen.h
  25. +8 −16 game/ui/battle/battleprestart.cpp
  26. +1 −0 game/ui/battle/battleprestart.h
  27. +7 −1 game/ui/gameui.vcxproj
  28. +1 −4 game/ui/gameui.vcxproj.filters
  29. +187 −0 game/ui/general/aequipmentsheet.cpp
  30. +34 −0 game/ui/general/aequipmentsheet.h
  31. +34 −404 game/ui/general/aequipscreen.cpp
  32. +3 −8 game/ui/general/aequipscreen.h
  33. +162 −0 game/ui/general/agentsheet.cpp
  34. +25 −0 game/ui/general/agentsheet.h
  35. +221 −0 game/ui/general/vehiclesheet.cpp
  36. +37 −0 game/ui/general/vehiclesheet.h
  37. +63 −7 game/ui/ufopaedia/ufopaediacategoryview.cpp

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -109,6 +109,13 @@
<imageposition>tile</imageposition>
<image/>
</graphic>
<subform id="AGENT_STATS_VIEW" src="sheet_agent_stats">
<position x="17" y="62"/>
</subform>
<subform id="AGENT_ITEM_VIEW" src="sheet_agent_item">
<position x="17" y="62"/>
</subform>
</style>
</form>
</openapoc>

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit b3c9a82

Please sign in to comment.