Continuation (too many characters)
...
e72edd3 Tweaked commendation award criteria
6755c8a Added support for defining damage type and battle type for a commendation
1269a5e Fixed Swiftness medal, added Prowler medal as a response to the fix
e40036a Merge branch 'master' into alpha_release
7239290 Merge branch 'master' of github.com:SupSuper/OpenXcom
b130e09 Preparations to merge into master branch
b598f1f Updated naming convention
ee5b84e Updated code to reflect new changes from PR#872
40b5357 Merge branch 'master' into temp
9f02d57 Merge branch 'master' of github.com:SupSuper/OpenXcom
313e970 Merge branch 'master' of github.com:SupSuper/OpenXcom
7998150 Merge branch 'master' into alpha_release
d7b7ba7 Merge branch 'master' of github.com:SupSuper/OpenXcom
f9d6ea5 Location statistic of base defense mission now save correctly
03b465c Merge branch 'master' into alpha_release
abfb287 Merge branch 'master' of github.com:SupSuper/OpenXcom
072216b Merge branch 'master' into alpha_release
2a273e7 Merge branch 'master' of github.com:SupSuper/OpenXcom
01d0ad0 Fixed crash with new battle
061d6a6 Merge branch 'master' into alpha_release
9a1e5dd Merge branch 'master' of github.com:SupSuper/OpenXcom
7efcb01 Moved iterator in commendation logic
572bdb4 Merge branch 'master' into alpha_release
c270c99 Merge branch 'master' of github.com:SupSuper/OpenXcom
763c04c Fixed sprite scrolling issues
49fc091 Added commendation sprites
3da3032 Sprites do not scroll, but they do update...
065ba63 Merge branch 'master' into alpha_release
c25ae92 Merge branch 'master' of github.com:SupSuper/OpenXcom
c40af8e Medals can now have fewer than 10 award levels, but still an arbitrary decoration sprite
65f9eae Fixed sprite decoration issue
0e538be Improved sprites black color
38d4c4a Added new sprites
d35a4a3 Merge branch 'ar-medal' of github.com:Shoes01/OpenXcom into ar-medal
c362c2c Reduce the amount saved for commendations
b8ca426 Added Order of the Fallen commendation
bf39417 Added Valiant Crux commendation
da367b9 Fixed Iron Man commendation
b5ab009 Added Order of Glory commendation
0cb6918 Added Purple Heart and Crimson Heart medals
f6c948c Added reaction fire medal
58fb4f0 New commendations screen
d7ef10a Merge branch 'alpha_release' of github.com:Shoes01/OpenXcom into alpha_release
6bd00b3 Merge branch 'master' into alpha_release
743e4f9 Merge branch 'master' of github.com:SupSuper/OpenXcom
e21fb21 Merge branch 'ar-comm' into alpha_release
0ebda5c Fixed list order for memorial stats screen
e48bc95 Redid the commendation state soldier listing of new commendations
74e4b10 Merge pull request #5 from fudgedragon/soldierStatsFixes
220e346 Make diary mission list maintain position after viewing a mission log
5af5863 Fix crash when selecting mission in records after scrolling down list for soldiers with more than 15 missions
52b246e Merge branch 'master' into alpha_release
e5a5f39 Merge branch 'master' into alpha_release
f5b41ed Merge branch 'master' of github.com:SupSuper/OpenXcom
55eda84 Fixed memorial lists
f7e301c Updated scroll function name
7e0cd89 Merge branch 'master' into alpha_release
5e31b32 CRLF stuff again
7a93718 CRLF stuff
3d5b85d Merge branch 'master' of github.com:SupSuper/OpenXcom
78a90a3 Update string
2c337e6 Tweaked commendations a bit
fa7e343 Cyberdisc killers are now credited with the death explosion kills
0a8d798 Delete kills for non xcom units too
54cad70 Future proofing and commendations can skip levels now
4ea34f0 Medals can skip awards now
685b75c WIP
b0a77f3 Merge branch 'AR_purge' into alpha_release
2fcdae7 Merge branch 'master' into alpha_release
400debc Merge branch 'master' of github.com:SupSuper/OpenXcom
c26aeca Now possible to skip decoration levels
ffbde15 Missions now track which soldier was wounded via id
675ca93 Merge branch 'master' of github.com:SupSuper/OpenXcom
0a9740e WIP
2c53c75 Cleaning up code
aecbd28 Merge branch 'master' into alpha_release
edac8bb Merge branch 'master' of github.com:SupSuper/OpenXcom
9e3a607 Can now view dead soldier stats
8459b19 Balanced ruleset a bit
2c4ca89 Tidying stuff up
8feae2e Merge branch 'master' of github.com:SupSuper/OpenXcom
a019c17 Added new sprites
0642c96 bug hunting
323ee81 Added new files
b6911e8 Updated diary mission info stuff
bd8e748 Reduced redundant code
8822343 WIP commendation refactor
89823f3 Merge branch 'alpha_release' into mergetest
bd19f37 Merge branch 'master' into alpha_release
57ea114 WIP serialization
ef09aad Porting stuff to BattleUnit
7b447cc Created struct of mission statistics, added to SavedGame
b4c0280 More content, and it compiles
9c7be79 Shooting stats WIP
919bf7c Fixed save
fdc32b9 Merge branch 'AR_newcontent' of github.com:Shoes01/OpenXcom into AR_newcontent
d85fe55 Weird thing
a360331 Fixed per turn kills
2e8efd4 Cleaned up code and commendations
d17b66f Kills per criteria defined by career, mission and turn
c976f95 Commendations on kills per mission can be awarded
c30e9c2 General kill criteria with multi kill maps
447a24e WIP converting SoldierDiary killCriteria to map instead of vector
7859152 Changed killCriterai ruleset and it's h/cpp to map instead of vector
62b118d Merge branch 'master' into alpha_release
f0745e8 Merge branch 'master' of github.com:SupSuper/OpenXcom
fa8c9cf Diary totals now save ...
2344ecc Added Order of Earth medal
4de1b77 Added Iron Man commendation
c2799ba Added Star of Valor
304e3ea Black Cross medal added
5eaf7c2 Added strings and rules for new medals
47af110 Added a hit counter as well
cb9d213 Moved the tracker out of the AI
b2e8bed Star of Asclepius medal
228163b Added double and triple kill prototypes
cb9ed28 AND and OR kill rules
47f1763 Fixed typo in commendation
ba6ed4e Fixed save crash, track turn for kills
409f0ba Tweaked strings
e8a3082 Merge branch 'master' into alpha_release
4f1bfae Hope this works'
fec0062 Merge branch 'master' of github.com:SupSuper/OpenXcom
065178c Merged correctly
8a46951 Merge branch 'master' into alpha_release
80b4c31 Merge branch 'master' of github.com:SupSuper/OpenXcom
853ec24 Added new commendation
7dae2df New commendation and comments in ruleset
1ccd303 More control over commendations
89cebaa Fixed some crashes
b1737c9 Moved enums from BattleUnit to SoldierDiary
5e29b72 WIP
9fa7f48 Fixed other things
5e151f2 More data in SoldierDiaryKills, get functions are strings
96fa47e Added logic for kills by criteria
e83e567 Added new Hellraiser medal
8a481b5 Moved the mission kills into the Statistics struct
37f2f2e Removed unused function
8ca573c Finalized new medal
0974b12 Moved tempKills to BattleUnit instead of Soldier
da233a2 Refactor updateDiary()
fd5a357 WIP
a9ffb4a Moved temp stats to BattleUnit
48520b7 WIP
cc61539 New struct for stats, with save and load functions
195754a Merge branch 'master' into alpha_release
50c1679 Merge branch 'master' of github.com:SupSuper/OpenXcom
46f52ea Merge branch 'master' into alpha_release
d88e194 Merge branch 'master' of github.com:SupSuper/OpenXcom
ec03933 Cleanup rank and race stat logic
eb6d3d7 Minor cleanup
fca40a4 Missing strings
f5cc4af Modified strings per ceilingrat's suggestions
a1ead28 Removed unused files
4bfa322 Fixed Save button
c4a98c0 fix failure text box.
71bf953 fix for rare music/base defense bug
d35099a deobfuscate and fix landed ufo behaviour
fdee1b3 fix waypoint logic, further refactor/code cleanup
41bfb66 refactor and code cleanup and bugfix in UFO waypoint selection
f21e038 Split ruleset
16e7bee Merge branch 'master' of github.com:SupSuper/OpenXcom
4376cba Making proper rulesets
f0c1966 Merge branch 'master' into alpha_release
5345583 Merge branch 'master' of github.com:SupSuper/OpenXcom
95e7b10 Merge branch 'master' into alpha_release
fc4413f Merge branch 'master' of github.com:SupSuper/OpenXcom
0dab3e8 Properly fetch stats
138a0a9 Fix diary info window and lists
b9bfbda Fixed a crash when having the highest decoration of a medal
04bd278 Merge branch 'master' of github.com:SupSuper/OpenXcom
63855c4 UFOs now properly display names in the mission log
ae1390b Sprites now scroll with commendation textlist
17b6194 Added fix for HWP in victim race/rank check
8055dc1 Merge branch 'master' into alpha_release
12a345d Merge branch 'master' of github.com:SupSuper/OpenXcom
ffa6b8f Moved sprites
cecdf95 Refactord sprite drawing code into one function
7f6aaf7 Things scroll, but not the sprites
aae8f46 WIP sprites no longer in bigobs
a65b286 WIP
7ffafa3 Name change
0db4d61 Added sprites
1063dd7 Sprite work
65f7113 work with medals
107dc23 Merge branch 'master' of github.com:SupSuper/OpenXcom
3a820f7 Added sprites
709950b Added sprite support
a4b8b65 latest changes
4f8de77 wip
690959f wip
462ef67 MOdular medals
0c4cdde modular medals refactor
a20f4e1 WIP
78d574c Logic problems
479a2e1 Getting empty vectors
eee2043 another fix
09af0c4 missed a spot
232ceae added medals that are only awarded monthly
2287b25 Added more criteria for medals in ruleset
e2ed68f More stats are tracked
3f65c61 Minor tweak
6ce46c2 Created an updateDiary() function
a07fb14 Seems to be working..
8b2e869 WIP
5f5b2d9 Medal descriptions work
7f4e28e Things appear to be working for the most part
e2123b4 Added missing header
6bc6ea4 WIP empty criteria
9ecdbf5 Pointers?\!
69ea8ae Fixed awardCommendations
4e7c6ce WIP stuff
906cbcb Added another medal, testing the waters
38229e9 Added commendation state and first medal
1800099 Updated mod to new code
5dbebbe Fixed a CTD related to mind controlled soldiers
f7d5fcd Fixed indentations and prevented a possible mind control CTD
1787bad Mission UFOs no longer get attributed to terror missions
9de2ba8 Logging stuns now correctly checks to see if a loggable unit did the stunning
b9c5d82 Tracking wounds
2668781 More stats
5850e06 Mission totals and kill totals can be flipped through
05a7057 Split the diary totals into kills and missions
0b0a7ee Soldiers now have diaries
e6ed7ee Merge branch 'master' of github.com:SupSuper/OpenXcom
bbbfd3e Merge branch 'master' of github.com:SupSuper/OpenXcom
7073d10 Merge branch 'master' of github.com:SupSuper/OpenXcom
a73fac6 My project filters
I have 1 week holidays soon... maybe I'll be able to merge...