mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 21:49:55 +00:00
Code Issues Releases Wiki Activity
22041 commits 38 branches 54 tags 122 MiB
Commit graph

1557 commits

Author SHA1 Message Date
Kyle Cooley
492b99b008 Transparent object markers 2017-11-07 00:41:27 -05:00
Marc Zinnschlag
0b163f0a50 Merge remote-tracking branch 'aesylwinn/forceNewProject' 2017-10-19 14:44:30 +02:00
Marc Zinnschlag
bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 2017-10-19 14:24:58 +02:00
Kyle Cooley
6d8666d80d Force new project file when creating new project 2017-10-18 20:21:44 -04:00
Kyle Cooley
6d7a24224b Add documentation. 2017-10-16 12:52:13 -04:00
Kyle Cooley
11eae16645 Get rid of duplicate function, fix flag checking 2017-10-14 15:09:12 -04:00
Kyle Cooley
d27071f06a Fix LTEX import bug. 2017-10-14 13:18:54 -04:00
Kyle Cooley
98c38ad7d1 Merge cleanup. 2017-10-14 13:18:31 -04:00
Kyle Cooley
6d9d98c02c Merge Land/LandTextures 2017-10-14 11:32:42 -04:00
Kyle Cooley
b14404e9cc Fix region colors 2017-10-06 20:05:06 -04:00
Marc Zinnschlag
dd17f70068 Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
Kyle Cooley
2f5449a68c Remove now unnecessary overrides. 2017-10-02 16:13:40 -04:00
Kyle Cooley
137ea872d3 Hide base land textures. 2017-10-02 15:56:22 -04:00
Kyle Cooley
dfcbee3ab1 Ignore case when comparing textures, also add new textures to lookup map. 2017-09-30 00:04:52 -04:00
Kyle Cooley
1fe1ec63c4 Fix Qt4 build 2017-09-22 23:33:50 -04:00
Kyle Cooley
3981f79d38 Change flag for base land textures 2017-09-22 22:59:50 -04:00
Kyle Cooley
054e6a780e Use map for texture lookup. 2017-09-22 22:43:45 -04:00
Kyle Cooley
4921e7f5c1 Get rid of reinterpret cast. 2017-09-22 22:42:09 -04:00
Kyle Cooley
50d9d9f78f Get rid of some templates, exceptions instead of assert, and other small changes. 2017-09-17 20:29:51 -04:00
Marc Zinnschlag
9a8a4c744f Merge remote-tracking branch 'capostrophic/controlplus' 2017-09-11 10:46:34 +02:00
Capostrophic
97ff24b8d6 Change ctl to ctrl in OpenMW-CS shortcut manager 2017-09-10 20:48:09 +03:00
Kyle Cooley
25d4a0370f Changes to land data access in tables, also update Land once per frame in scene view. 2017-09-09 15:37:52 -04:00
Kyle Cooley
d030b595f8 Fix potential segfault, cleanup, get rid of warnings. 2017-09-09 11:48:13 -04:00
Kyle Cooley
72cb405de2 Some bug fixes, changes to land load code. 2017-09-08 21:03:52 -04:00
Kyle Cooley
ab607f3028 Tweaks to land loading, land cloning, terrain signals, placeholder land update handling 2017-09-08 00:51:46 -04:00
Kyle Cooley
99e90ef808 Cleanup. Also modify ltex index generation. 2017-09-05 19:29:07 -04:00
Kyle Cooley
97d0fd756a LTEX importing 2017-09-04 19:31:09 -04:00
Kyle Cooley
5c3e90da88 Fix includes 2017-09-04 15:14:42 -04:00
Kyle Cooley
90c485104a Land creator 2017-09-04 01:06:58 -04:00
Kyle Cooley
7cc95a11a4 Add more land table columns 2017-09-03 20:00:19 -04:00
Kyle Cooley
1d480015b4 Add ability to touch records, LAND records in particular 2017-08-31 22:09:49 -04:00
Kyle Cooley
9e41f1340a Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture 2017-08-31 22:09:49 -04:00
Kyle Cooley
5d14a2afcc Initial LTEX/LAND tables 2017-08-31 22:09:49 -04:00
Kyle Cooley
157ecb166c Fix wrong folder name 2017-08-23 00:02:02 -04:00
Kyle Cooley
8c4b12a603 VFS changes, one VFS and resource system per document. 
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
 2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211 Code cleanup and more cache clearing 2017-08-21 18:58:38 -04:00
Kyle Cooley
d7744e8b16 A bit of cleanup 2017-08-20 19:07:23 -04:00
Kyle Cooley
5950b26912 Update scene assets 2017-08-19 19:36:45 -04:00
Kyle Cooley
742bd00ec6 Clear cached resources 2017-08-19 15:26:46 -04:00
Kyle Cooley
d31ed83b54 Preliminary asset reloading 2017-08-19 03:43:31 -04:00
Rob Cutmore
3fb7c42845 Editor: Use colour field for cell map colour 2017-07-25 19:11:47 -04:00
PlutonicOverkill
16be1e1a84 Fix occurrence highlighting preferences panel 2017-07-23 20:29:42 +12:00
Bret Curtis
c781d1f8ed purge unnecessary imports 
add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back

add fstream back
 2017-06-09 19:08:53 +02:00
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b remove more unused imports, including boost headers 2017-06-09 19:08:53 +02:00
Bret Curtis
39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required 
put boost system back in, clean others up

revert Qt

add back boost fstream
 2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
PlutonicOverkill
7281e8b888 Remove C++11 features 2017-05-12 12:48:25 +12:00
PlutonicOverkill
16f8341de3 Prevent context menu appearing for modifier settings 2017-05-10 21:24:12 +12:00
PlutonicOverkill
c2f427f48d Prevent context menu appearing when right-clicking shortcut setting 2017-05-10 20:43:52 +12:00
PlutonicOverkill
30af92f575 Fix pointer initialisation bug 2017-05-09 20:58:32 +12:00
PlutonicOverkill
3545cfa00a Rewrite feature to reset options to default 2017-05-09 19:50:16 +12:00
PlutonicOverkill
f30d1a3075 Revert everything 2017-05-08 17:24:28 +12:00
PlutonicOverkill
418aeb65f1 Remove unneeded dependencies 2017-05-07 16:58:15 +12:00
PlutonicOverkill
5fca37d0c8 Forgot to remove debugging code 2017-05-07 16:54:38 +12:00
PlutonicOverkill
dff3828710 Keep the settings page in sync with the real settings 2017-05-07 16:51:11 +12:00
PlutonicOverkill
64879c03e4 Add option to reset settings to default 2017-05-06 20:18:31 +12:00
PlutonicOverkill
95f60d2bb3 Merge branch 'master' into mark-variable 2017-04-28 20:15:48 +12:00
PlutonicOverkill
cbb2b8b119 Add setting so feature can be turned off 2017-04-28 19:57:49 +12:00
PlutonicOverkill
a8e7628e83 Enable highlighting when cursor is placed over a name (script editor) 2017-04-28 19:28:05 +12:00
PlutonicOverkill
3d1e640388 Add setting to change keyboard shortcut and fix another crash 2017-04-26 19:42:03 +12:00
FedeWar
e9076088ca Another tab fix 2017-02-21 11:51:11 +01:00
FedeWar
4e7f7cf84f Fixed tabs 2017-02-21 11:49:04 +01:00
FedeWar
370c12e78a Verification results are ordered by Type in alphabetical order. 2017-02-21 11:15:53 +01:00
MAtahualpa
fb8a2093cd Replace "Female" check box with a combo box, part 2/2 (fixes #3757) 
Replaces the "Female" check box in BodyPart records with a "Gender" combo box. This is the second of two related fixes, the first one covering NPC records.

Related issue:
- Fixes #3757: Editor: Replace "Female" check box in BodyPart records with "Gender" combo box (https://bugs.openmw.org/issues/3757)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several BodyPart records.
 2017-02-18 15:40:07 +01:00
MAtahualpa
520e82ed4f Fix for commit "affc0eb..." in PR 1216 (fixes #3756) 
Fixed use of tab character.
 2017-02-17 17:54:38 +01:00
MAtahualpa
affc0eb37f Replace "Female" check box with a combo box, part 1/2 (fixes #3756) 
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.

Related issue:
- Fixes #3756: Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
 2017-02-17 17:05:46 +01:00
MAtahualpa
dab8b328c4 Replace light emitter check boxes with a combo box (fixes #3752) 
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.

Related issue:
- Fixes #3752: Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
 2017-02-16 12:48:47 +01:00
MAtahualpa
7be46eb1f0 Fix for commit "d4972ab..." in PR 1208 (fixes #3751) 
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
 2017-02-16 00:08:38 +01:00
MAtahualpa
d4972ab166 Replace "Xyz blood" check boxes with a combo box (fixes #3751) 
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Related issue:
- Fixes #3751: OpenMW-CS: Replace "Xyz Blood" check boxes in NPC and Creature records with "Blood Type" combo box (https://bugs.openmw.org/issues/3751)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC and Creature records. Please note that this fix also prevents users from erroneously assigning two blood types at the same time. (I don't know which one would prevail in that case.)
 2017-02-15 23:06:36 +01:00
Marc Zinnschlag
e46fb1770c Merge remote-tracking branch 'matahualpa/openmw-cs_booktype' 2017-02-15 19:47:39 +01:00
MAtahualpa
2c34a8706b Replace "Scroll" check box with a combo box (fixes #3748) 
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
 2017-02-15 18:59:55 +01:00
MAtahualpa
607bd8b853 Replace "Scroll" check box with a combo box (fixes #3748) 
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.

Related issue:
- Fixes #3748: OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748)

Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
 2017-02-14 11:48:37 +01:00
scrawl
ddd6605608 Move WNAM out of LandData to avoid redundant (de)allocations on startup 2017-02-14 07:58:16 +01:00
MAtahualpa
c5dcfe0794 Update refidadapterimp.cpp 
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
 2017-02-12 13:50:58 +01:00
MAtahualpa
6587880171 Update refidcollection.cpp 
Makes Book records display skill IDs instead of attribute IDs for teached skills.
Related issue:
- Bug #3746: OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry.
 2017-02-12 13:03:37 +01:00
Marc Zinnschlag
34389e15cd Merge remote-tracking branch 'origin/master' 2016-12-16 12:28:22 +01:00
Marc Zinnschlag
827c78a4cd added text column to ref id table (books) 2016-12-16 12:28:09 +01:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
scrawl
e5cb7306c3 Merge pull request #1115 from Allofich/conversion 
Fix narrowing conversion warning
 2016-10-30 19:26:51 +01:00
Allofich
68ed264f40 Fix narrowing conversion warning 2016-10-31 00:53:17 +09:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
Allofich
ccacad51be Fix shadowing warnings 2016-10-16 01:34:54 +09:00
Allofich
1c54f54ab8 Fix shadowing warnings 2016-10-15 00:12:46 +09:00
MiroslavR
53b006eccb OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification (Fixes #3564) 2016-10-11 19:36:44 +02:00
MiroslavR
8be8c7ca66 OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564) 2016-10-11 02:55:17 +02:00
Aesylwinn
b899d43a33 Allow base plugins to overwrite referencables made in other base plugins. 2016-09-24 16:45:08 -04:00
Marc Zinnschlag
48c257b939 Merge remote-tracking branch 'aesylwinn/ContentNumberFix' 2016-09-06 15:48:05 +02:00
Aesylwinn
fab7549b42 Fix windows path issue in editor debug run. 
- The problem was caused by spaces in the data directory
 2016-09-03 17:49:49 -04:00
Marc Zinnschlag
316cf40f12 Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation' 2016-09-01 11:51:34 +02:00
Aesylwinn
c0d53a2557 Fix CellRefs being teleported from interior to exterior cells. 2016-08-31 11:02:04 -04:00
Aesylwinn
b2ddd3c259 Initialize with correct content file number instead of correcting at save stage. 2016-08-30 16:42:38 -04:00
Aesylwinn
3ae2fc17c6 Fix some issues with content file numbers in the editor. 
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
 2016-08-29 18:06:56 -04:00
Aesylwinn
91fd966146 Fix some issues detected by coverity for the editor. 2016-08-18 12:42:35 -04:00
Aesylwinn
7125775648 Change free axis rotation. 2016-08-15 15:07:43 -04:00
LohikaarmeHAV
19c74a4d6e Part two 2016-08-03 20:39:46 +03:00
LohikaarmeHAV
7309be8592 First part 2016-08-03 20:20:55 +03:00
LohikaarmeHav
c6ec473280 Camera reset now every time cell object->view is pressed. 2016-08-02 13:46:43 +03:00
Aesylwinn
bf2ab4ed45 Change the way modifiers are handled so they can be shared. 2016-07-31 16:07:17 -04:00