Commit Graph

14565 Commits (69b9eadb52cf24398d64b6399341d9e6b5d40bdf)
 

Author SHA1 Message Date
Marc Zinnschlag 69b9eadb52 refactored loading of land data 9 years ago
Marc Zinnschlag b3fdf92d2b more const-ness fixes 9 years ago
Marc Zinnschlag febf611c82 made return type of ESMTerrain::Storage::getLand const 9 years ago
Marc Zinnschlag 69045d7ec9 additional safety check for land texture listing merge stage 9 years ago
Marc Zinnschlag b0641934d4 added copy constructor and assignment operator for Land record struct 9 years ago
Marc Zinnschlag 890bbb6b11 merge land texture tables 9 years ago
Marc Zinnschlag b7983d08ba fixed merge stage order; added proper initialisation 9 years ago
Marc Zinnschlag a97a632aa7 merge references tables 9 years ago
Marc Zinnschlag 845cafd61c fixed record state issues after merge 9 years ago
Marc Zinnschlag f95950e8d8 merge referenceables table 9 years ago
Marc Zinnschlag 9cf793c0b5 silenced a warning 9 years ago
Marc Zinnschlag 40753aa9a3 simplifying merge stage 9 years ago
Marc Zinnschlag 16dda281ce made merge operation more fluent 9 years ago
Marc Zinnschlag 103073150e added info tables and pathgrid table to merge operation 9 years ago
Marc Zinnschlag c92898a5bc flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) 9 years ago
Marc Zinnschlag 3902513e65 merge id collections 10 years ago
Marc Zinnschlag 47dd9505a9 copy meta data from game file when merging 10 years ago
Marc Zinnschlag 1b663f01af create merged document and open a view for it (document is still empty at this point) 10 years ago
Marc Zinnschlag d8655f2ff8 forgot to connect merge operation signals 10 years ago
Marc Zinnschlag e2377396a7 inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan) 10 years ago
Marc Zinnschlag 904ad94952 added merge operation (doesn't do anything yet) 10 years ago
Marc Zinnschlag 708cacdec4 disable merge menu item when a merge is already in progress 10 years ago
Marc Zinnschlag 4fd3097c1c improved adjuster widget problem reporting 10 years ago
Marc Zinnschlag b83f9445a9 added UI for merge tool (merge tool itself is still missing) 10 years ago
Marc Zinnschlag 9ee3f1bfe7 Merge remote-tracking branch 'slothlife/moon-settings' into mergetool 10 years ago
slothlife 0244a9b329 Correct moon texture with respect to trajectory 10 years ago
Marc Zinnschlag 9392e426c0 Merge remote-tracking branch 'origin/master' into mergetool 10 years ago
Marc Zinnschlag 15e8275443 Merge remote-tracking branch 'slothlife/moon-settings' into mergetool 10 years ago
scrawl 7644a46ded Creatures with no movement should not attempt to start combat (Fixes #2786) 10 years ago
scrawl f326b8e5d2 Fix weapon animations playing on the lowerbody when swimming 10 years ago
scrawl e8cbdcfb1e Play swimming animation fallback on the upper body when possible 10 years ago
scrawl 1f755a2bc0 Don't use a shared Material in AlphaFader 10 years ago
scrawl 16b8ef3164 Don't use a shared Material in MaterialColorController 10 years ago
scrawl de479e35c8 Fix AlphaController affecting all instances of the StateSet 10 years ago
slothlife 67a63cc662 Add some const correctness to MoonModel 10 years ago
scrawl a391579382 Merge pull request #700 from ace13/osg-3.3.3-fixes
Fix OSG 3.3.3+ build issue
10 years ago
Alexander "Ace" Olofsson 1f78ebd3c9 Oops? 10 years ago
Alexander "Ace" Olofsson 77a3a52b4e What's wrong with this statement? 10 years ago
Marc Zinnschlag 6a9218ee07 replaced State_Compiling (not requried anymore) with State_Merging 10 years ago
Alexander "Ace" Olofsson e9ffbcc1b0 OSG 3.3.3 moves GL extensions out of osg::Texture 10 years ago
Marc Zinnschlag d310753e0f Merge remote-tracking branch 'origin/master' 10 years ago
Marc Zinnschlag 26ea3aa1ad Merge remote-tracking branch 'dteviot/refactoringAiWander' 10 years ago
slothlife a4e1630ec2 Remove unreferenced member in MoonModel 10 years ago
slothlife 8dc7e158c6 Fix forward declaration of MoonState 10 years ago
slothlife 24ba54f4fe Implement accurate moon settings (fixes #672) 10 years ago
scrawl 5d3ad13868 Merge pull request #696 from EmperorArthur/verbose_errors
Be more descriptive when the NIF loader does not handle something.
10 years ago
Marc Zinnschlag be1692f218 Merge remote-tracking branch 'origin/master' 10 years ago
Marc Zinnschlag 20106bb90f allow keywords in quotes (Fixes #2794) 10 years ago
Arthur Moore 2d93a6f6cb Be more verbose when dealing with unhandled nif texture properties 10 years ago
scrawl d7ad0ee148 Print a sensible error message when S3TC support is missing (Fixes #2800) 10 years ago