mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 06:15:32 +00:00
Code Issues Releases Wiki Activity
14086 commits 38 branches 54 tags 122 MiB
Commit graph

2303 commits

Author SHA1 Message Date
Marc Zinnschlag
35c4af9476 added copy constructor and assignment operator for Land record struct 
(cherry picked from commit b0641934d4)
 2015-11-01 13:40:32 +11:00
scrawl
05fd4e123e Use the format field instead of version field 
(cherry picked from commit a081d402c5)
 2015-10-25 11:35:32 +11:00
scrawl
b9ba1067bf Savegame loading optimization 
(cherry picked from commit 4637750601)
 2015-10-25 11:35:15 +11:00
scrawl
f8f66bffb0 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-09-08 06:40:06 +10:00
Marc Zinnschlag
c157fef2e0 allow use of IDs as function arguments, even if the ID matches a keyword (Fixes #2830) 2015-09-08 06:01:47 +10:00
cc9cii
2242920b85 Fix compiling with MSVC 2013 (typo mistake with the include file). 2015-08-13 13:11:17 +10:00
cc9cii
bb250a236b Fix compilation when using 1.9 Ogre branch (i.e. the previous change on this file was in fact not related to MSVC 2015, but rather the use of the Ogre default branch). 2015-08-13 13:09:40 +10:00
cc9cii
b920e1bde7 Support MSVC 2015. Tested(*) with updated dependencies: 
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763

(*) only tested compilation and startup of the each app
 2015-08-12 06:50:22 +10:00
cc9cii
da85b3a4ee Update to keeping config comments (Feature #2535) 
-An attempt to fix Coverity-Scan warning (see: https://github.com/OpenMW/openmw/pull/618#discussion_r33641670)
- Unable to test until a PR can be submitted.
 2015-08-01 13:25:35 +10:00
cc9cii
5bef43ac14 Remove duplicated config scanning (see: https://forum.openmw.org/viewtopic.php?f=7&t=2922&p=32940#p32940) 
* Requires boost::filesystem::canonical() from v1.48
* reduces startup time
* Fixes asset files being listed multiple times in tables
 2015-07-30 16:30:59 +10:00
cc9cii
7247da5a77 Fix loading openmw-template.omwgame with debug builds (see: https://forum.openmw.org/viewtopic.php?f=7&p=34026#p34026). Script::load() was failing with debug assertion fail (vector subscript out of range) 2015-07-30 15:48:45 +10:00
Marc Zinnschlag
26d617d88b allow keywords in quotes (Fixes #2794) 2015-07-30 09:34:46 +10:00
Koncord
386f545c67 Fix definition conflict 2015-07-27 15:22:19 +10:00
cc9cii
740c8bc6f1 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 10:53:39 +10:00
scrawl
502cc852da Handle encoding conversions when saving TES3 header (Fixes #2727) 2015-06-26 20:16:32 +02:00
cc9cii
273ff1cccb Address review comments. 2015-06-26 07:48:48 +10:00
cc9cii
b1f07ba4fb Resolve merge issues and change the getSpells() interface. 2015-06-25 18:57:32 +10:00
cc9cii
7af43a1155 Address review feedback. 2015-06-25 13:32:22 +10:00
cc9cii
91b9ad399f Include <cmath> for fmod() and floor() 2015-06-24 21:38:38 +10:00
cc9cii
8af12788a4 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/util.cpp
 2015-06-24 21:16:48 +10:00
cc9cii
6b00d4ad91 Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS. 
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
 2015-06-24 21:05:59 +10:00
scrawl
d3ef075952 Fix an uninitialized variable 2015-06-23 05:06:49 +02:00
scrawl
2ce269c0fc Werewolf stats compatibility with old save files 2015-06-21 18:45:49 +02:00
scrawl
d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 2015-06-21 17:28:18 +02:00
cc9cii
cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 2015-06-16 12:48:45 +10:00
Marc Zinnschlag
8fc0bdfac7 Merge remote-tracking branch 'cc9cii/keep-config-comments' 2015-06-15 16:22:48 +02:00
cc9cii
6b28955f31 Fix attempt to erase using a const_iterator. 2015-06-15 10:26:16 +10:00
cc9cii
36aa4aa9bd If a removed 'content=' item has comments, keep them in config file for later use. 2015-06-15 09:53:26 +10:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
cc9cii
c22c9c271d Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
 2015-06-14 14:51:01 +10:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
scrawl
de98d991b4 Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535." 
Breaks the saving of content= entry order.

This reverts commit 15fe5d88e2.

Conflicts:
	components/config/gamesettings.cpp
 2015-06-13 23:50:12 +02:00
scrawl
c54a225467 Revert "Allow space characters in front of comments." 
This reverts commit 4902c66792.
 2015-06-13 23:49:29 +02:00
scrawl
3bfe167bc0 Revert "Fix loop where there was a potential for double entry." 
This reverts commit a439f49c4d.
 2015-06-13 23:49:29 +02:00
cc9cii
b81454d226 Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668. 2015-06-13 14:37:47 +10:00
scrawl
89c2a7e26b Fix for possibly missing library on windows 2015-06-12 15:22:19 +02:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
scrawl
c04f6cf167 Remove unused code 2015-06-12 01:58:13 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
cc9cii
8e8da724f5 Remove unnecessary comment entry in the config file. 2015-06-10 08:23:38 +10:00
cc9cii
a439f49c4d Fix loop where there was a potential for double entry. 2015-06-07 07:38:52 +10:00
cc9cii
4902c66792 Allow space characters in front of comments. 2015-06-07 07:21:15 +10:00
cc9cii
15fe5d88e2 Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535. 
- controlled via a checkbox in launcher settings
 2015-06-06 20:35:55 +10:00
Marc Zinnschlag
67f04e0ba1 Merge remote-tracking branch 'origin/master' 2015-06-02 14:44:27 +02:00
Marc Zinnschlag
ee2763f2d4 Allow 5th parameter for PlaceAtMe (numeric value, ignored) (Fixes #2591) 2015-06-02 14:43:38 +02:00
Stanislav Bas
6cb221f8d0 Some minor changes to MWList 2015-06-02 11:55:09 +03:00
Stanislav Bas
959fe3eb87 Reset the scrollbar position in the topic list when DialogueWindow is closed 2015-06-01 23:49:40 +03:00
Stanislav Bas
5350ce59ef MWList doesn't scroll to the very bottom when it's shown for first time 2015-06-01 22:42:41 +03:00
Stanislav Bas
5dc6cdeb99 Scroll to the top of the topic list when dialog is started 2015-06-01 01:14:11 +03:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
cc9cii
5fd107a95c Fix crash with array out of bounds when refNum index is incorrect. 2015-05-27 10:19:26 +10:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
cc9cii
7f12fc4770 Fix for Bug #2544. Add a default mNpdtType to ESM::Npc::blank(). 2015-05-13 13:39:04 +10:00
Marc Zinnschlag
107bf818e7 Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83" 
This reverts commit 27751db99a.

Conflicts:

	libs/openengine/bullet/physic.cpp
 2015-05-10 13:35:21 +02:00
Marc Zinnschlag
0c27869089 Merge remote-tracking branch 'scrawl/bullet283' 2015-05-05 10:52:18 +02:00
scrawl
27751db99a Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83 2015-05-04 16:23:33 +02:00
dteviot
b0c4be2316 Multi-select + context menu. (Fixes #2480) 
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
 2015-05-04 14:52:47 +12:00
Marc Zinnschlag
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +02:00
k1ll
8e094d6fa5 Add static bullet to components 2015-04-29 18:31:29 +02:00
k1ll
b194af4ab2 Add static qt to components 2015-04-29 18:31:29 +02:00
k1ll
a230050ec8 Boost tr1 unordered map does not work with mingw 2015-04-29 18:31:29 +02:00
k1ll
00b7712a59 Fix shlwapi include case and add the lib for linking when building for windows 2015-04-29 18:31:28 +02:00
Marc Zinnschlag
ba57a648db Merge remote-tracking branch 'rohit-n/reorder' 2015-04-29 12:09:55 +02:00
Marc Zinnschlag
607a16eb01 removed leftover ignoreRefNum argument 2015-04-29 12:09:30 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
Marc Zinnschlag
f1c0847897 Merge remote-tracking branch 'cc9cii/moveref' 2015-04-28 14:07:18 +02:00
Marc Zinnschlag
e69687b0f2 silenced a warning (potentially unintialised variable) 2015-04-28 14:06:52 +02:00
cc9cii
7673be6d0f Loading of moved refs complete. 2015-04-26 12:18:23 +10:00
cc9cii
e668b35b02 Fix typo. 2015-04-25 17:51:31 +10:00
cc9cii
dcce59f76c Pass MovedCellRef info to RefCollection. Still has debugging code. 2015-04-25 17:20:02 +10:00
cc9cii
acb800b8f9 Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
cc9cii
f1a58994c6 Merge branch 'master' into moveref 
Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp
 2015-04-25 06:52:53 +10:00
dteviot
4607c4b581 Add Modified DateTime to plug-in tooltip. (Fixes #2479) 2015-04-18 15:33:49 +12:00
scrawl
20af2b67a8 Change the triangle pattern used for terrain (Fixes #2459) 2015-04-17 18:54:14 +02:00
scrawl
b7867d6f0a Stop warning about unused nif properties 2015-03-25 05:29:00 +01:00
Marc Zinnschlag
9ab25dbf6b Merge remote-tracking branch 'dteviot/Rng' 2015-03-21 09:00:55 +01:00
dteviot
2cfc4c0286 script Random() command now returns correct range. 2015-03-21 18:21:01 +13:00
Marc Zinnschlag
5198a173fa Merge remote-tracking branch 'corristo/osx-user-data-path' 2015-03-19 18:50:05 +01:00
scrawl
7bc0d41bb0 Marker collision fix (Fixes #2461) 2015-03-19 15:51:45 +01:00
Nikolay Kasyanov
af2b08214b #2460: use Application Support as user data path on OS X 2015-03-18 23:48:03 +02:00
Nikolay Kasyanov
3e45e9a48a Remove no longer required strnlen wrapper 
It was used for MinGW & OS X < 10.7. Minimal OS X version was bumped to
10.7 and MinGW support was recently dropped (see
1eaa64c49c).
 2015-03-18 23:37:54 +02:00
Marc Zinnschlag
47bac13749 Merge remote-tracking branch 'scrawl/master' 2015-03-18 12:07:40 +01:00
Marc Zinnschlag
c032113247 Merge remote-tracking branch 'sandstranger/release-jni-memory' 2015-03-17 11:41:41 +01:00
scrawl
f7ecda68c9 Fix for unicode filenames in ContentModel (Fixes #2451) 2015-03-16 15:34:00 +01:00
sylar
db10c87b89 release jni memory 2015-03-16 18:21:38 +04:00
Nathan Aclander
48e2ec2840 Fix comparison of integers of different signs 
Clang reported comparison of unsigned long with long. This cast should fix it.
 2015-03-15 16:20:17 -07:00
Marc Zinnschlag
86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
dteviot
2ef7fc4e2c Installer work for Windows (Fixes #1621) 
1. Correctly reads Windows registry for vanilla MW install location.
2. Populates existing installation page with location of vanilla, when found.
3. On Windows, installer wizard now gets to Import page.
 2015-03-15 08:08:55 +13:00
cc9cii
488bc76da5 Fix saving land data. 2015-03-13 22:06:55 +11:00
Marc Zinnschlag
056bc66c6c Merge remote-tracking branch 'scrawl/master' 2015-03-12 10:29:39 +01:00
scrawl
5f051b5bf2 Remove comment about GMST cleaning which was removed. 2015-03-12 00:32:57 +01:00
scrawl
16ddfbca14 Remove some outdated todo comments 2015-03-12 00:27:01 +01:00
scrawl
304277429f Rename variable to not show up in search for "TODO" comments. 2015-03-12 00:21:46 +01:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00
dteviot
36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
 2015-03-08 18:29:12 +13:00