aliens

Author Topic: Old OXCE+ discussion thread  (Read 305979 times)

niculinux

  • Guest
Re: Meridian's resources and mods for X-PirateZ
« Reply #615 on: May 30, 2016, 06:39:45 am »
I used last mod version, and the last custom Meridian executable. Am i missing something?

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #616 on: May 30, 2016, 10:20:34 am »

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #617 on: June 01, 2016, 06:09:43 pm »
v2016-05-31
  + More performance improvements for item stacker by Stian
  + fix for FOV calculation by Yankes & Stian
  + fix for doubled retaliation checks after dogfight by Yankes

Download: https://drive.google.com/open?id=0B8itkFQbhj-YM1QxSHp4anMzZ2s

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #618 on: June 04, 2016, 12:27:03 pm »
New version is up... my birthday present to you :)

v2016-06-04
  + Added Quick Search, more info: https://openxcom.org/forum/index.php/topic,4520.msg65913.html#msg65913
  (added in research, manufacture, ufopedia, stores, buy, sell, equip craft and inventory)
  + Added more filtering in the New Research screen

Download: https://drive.google.com/open?id=0B8itkFQbhj-YSVdLZTRvY0VSYk0

Please help with testing.
« Last Edit: June 04, 2016, 12:31:00 pm by Meridian »

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #619 on: June 05, 2016, 12:41:09 pm »
Please help with testing.

The Ufopedia quick search doesn't work correctly... I'll fix that tomorrow... others seems to work fine as far as I can say.

EDIT: some random issues with inventory filtering have been reported too...
« Last Edit: June 06, 2016, 08:11:57 pm by Meridian »

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #620 on: June 06, 2016, 08:11:10 pm »
OXCE+ The Devil's Edition (2016-06-06) is out :-)

v2016-06-06
  + fixed quick search in Ufopedia

Download: https://drive.google.com/open?id=0B8itkFQbhj-YSHk3dGpYRHRUaGM

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #621 on: June 15, 2016, 09:02:11 pm »
New version is up:
- small fix in inventory sorting/stacking
- added quick search to Transfer UI

Download: https://drive.google.com/open?id=0B8itkFQbhj-YSklVSEhFLTNteHc

Offline DracoGriffin

  • Colonel
  • ****
  • Posts: 306
    • View Profile
    • Steam: DracoGriffin
Re: Meridian's resources and mods for X-PirateZ
« Reply #622 on: June 16, 2016, 11:54:32 pm »
Pardon my stupidity, but did Commendations/medals ever finally make it into X-PirateZ yet? I figure you're the best one to ask Meridian with all your amazing customization work!

Offline ivandogovich

  • Commander
  • *****
  • Posts: 2409
  • X-Com Afficionado
    • View Profile
    • Ivan Dogovich Youtube
Re: Meridian's resources and mods for X-PirateZ
« Reply #623 on: June 17, 2016, 12:12:41 am »
Pardon my stupidity, but did Commendations/medals ever finally make it into X-PirateZ yet? I figure you're the best one to ask Meridian with all your amazing customization work!

Not yet.  After Extended 3.0 (yankes is still working on it). 

Offline Yankes

  • Moderator
  • Commander
  • ***
  • Posts: 2321
    • View Profile
Re: Meridian's resources and mods for X-PirateZ
« Reply #624 on: June 17, 2016, 12:15:52 am »
Exactly.
I already merged it to my working copy. I want add one or two new features and I will release it. After that Meridian will probably merge it and it will be available for piratez.

Offline Dioxine

  • Commander
  • *****
  • Posts: 5276
  • punk not dead
    • View Profile
    • Nocturnal Productions
Re: Meridian's resources and mods for X-PirateZ
« Reply #625 on: June 26, 2016, 01:50:35 pm »
OXCE 3.0 is out, so I can only hope you'll find time to merge your build with it, Meridian! :) Man, Pirate Diaries! And who knows what else (no OXC changelog easily available for us plebes, sadly...)

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #626 on: June 26, 2016, 02:34:11 pm »
OXCE 3.0 is out, so I can only hope you'll find time to merge your build with it, Meridian! :) Man, Pirate Diaries! And who knows what else (no OXC changelog easily available for us plebes, sadly...)

There were only less than 2 months of OXC dev merged in 3.0, so there's not many changes.
Worth mentioning are only three:

1. SupSuper: merged SoldierDiaries
2. Warboy: modularize unit stat adjustment, using TFTD formula: https://github.com/SupSuper/OpenXcom/commit/5c317ce82dcfdd06d487b9991f56d9b3013e8f99
3. Warboy: make damage range a mod instead of an option: https://github.com/SupSuper/OpenXcom/commit/e98da3a56079a4a450e50fca835e2f8d21ce4a49

Full changelog here if you have time to read Shoes' comments:

Code: [Select]
25edd7b Make globe textures modular
9dd6699 Merge pull request #1076 from NHOrus/underarray
eef37e7 Merge pull request #1074 from NHOrus/debuffer
e485adc Underexposure of random units Size-10 array with 6 elements with only 4 ever accessed was here. Now it isn't May have caused some units to be unseen when they should have been seen.
65a4ebc Add extra error logging
0d69ada Buffer overflow fix
60eb09d Merge pull request #994 from redv/flashing_health_bar
b0431fb Merge pull request #978 from NHOrus/rm-unused-scalers
4a6016f Nah that was a bad idea
384e5da And let's try OSX error dialogs too why not
9576e31 Try to display error dialogs on Linux
b33ee18 It was the Sectoid, with the Candlestick, in the Dining Room. (fix game crashing if a unit died long after its murderer did)
a92aeee fix osd ocd
288488f Merge pull request #954 from redv/fix_fixed_weapon
614783b Dammit MinGW
9c6ed05 Try to expand crash logging to non-Windows platforms
53ebf15 Does it compile yet?
1f5a654 Typo
8484106 Fix case-sensitivity
2099192 Snip
938ebbf Experimental support for Windows crash logging
4d27d12 Merge pull request #1061 from R1dO/wordwrap-indent
274bdd1 Merge pull request #1071 from R1dO/cmake_version_string
d9dbd1c fix broken condition in burnt floor check
e85c48e Remove the starting dot from the git version string upon saving.
14b85e6 Don't store the git specific hash suffix "-g"
abb3368 Fix mods with LOTS OF STUFF showing scrollbars where they're not supposed to be
7eb860e Fix craft land checks
8168b25 Fix modded soldier types in Monthly Costs
15fc970 Merge pull request #1070 from winterheart/ui-fix
d9317ae Merge pull request #1072 from knapsu/ubuntu_nightly
95578a4 Updated package specification files for nightly builds
88b5444 make some adjustments to the AI
c24a686 Describe worktree state in the version string.
71c8d98 Small fix to New research available screen.
015b09b Clean up graph buttons
7621d45 Clean up warnings
d4790fb Merge pull request #1069 from winterheart/cmake-overcompile
4bfa11a Make travis happy.
31fc274 Optimizing cmake building process
62467d1 Use smaller words
a7b0f63 Fix bugs in save converting research/manufacture
00ba092 Load common resources ahead of time.
0af5aea Updated fonts (courtesy of Hythlodaeus)
3006d99 Fix converted altitudes
8c56dbe TFTD save converter
b6f4c57 Cleanup
df69ad8 Fix TFTD typo
ce1c483 Refactor kill tracking to avoid redundancy errors
dec2001 Fix crash when death was too mysterious for the game to handle
ba6a9a8 Improve startup error logging
a79da04 Fix save load crash
e6aece9 Only save current master's mods in savegame mod list
6e9da80 Fix soldier diary UI for translations
5f2d37c Make sure dead soldiers stay dead, even if they died from some freak accident involving getting knocked unconscious and successively being blown to smithereens.
cd56e04 add a little backwards compatibility for saves
374d5d4 Blistering barnacles!
18f2e5e Fix up soldier death pointer shenanigans, save death cause
5c317ce modularize unit stat adjustment, using TFTD formula.
37a1941 More UI fixes
8ef469b Fix battlescape saves being corrupt Fix quicksave in battlescape not working
ea027dc Fix incorrect kill stats
8ee2565 More UI stuff
2b63cb7 Merge pull request #1066 from ajschult/unbroken
92a21c0 Lots of fixes to get things compiling Makefile typos uninitialized variable (Globe.cpp) added parentheses to fix operator order (&& comes before || by default) constructor initializer reordering unused variables signed/unsigned comparisons "narrowing conversion... from ‘double’ to ‘int’ inside { } is ill-formed in C++11" (TransferItemsState.cpp, old issue) and retabbification
ebb4cd2 auto-maximize dogfights over the ocean (where applicable)
6d64843 remove/alter some comments
124034a UI fixes
5dbe0d0 UI fixes
08ffe5b Whoops
dcd7baa Fix up compatibility
647fe7a Remove mod
0f902bc Fix
0c8a8f9 Fix logic holes
b00f61a Revamp diary interface
ea52f1d Refactor unit naming, make strings more mod-agnostic
8ceba02 Clean up streams
b60a92c Clean up enums
b1b2ad1 Add unit names to soldier stats
db9db64 Restore project files
e612a38 Space it out
c46c093 Clean up header files
511a59d Clean up mission strings
263d04f Rulify interfaces
e3e103f Clean up c_str()
9614f07 More string fixes
ec4d2f2 Use enums in diary
6215bf1 Fix up Ufopaedia
90cda8c Move more strings to common
b70b959 Move strings out to common
c96a71d Fix compiler errors
b7fcd71 Merge remote-tracking branch 'Shoes01/alpha_release'
7b6a9aa Reduce confusion
15e7177 fix filename error
4893b55 fix gitbuilder and stitch up more hwp ammo stuff
6b3a258 actually, while i'm messing with debriefing state
de7a9e2 better do the same here too
a78d791 fix ammo counting for HWPs
1870b3f Save loot values to soldier diaries
d7b1207 Track mission loot values
5d394fe Track who last hit a victim and with what, use that to credit sudden deaths (fire, bleed out)
0a67bbe sanitize missionWeights on load
da822a7 fix converted save terror stuff
2a76ca3 i think i need less "ooh" and more "aah"
1a22c16 fix typo
cb2a6d4 fix mind control assisted alien suicide
eb54448 discount grenades at mission transitions
cfdc6d1 Can't forget these!
44a485d Merge branch 'master' into alpha_release
e98da3a make damage range a mod instead of an option.
07196f1 Let wordwrap honor existing indentation.
eb27d9c Merge branch 'master' into alpha_release
7bf59ef Merge branch 'master' into alpha_release
f42ae12 Changed Order of Earth to be awarded for anything that isn't a ufo recovery
27b6b59 Reordered commendations, as per Arthanor's suggestions
2284de2 Some commendations are now only awarded on mission success
ef29aba Fixed width of Mission Details, sorted Psi related stats on kill screen
4460a8c Added Commendations Entries to ufopaedia
60faecc Fixed a crash when MCing XCOM units
14993be Added sanity checks
4541eef Merge branch 'master' into alpha_release
4d5d4d8 Merge branch 'master' of github.com:SupSuper/OpenXcom
02f6d2a Only credit MC kills if the victim was hostile
18bddab Completed psi related commendations
6ec0cd4 Allow alien kills to be tracked
5270143 Fix debug commendation settings
c51c304 Avoid duplicate entries for battle unit kills
6d61321 Correctly display psi attacks in diary mission state
acdb3f3 Added psi related commendations
71cf90a Track psi attacks using kill code
8918d5a Remove duplicated string
37ced61 Track a unit's number of successful psi attacks (no awards yet)
47f9c60 Added Globetrotter award
d8307b2 All dead soldiers displayed in Lost in Service screen
4a5c9e7 Fixed copy paste error
a84ed7b Actually award post mortem medal
bec93d3 Best-of award is only for dead soldiers
7ab8250 Restructure best-of commendation logic
8eb0bf2 Added Martyr Medal
229c534 Moved best-of medal logic out of needless loop
0bab390 Merge pull request #13 from fudgedragon/Shoes01_SoldierDiaries
d75fdaf Merge branch 'master' into SoldierDiaries
6b7b392 Adjusted vcxproj.filters file for consistency and deleted duplicated (and misplaced) sprite
c61856e Merge branch 'master' of github.com:SupSuper/OpenXcom
6c7e01e Rookies don't get best-of awards
0a688d7 Nike and Mercy Crosses only awarded on a mission success
b9a9487 Added sprite
b18de0a Fix lingering visual studio errors/warnings related to merge issues in project files.
be120e3 Merge branch 'master' into Shoes01_SoldierDiaries
ffa89d8 2x faster
3dd97e9 Merge pull request #11 from jgatkinsn/fixcmake
ff1c7c4 Merge pull request #10 from IvanDogovich/AR-ID-Working
c6e23b2 Merge branch 'master' into alpha_release
309b237 Merge branch 'master' of github.com:SupSuper/OpenXcom
45ed984 fix src/CMakeLists.txt to include SoldierDiary code
889fb57 TFTD support
3fdb8e7 blink the health bar when unit has fatal wounds
dfa86bf All new bordered Ufopedia Art
e75ac86 Fixed Medal names
6f9b730 Ok. couple more corrections. XD
296573f One last little niggling punctuation.
fa070ef Final batch of art , activation and Ufopedia strings punctuation cleanup
104372a More art and activations
bc820cd Activating more art
ba1ba5d Ufopedia art - flank and battletypes
5f6b085 MIA UFOpedia String
e492b5a Activating UFOPedia Art
06cc96b New Ufopedia Art - five images
cf7c4cb Clean up double entry on bestsoldier
75a2c29 Assigned Sprite numbers
8e2687d Added Ribbons
e7b80ec more ufopedia strings
e2ec941 Added 4 ufopedia strings
068b9e8 Update Commendations.rul
94a3501 Merge branch 'master' into alpha_release
939cd5a Merge branch 'master' of github.com:SupSuper/OpenXcom
cac12e5 Fixed misaligned text box
9bb05b8 Minor fix
1ec2460 Minor fix
53fd7ee Updating Ruleset
e3aa7db Adding some art assets
241c8bb Renaming Merit Star Ribbon
91b1371 Added infrastructure for martyr commendations
c93eb16 Black Cross is no longer awarded to dead soldiers
fc97cf0 Added MIA commendation
65239c7 Added Lost In Service state
445fdcc Added post humous commeendations for excellent soldiers
0e58cc3 Made fire kill credit smrter
12586b8 Attempted to better track kills by fire
6383f89 Added bravery medal
506efeb Added two medikit related commendations
dc91cf7 Added a stat gain commendation
87377cc Added a commendation for the original 8
b5207c9 Minor edits to Ivan's PR
8987552 Mercy Cross UFOpedia Image and fixed ruleset for
650a905 RuleSet Corrections & Mercy Cross Ribbon
7c739cd Added Mercy Cross UFOPedia text
81cd2b3 Added placeholders to ruleset
2395df0 added placeholders
f3da7c5 Updated ribbons for Sapper and Sectopod
a325280 Merge Sapper and Sectopod Medals
1b598b8 Merge pull request #1 from Shoes01/alpha_release
8b5d5a8 Added a bunch of new commendations, still no art
ccf5942 Added two new commendations
5cea986 Minor fix
ae8897e Made body part and side part of the custom commendation system
fd383d9 Added a healing commendation
b9b82a8 Added flank shot commendation
d8337d5 Fixed the name of a function
5baa9c2 Added rear shot commendation
e41cfc9 Award headshots only on kills
bd871c6 Track body parts shot and side of unit shot
1ca048a Added Mercy Cross
e89285e Fix Nike Cross counting stuns as kills
956510c Merge branch 'master' into ar-yankes
bf17710 Merge branch 'master' of github.com:SupSuper/OpenXcom
f6fc315 Merge of "Commendations" ruleset with UFOPedia
9e16baf UFOPedia Medals
f0b8455 Create deleteme
cec2874 Delete test
388a38a test
17b7485 Delete CommendationsUFOPedia
dc391c3 Create CommendationsUFOPedia
212a572 Scalers: unsued internal functions?
f2c8155 Improv kills are no longer checked for damage type or battle type
eeeec93 Fixed multi criteria awards, thus fixing some erroneous awards
e5c7bcd Made victim race/rank more mod friendly
c50a98d Skipped commendations are properly skipped
472906f Fixed Nike Cross and possibly Valiant Crux by requiring a mission victory before awarding
e283ea5 Merge branch 'master' of github.com:SupSuper/OpenXcom
a873e59 Three translations added
9ddb13f Merge branch 'master' into ar-exp
3396c47 Merge branch 'master' of github.com:SupSuper/OpenXcom
5e4bc5f fixed weapon should be always placed in hand slots
893d44f Fix Iron Man medal
2796383 Merge branch 'master' into alpha_release
2e233a6 Merge branch 'master' of github.com:SupSuper/OpenXcom
32edd21 Fixed Nike Cross medal
186fefb Added sprites for new commendations
5df08d9 Merge branch 'master' into alpha_release
9c70f2b Merge branch 'master' of github.com:SupSuper/OpenXcom
1bf974d Added Nike Cross and Terran Cross commendations
db80e61 Added debug shortcut to clear all commendations
5ae90c4 Merge branch 'master' into alpha_release
80c3daf Merge branch 'master' of github.com:SupSuper/OpenXcom
9a9e4d6 Fixed faulty modular medals
955ed46 Minor diary cleanup
...

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #627 on: June 26, 2016, 02:34:45 pm »
Continuation (too many characters)

Code: [Select]
...
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...

Offline Yankes

  • Moderator
  • Commander
  • ***
  • Posts: 2321
    • View Profile
Re: Meridian's resources and mods for X-PirateZ
« Reply #628 on: June 26, 2016, 03:04:13 pm »
There were only less than 2 months of OXC dev merged in 3.0, so there's not many changes.
Worth mentioning are only three:

1. SupSuper: merged SoldierDiaries
2. Warboy: modularize unit stat adjustment, using TFTD formula: https://github.com/SupSuper/OpenXcom/commit/5c317ce82dcfdd06d487b9991f56d9b3013e8f99
3. Warboy: make damage range a mod instead of an option: https://github.com/SupSuper/OpenXcom/commit/e98da3a56079a4a450e50fca835e2f8d21ce4a49

SoldierDiaries was developed bit more time than 2 months and I merge 500 of 800 commit that difference between OXCE and OXC. This mean that time between merge points are not accurate to measure how much changes goes in (numbers of commits could be screwed too based how many changes go in per commit).
I guess that I pull half of changes from basic version.

Some info about point 3. I was thinking about dropping it completely because I already have same functionality in OXCE. But it would break default compatibility.
Because of that I made that only when weapon have default damage range it will use global values added by Warboy, exception of this is fire damage range that always get it from global range.

Offline Meridian

  • Global Moderator
  • Commander
  • ***
  • Posts: 6286
  • Aaand we're back!
    • View Profile
    • My Wiki
Re: Meridian's resources and mods for X-PirateZ
« Reply #629 on: June 26, 2016, 03:17:15 pm »
SoldierDiaries was developed bit more time than 2 months and I merge 500 of 800 commit that difference between OXCE and OXC. This mean that time between merge points are not accurate to measure how much changes goes in (numbers of commits could be screwed too based how many changes go in per commit).
I guess that I pull half of changes from basic version.

I didn't want to make this sound "small"... I'm sure you went through hell merging all this... just wanted to say that functionality-wise, there are only 3 features a modder can notice, player will notice even less.
In this release, it is definitely your new features that deserve the most attention, not the vanilla stuff.