teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
8065 commits 34 branches 0 tags 66 MiB
Commit graph

5864 commits

Author SHA1 Message Date
Marc Zinnschlag
74cee66273 consolidated magic numbers for button size 2013-10-07 11:24:53 +02:00
Marc Zinnschlag
4d6c3cdf09 removed more garbage 2013-10-07 08:55:04 +02:00
graffy76
4c72a9ffdf Fixed non-loading files 2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4 Implemented profile function in launcher datafiles page 
Implemented dependency sorting to ensure dependent files appear latest
in the list.
 2013-10-06 21:13:47 -05:00
Jordan Ayers
6303e56ce4 Magic Effect Display cleanup: Don't put spaces in percentages. 2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e Magic Effect Display improvement. 
Related to Bug #794.
Always show one decimal point precision for Fortify Max. Magicka effect.
 2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16 Magic effect display improvement. 
Related to Bug #794.
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
 2013-10-06 19:32:40 -05:00
Emanuel Guevel
2abe5c1c9a Acrobatics: do not apply fall damages when slowfalling spell effect is active 
If spell effect ends up in mid-air, calculate fall height from then.
 2013-10-02 23:34:25 +02:00
Emanuel Guevel
4265dddc40 Add MWWorld::isSlowFalling(Ptr) 2013-10-02 23:34:25 +02:00
Emanuel Guevel
6e09a5fb4a Acrobatics: reinit fall height at current height rather than zero 
To prevent problems.
 2013-10-02 23:34:25 +02:00
Emanuel Guevel
2b992ef3b5 Acrobatics: use calculated fatigueTerm 2013-10-02 23:34:24 +02:00
Emanuel Guevel
4c151e59a2 Acrobatics: do not touch modified stats 2013-10-02 23:34:24 +02:00
Emanuel Guevel
4860514865 Acrobatics: cosmetic changes 2013-10-02 23:34:24 +02:00
mckibbenta
857deb3723 Merge branch 'master' into tgm 2013-10-02 13:54:03 -04:00
mckibbenta
073f64c8bb stop weapon condition degredation (for the player) with tgm on 2013-10-02 13:46:33 -04:00
Emanuel Guevel
496f786c2a Implement Disable/EnableLevitation script functions 
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
 2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad
f1b4c2e400 Fixed first person offset to use world transform 
It slipped my mind that some necks might not be perfectly vertical.
 2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad
ed0c31b485 Refactored, moved logic out of NpcAnimation 
The logic is now handled by RenderingManager, and Camera sets its
animation's first person offset height. Due to how NpcAnimation seems to
be updated, it has to be the one to actually set its own nodes, in the
case of the hands. Otherwise, the hands would not move without a messier
hack.
 2013-10-02 05:16:52 -04:00
graffy76
a5a0f61533 Fixed missing profiles combobox 2013-10-01 22:36:49 -05:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 2013-10-01 21:29:45 -05:00
Emanuel Guevel
b8c60dabb3 Reintroduce Acrobatics changes made by Glorf 
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
 2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad
0ddb5097fc Revert "Bug #840, First Person Sneaking Camera Height" 
This reverts commit 296abfd48f.
 2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad
296abfd48f Bug #840, First Person Sneaking Camera Height 
Also, added comments to existing code in the area.
 2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad
4496244b14 Tabs to spaces 
My own code uses only tabs - I forgot to change the setting on my IDE,
sorry!
 2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad
eae02ea00d Cleaned up my hackish code for WinMain 2013-09-30 03:33:31 -04:00
Alex "rainChu" Haddad
00a776a1a8 Fixed compilation failure on my machine 
Fixed shared records not being populated before the player record is
moved.
 2013-09-30 02:54:20 -04:00
greye
4cdb57e388 workaround segfault on --new-game switch 2013-09-30 10:30:40 +04:00
Alex "rainChu" Haddad
bffbfff41c My own fix to make it hackily compile 2013-09-30 00:32:06 -04:00
graffy76
24b167b755 Implemented ContentSelector as a singleton "charm" modifier for 
FileDialog...
 2013-09-29 12:19:07 -05:00
Tom Mason
dd0a416249 cleaned up bloodmoon_fix_ini 2013-09-29 16:59:52 +01:00
Tom Mason
fd169c2399 fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder 2013-09-29 15:49:47 +01:00
Lukasz Gromanowski
ef617d408b Issue #913: Merge --master and --plugin switches 
Merged master/plugin switches in launcher.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-09-29 09:14:40 +02:00
Lukasz Gromanowski
9c2145eda1 Issue #913: Merge --master and --plugin switches 
Merged master/plugin switches into content in openmw
and mwiniimporter.

Extension in content files is now required.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-09-29 09:11:57 +02:00
Marc Zinnschlag
7be1f1afc2 implemented SceneToolMode as a horizontal panel with radiobutton-type buttons 2013-09-28 13:10:42 +02:00
Marc Zinnschlag
0c5f07a65a added SceneToolMode class 2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4 added scene toolbar buttons (still not doing anything) 2013-09-28 11:06:56 +02:00
Marc Zinnschlag
9ea092927f added basic scene subview (no functionality yet) 2013-09-28 09:25:54 +02:00
Marc Zinnschlag
6143ec33e0 giving Documents direct access to ConfigurationManager 2013-09-27 15:24:58 +02:00
Marc Zinnschlag
e7c48cbe58 load project files 2013-09-27 15:04:30 +02:00
Marc Zinnschlag
62148b3247 moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase 2013-09-27 15:04:09 +02:00
Marc Zinnschlag
baae548106 added project scope filter saving 2013-09-27 13:56:40 +02:00
Marc Zinnschlag
6ac4dedfbe added missing column enum 2013-09-27 13:56:23 +02:00
Marc Zinnschlag
31346dde58 fixed uninitialise scope value for filters 2013-09-27 13:55:28 +02:00
Marc Zinnschlag
6f2c418a5c (slightly) improved error reporting during save operations 2013-09-27 13:54:51 +02:00
Marc Zinnschlag
23095ec3ec added missing scope column to filter table 2013-09-27 13:54:21 +02:00
Marc Zinnschlag
5779f799ab create project file when saving content file 2013-09-27 11:36:06 +02:00
Marc Zinnschlag
1363e86828 made verifier ignore deleted records 2013-09-27 10:08:09 +02:00
Marc Zinnschlag
96fd1c35bf preserve author/descriptin meta data 2013-09-24 17:17:01 +02:00
Marc Zinnschlag
830530bd06 set record count in TES3 header 2013-09-24 17:08:24 +02:00
Marc Zinnschlag
e4fdebc85b added saving for referenceable records 2013-09-24 13:53:19 +02:00
Marc Zinnschlag
c42e74dadf make 4 byte record type accessable from record struct 2013-09-24 13:17:28 +02:00
graffy76
3b40192e90 Merge branch 'master' into esxSelector 2013-09-23 22:03:42 -05:00
Marek Kochanowicz
ae5e8b95ff Solving Issue912 2013-09-23 20:12:04 +02:00
Marc Zinnschlag
0f1c4cb00e cleanup 2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c Switched to using proper enums as opposed to ints. 2013-09-23 08:31:36 -04:00
graffy76
d7cff6361e Fixed filter issue (all addons for a gamefile are enabled for checking). 
Note:  Other dependencies are not yet automatically selected when an
addon is checked.
 2013-09-23 06:51:49 -05:00
Berulacks
0c518fb047 Replaced tabs with spaces. 2013-09-23 07:36:50 -04:00
Berulacks
c423479f20 Fixed bug #887 2013-09-23 07:31:14 -04:00
Marc Zinnschlag
6d9ff39390 set dependencies when saving (requires further refinements) 2013-09-23 12:16:56 +02:00
Marc Zinnschlag
74d683b530 fixed save path for newly created addons 2013-09-23 11:58:11 +02:00
Marc Zinnschlag
63e0cf5154 fixed missing initialisation of adjuster widget in file dialogue 2013-09-23 11:26:29 +02:00
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e Implemented file/adjuster widgets into new addon creation dialog 2013-09-22 23:52:53 -05:00
Marc Zinnschlag
a6ea670255 use IdTypeDelegate in report table 2013-09-22 13:54:01 +02:00
Marc Zinnschlag
1c4a4b4f26 generalised RefIdTypeDelegate into IdTypeDelegate 2013-09-22 13:39:44 +02:00
Marc Zinnschlag
f2875e234c added missing position columns to reference table 2013-09-22 10:43:09 +02:00
graffy76
70ac14b8ba Merge branch 'master' into esxSelector 2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
Marc Zinnschlag
94bb97e766 replacing tabs with spaces 2013-09-21 08:40:00 +02:00
Marc Zinnschlag
96b181bb54 Merge remote-tracking branch 'xethik/master' 2013-09-21 08:07:00 +02:00
Xethik
094e4d93b7 Generally speaking, you should never compare iterators from two different compilers 
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
 2013-09-20 21:38:10 -04:00
Xethik
58bb0b8773 Bug #907 
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
 2013-09-20 21:26:12 -04:00
graffy76
7b7dfa122d Merge branch 'master' into esxSelector 2013-09-19 16:24:28 -05:00
Marc Zinnschlag
99fe6e68c7 Merge remote-tracking branch 'mckibbenta/tgm' 2013-09-19 15:14:35 +02:00
Marc Zinnschlag
8d4f4e395f update syntax highlighting when ID list changes 2013-09-19 14:26:09 +02:00
Marc Zinnschlag
ba5e2a0330 changed ID listing to include deleted records by default 2013-09-19 13:42:19 +02:00
Marc Zinnschlag
9c751ae370 separate highlight colour for IDs 2013-09-19 12:30:42 +02:00
Marc Zinnschlag
3d2281fe80 added signals and functions to Data for handling ID list changes 2013-09-19 12:11:27 +02:00
Marc Zinnschlag
78f7f80fc3 configured script highlighting with extensions 2013-09-19 08:58:27 +02:00
graffy76
0eb06ada39 Implemneting drag and drop 2013-09-18 02:36:23 -05:00
scrawl
d5ef843f56 Fix a missing model update 2013-09-16 19:22:08 +02:00
Marc Zinnschlag
acfd78c62a implemented saving for all supported record types except cells, referencables and references 2013-09-16 14:17:04 +02:00
Marc Zinnschlag
03054c8160 forgot to write record ID 2013-09-16 14:10:05 +02:00
Marc Zinnschlag
bf0fba68af added save stage for globals 2013-09-16 12:51:57 +02:00
mckibbenta
6bb6ba6372 added god mode comment 2013-09-15 16:12:59 -04:00
mckibbenta
3035675a26 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-09-15 15:49:18 -04:00
mckibbenta
644f081c60 minor changes 2013-09-15 15:48:32 -04:00
Marc Zinnschlag
db70095148 write TES3 header 2013-09-15 15:31:44 +02:00
Marc Zinnschlag
231419028d minor fix 2013-09-15 15:03:17 +02:00
Marc Zinnschlag
fa25a068a8 basic saving (no data is written to file yet) 2013-09-15 15:00:41 +02:00
Marc Zinnschlag
8326ac9b6f replaced dummy save implementation with a threaded dummy save implementation 2013-09-15 12:53:59 +02:00
Marc Zinnschlag
d71d282952 more Operation enhancements in preparation for save operation 2013-09-15 12:03:36 +02:00
Marc Zinnschlag
414e6abb95 more signal cleanup 2013-09-15 11:35:12 +02:00
Marc Zinnschlag
a5aebfb760 minor cleanup 2013-09-15 09:32:20 +02:00
mckibbenta
c9f1bd8735 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-09-14 16:38:46 -04:00
Marc Zinnschlag
b7bffc8a79 removed Verifier class (using Operation class without subclassing now) 2013-09-14 15:16:31 +02:00
Marc Zinnschlag
f4c03c6a29 added ordered-flag to Operation (currently ignored) 2013-09-14 15:12:24 +02:00
Marc Zinnschlag
077a157841 moved Operation and Stage from model/tools to model/doc 2013-09-14 14:56:23 +02:00
Marc Zinnschlag
c961abce96 added warning message to startup window 2013-09-14 14:00:07 +02:00
Marc Zinnschlag
9637e1641b fix for building with system tinyxml 2013-09-14 13:33:49 +02:00
Marc Zinnschlag
07ff0a8de9 possible build fix for Windows 2013-09-12 20:52:05 +02:00
Marc Zinnschlag
bf8a25c2c6 Merge remote-tracking branch 'mckibbenta/tgm' 2013-09-12 19:07:35 +02:00
mckibbenta
89b7d6121d Initial toggleGodMod/tgm instruction. Currently only affects player health. 2013-09-12 08:30:00 -04:00
mckibbenta
85b8af6262 Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-09-12 08:08:07 -04:00
scrawl
09e692f1f6 Fixed polish font 2013-09-10 22:11:57 +02:00
Marc Zinnschlag
554c44892a Merge branch 'newgame' 2013-09-10 16:45:09 +02:00
Marc Zinnschlag
e9f14449eb added AdjusterWidget 2013-09-10 16:45:01 +02:00
Marc Zinnschlag
2dc3c0ae4f integrated startup icons 2013-09-09 09:41:43 +02:00
Marc Zinnschlag
25b7cd33ea added FileWidget; fixed OpenCS configuration 2013-09-08 14:31:20 +02:00
Marc Zinnschlag
ecedb60169 splitting new game and new addon functions (new game currently not working) 2013-09-08 12:06:28 +02:00
Marc Zinnschlag
f7940d7d1a focus load document button by default in startup window 2013-09-08 11:24:06 +02:00
Marc Zinnschlag
2d9e9fe3e1 Merge branch 'startup' 2013-09-08 09:34:41 +02:00
Marc Zinnschlag
cae5eb424d cleaned up opening the settings dialogue from a view 2013-09-08 09:33:45 +02:00
Marc Zinnschlag
efdf2961f0 open user settings dialogue centered 2013-09-08 09:28:43 +02:00
Marc Zinnschlag
0e81fb32dd hooked up edit config signal from startup window 2013-09-08 09:26:43 +02:00
Marc Zinnschlag
17bf7e59a4 added proper startup dialogue (still missing icons) 2013-09-08 09:15:26 +02:00
graffy76
a6e7cf9a8c Implementing drag and drop 2013-09-07 15:57:40 -05:00
Tom Mason
7b9c5c75e7 silenced unshield 2013-09-07 16:16:09 +01:00
Tom Mason
2b50e34566 Fixed issue with copy_file 
from: https://forum.openmw.org/viewtopic.php?f=20&t=1718&hilit=0.26&start=50#p18705
 2013-09-07 15:41:51 +01:00
Marc Zinnschlag
9b7cd5958f Merge remote-tracking branch 'scrawl/master' 2013-09-07 08:23:25 +02:00
scrawl
10c21579bc Item stacking case sensitivity fix 2013-09-07 01:00:38 +02:00
Marc Zinnschlag
3d66f7521e Merge remote-tracking branch 'marcrbouvier/master' 2013-09-06 08:44:59 +02:00
Marc Bouvier
784cba21f2 [Feature #881] Change Tabs to Spaces 
Some of the tabs were not made of spaces, so Git defaults tabs to the
length of 8 spaces. OpenMW uses 4 spaces per tab.
 2013-09-05 23:02:51 -05:00
Marc Zinnschlag
dc345dd43d Merge branch 'filter' 2013-09-05 15:47:52 +02:00
Marc Zinnschlag
8f0ab29a9f allow the use of keywords for strings without quotation marks 2013-09-05 15:47:38 +02:00
Marc Zinnschlag
645b50ef36 added support for half-sided intervals to filter parser 2013-09-05 15:38:28 +02:00
Marc Zinnschlag
f3ce9c22a1 rewrote value node to support half-sided intervals (meaning infinity or -infinity for the missing half) 2013-09-05 15:22:14 +02:00
Marc Zinnschlag
9332684335 allow the use of value types in string filters 2013-09-05 15:05:49 +02:00
Marc Zinnschlag
f2e86e860e allow the use of record types in string filters 2013-09-05 14:39:56 +02:00
Marc Zinnschlag
8bebe7179c some UniversalId fixes 2013-09-05 13:58:36 +02:00
Alexander "Ace" Olofsson
5e42c73356 Better fix for unshield, comments on changes, no more commented out code. 2013-09-05 10:39:17 +02:00
mckibbenta
ae02499eff Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-09-04 21:15:44 -04:00
Alexander "Ace" Olofsson
22a5f7198f A few fixes to build on Windows 2013-09-04 23:25:47 +02:00
Marc Zinnschlag
842a616909 more cleanup 2013-09-03 14:18:34 +02:00
Marc Zinnschlag
6cd7da6547 Merge remote-tracking branch 'marcrbouvier/master' 2013-09-03 13:47:07 +02:00
Marc Bouvier
6b11f59ed4 [Feature #881] Rename QLocalServer 
The server name should be more unique to the project so there isn't a
interprocess clash.
 2013-09-03 06:24:11 -05:00
Marc Zinnschlag
80f8024da7 allow specifying record modification status column enum via strings 2013-09-03 13:03:02 +02:00
Marc Zinnschlag
f80373a849 removed two unused files 2013-09-03 12:53:45 +02:00
Marc Zinnschlag
1744a64f77 in filters allow specifiying boolean columns as strings 2013-09-03 12:32:06 +02:00
Marc Bouvier
0ae2bb2fae [Feature #881] Code Formatting 
Code formatted to the OpenMW policy.
 2013-09-03 05:22:48 -05:00
Marc Bouvier
563bd0b430 [Feature #881] Raise OpenCS New Window After Re-execution 
The OpenCS startup window of the existing exist is raised when trying to
start a new instance. This is done by the new instance connection to the
existing instance's QLocalServer. Once the connection is established the
existing instance raises the startup window.
 2013-09-03 04:12:19 -05:00
Marc Bouvier
51332b86a1 [Feature #811] Only 1 Instance of OpenCS is Allowed 
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
 2013-09-03 01:44:21 -05:00
mckibbenta
e545f49807 Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-09-02 18:40:37 -04:00
Marc Zinnschlag
9cb121bd04 allow specifying enums as text in filters 2013-09-02 12:23:19 +02:00
Marc Zinnschlag
649ef6f120 moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now) 2013-09-02 11:58:05 +02:00
Marc Zinnschlag
e03de11fa8 Merge remote-tracking branch 'corristo/master' 2013-09-02 10:57:01 +02:00
Marc Zinnschlag
7076ea9467 Merge remote-tracking branch 'scrawl/map' 2013-09-02 10:55:12 +02:00
Marc Zinnschlag
5f380bc085 Merge remote-tracking branch 'lgro/unittests' 2013-09-02 10:54:51 +02:00
Nikolay Kasyanov
f9cfe654f2 Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154 
(Qt redefines min OS X version and SDL in turn checks this version and
doesn't accept version set by Qt)
 2013-09-01 23:17:41 +04:00
scrawl
3ddeb075fb Fix a cell border seam on the map 2013-08-31 04:36:23 +02:00