1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 05:53:50 +00:00
Commit graph

10069 commits

Author SHA1 Message Date
Marc Zinnschlag
c5f1c2127d extend global search to all record and reference tables 2015-03-28 14:36:28 +01:00
Marc Zinnschlag
13a4fb3fdc make return key press in search input trigger a new search 2015-03-28 13:05:18 +01:00
Marc Zinnschlag
8e9365741f make search sub-views re-usable (clear before starting a new search) 2015-03-28 12:53:01 +01:00
Marc Zinnschlag
eaaf816dd3 simplified search rules 2015-03-28 12:05:49 +01:00
Marc Zinnschlag
128ccd8151 improved search type naming 2015-03-28 11:54:32 +01:00
dteviot
be6ee927b9 AiWander, use closest two points if distance is too small (Fixes #1317)
In AiWander, if wander distance is set too small to get two points, take the closest two points.
2015-03-28 20:05:54 +13:00
scrawl
bb32c761df *very* early texture manager, need a lot more thought to design this properly 2015-03-28 02:27:59 +01:00
scrawl
322fcdc2d3 Transform world space particles when attaching to a node 2015-03-28 00:30:49 +01:00
Marc Zinnschlag
babefacbfa improved message text in search results 2015-03-27 19:10:45 +01:00
Marc Zinnschlag
705ee67265 fixed hints getting mixed up with message text 2015-03-27 18:55:48 +01:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
Marc Zinnschlag
23cf859fee added search stages (cell table only for now) 2015-03-27 16:33:54 +01:00
scrawl
99e1720980 Add SceneManager and clone utility 2015-03-26 18:02:51 +01:00
scrawl
e3bfbcb44b OpenCS: connect navigation button to OSG camera manipulators 2015-03-26 00:55:58 +01:00
scrawl
1edccdbe55 OpenCS: apply visibility flags to osg node 2015-03-26 00:27:39 +01:00
scrawl
5fb8877746 Don't set the root node to dynamic 2015-03-26 00:11:23 +01:00
scrawl
72400747f2 OpenCS: preliminary port of cell rendering to OSG 2015-03-25 23:35:10 +01:00
scrawl
aedafe651a OpenCS: delete physicssystem, will be replaced with OSG picking 2015-03-25 19:08:09 +01:00
scrawl
46cbec9a4a Add skinning auto-detection in nifosg loader 2015-03-25 15:39:41 +01:00
Marc Zinnschlag
78c6268891 added search class and search box widget 2015-03-25 11:56:14 +01:00
scrawl
9141a8d801 Fully implement NiStencilProperty (Feature #1057) 2015-03-24 23:05:20 +01:00
scrawl
36ad40827b Move parent node attachment out of nifloader 2015-03-23 16:17:40 +01:00
scrawl
d6dea31b88 OpenCS: Use a CompositeViewer with multiple views instead of multiple viewers
Fixes the rendering glitches, turns out that multiple osgViewers were never an intended use case.
2015-03-23 15:55:57 +01:00
dteviot
63ab856024 Removed duplicated code. 2015-03-23 20:57:36 +13:00
dteviot
eb1090a1b6 Waypoint check only considers X & Y distance (Fixes #2423)
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
2015-03-23 20:09:46 +13:00
scrawl
5a582e7eb7 Reintroduce showMarkers flag 2015-03-23 01:57:14 +01:00
scrawl
6d85444d26 Add text key loading 2015-03-23 01:51:44 +01:00
scrawl
15f9c1ddcf NiBSPArrayController works 2015-03-21 23:10:52 +01:00
scrawl
d486cde330 Fix broken VisControllers 2015-03-20 21:32:26 +01:00
scrawl
4957ceeb1d Refactor controllers, now part of the scene graph as UpdateCallbacks
Practical benefits:
- The controller update is now run automatically
- Creating an instance of a scene graph should now work properly using the defined copy constructors
2015-03-20 19:51:54 +01:00
scrawl
af27a10b0c OpenCS: preliminary port of PreviewWidget to OSG 2015-03-20 16:22:33 +01:00
scrawl
34d503017a OpenCS: Set up an osgQt GraphicsWindow in SceneWidget 2015-03-20 16:22:33 +01:00
scrawl
40fc097722 OpenCS: use the new VFS, restored resource tables 2015-03-20 16:22:33 +01:00
Marc Zinnschlag
413b35de6c moved search menu item from view to edit 2015-03-19 21:03:24 +01:00
scrawl
49c2da27b3 OpenCS compiles and runs again (no rendering) 2015-03-19 17:21:15 +01:00
scrawl
f8422c3ed4 Particles mostly completed, still need to attach emitters to the correct node and handle NiBSPArrayController 2015-03-19 03:01:11 +01:00
scrawl
e6880de032 Better fix for wireframe crashes 2015-03-19 00:37:33 +01:00
scrawl
0b4e7e59bc Revert "Seems to fix wireframe crashes"
This reverts commit 31a0bbcb23.

Better fix coming up
2015-03-19 00:35:05 +01:00
scrawl
7c1386b62b Read BSA and data dirs from openmw.cfg 2015-03-18 20:14:47 +01:00
Marc Zinnschlag
47bac13749 Merge remote-tracking branch 'scrawl/master' 2015-03-18 12:07:40 +01:00
scrawl
f843e12538 Add world space particle systems, will need more changes when emitters are added 2015-03-17 22:34:30 +01:00
scrawl
510375aa63 Add virtual file system (VFS) replacing the low level parts of the old resource system 2015-03-17 22:02:56 +01:00
scrawl
31a0bbcb23 Seems to fix wireframe crashes 2015-03-17 18:54:04 +01:00
Marc Zinnschlag
d053c62032 setting up global search operation and subview 2015-03-17 12:30:47 +01:00
Marc Zinnschlag
c032113247 Merge remote-tracking branch 'sandstranger/release-jni-memory' 2015-03-17 11:41:41 +01:00
scrawl
d573458896 Fix case sensitivity bug in default head/hair selection (Fixes #2453) 2015-03-16 17:42:15 +01:00
scrawl
19e8280f45 OpenCS window title unicode fixes 2015-03-16 15:45:41 +01:00
sylar
db10c87b89 release jni memory 2015-03-16 18:21:38 +04:00
Marc Zinnschlag
545ca9c9b4 Merge remote-tracking branch 'sandstranger/fix-bad-code-in-command-line' 2015-03-16 08:42:22 +01:00
Marc Zinnschlag
fc6c9d7ff2 Merge remote-tracking branch 'scrawl/opencs-hint-fix' 2015-03-16 08:41:36 +01:00
Marc Zinnschlag
79339ebff1 Merge remote-tracking branch 'scrawl/opencs-crashfix' 2015-03-16 08:40:02 +01:00
sylar
bd4e832cf3 fix memory leaks in emulating command line 2015-03-16 07:41:51 +04:00
scrawl
6ff2523d8a Fix for line focus when clicking on a verifier script error
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00
scrawl
295ca86ac1 OpenCS FileDialog crash fix
The file dialog would crash when no game file is selected and an addon file with no dependency is checked, then unchecked.
2015-03-16 02:43:02 +01:00
scrawl
4d0bb6329a Fix incorrect reference check
This check was broken for exterior cells (empty cell id).

It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
2015-03-16 01:50:57 +01:00
Marc Zinnschlag
e6e02714a0 Merge remote-tracking branch 'sandstranger/command-line-support-for-Android' 2015-03-15 22:52:34 +01:00
Marc Zinnschlag
86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 2015-03-15 22:04:26 +01:00
sylar
a418b70937 command line support for Android 2015-03-15 21:15:58 +04: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
Marc Zinnschlag
cf077dcf5d Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn' 2015-03-14 14:25:49 +01:00
Marc Zinnschlag
55bd0c728e Merge branch 'threadfix' 2015-03-14 12:00:35 +01:00
Marc Zinnschlag
c0dfad23b3 Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
cc9cii
15b9a628ac Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods. 2015-03-14 19:41:55 +11:00
cc9cii
17e6244bd6 Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
Rohit Nirmal
2540a901d5 Remove unused variable. 2015-03-13 20:04:47 -05:00
cc9cii
fd86076db3 More warning fixes. 2015-03-14 08:09:19 +11:00
cc9cii
4f6c772437 Fix more warnings. 2015-03-14 06:36:35 +11:00
cc9cii
4d46d7ba72 Fix some compiler warnings. 2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9 Merge branch 'openmw-35-1' 2015-03-13 17:33:08 +01:00
cc9cii
488bc76da5 Fix saving land data. 2015-03-13 22:06:55 +11:00
cc9cii
589b0b9171 Add saving land and land textures. Should resolve Bug #2447. 2015-03-13 08:01:48 +11:00
Marc Zinnschlag
8e37e9a14a removed redundant functions 2015-03-12 10:51:50 +01:00
Marc Zinnschlag
8a8db8bc24 Merge remote-tracking branch 'cc9cii/editor-clone-fix' 2015-03-12 10:45:51 +01:00
Marc Zinnschlag
26955dc6d3 Merge remote-tracking branch 'cc9cii/editor-var-edit' 2015-03-12 10:44:55 +01:00
Marc Zinnschlag
056bc66c6c Merge remote-tracking branch 'scrawl/master' 2015-03-12 10:29:39 +01:00
cc9cii
418025e0a2 Add missing editor type to the dialogue. Should resolve Bug #2437. 2015-03-12 13:10:25 +11:00
scrawl
767624f518 Combat mechanic fixes 2015-03-12 03:08:58 +01:00
scrawl
a846bb1aa3 Update hit chance according to wiki and implement fCombatInvisoMult 2015-03-12 02:47:16 +01:00
scrawl
f603a68144 Allow binding Hand To Hand in quick keys menu (Fixes #2024) 2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2 CharacterCreation refactoring 2015-03-12 00:43:28 +01:00
scrawl
d00c75d428 Remove more outdated TODO comments. 2015-03-12 00:37:28 +01:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
cc9cii
dc9af19dcf Don't use C++11 features. 2015-03-12 08:28:26 +11:00
scrawl
68de876051 Switch to weapon drawstate when creating a bound weapon (Fixes #2387) 2015-03-11 21:12:08 +01:00
scrawl
48ea6286fd Book/scroll window refactoring 2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76 WindowManager refactoring 2015-03-11 20:04:25 +01:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
cc9cii
28259f914c Remove potential memory leak. 2015-03-11 10:49:21 +11:00
cc9cii
43ec933b7b Revert to the original clone() method. Create a new copy method for modified records. 2015-03-10 09:45:35 +11:00
cc9cii
8ac7b77d36 For RefId's, modify a copy of the base record rather than modifying the record directly. 2015-03-10 06:51:54 +11:00
cc9cii
8b3adec3ec Added a missing copy constructor. 2015-03-09 21:25:41 +11:00
cc9cii
f90cdec53b Remove default parameters from the implementation. 2015-03-09 16:24:35 +11:00
cc9cii
6087a18c94 Implement clone() using a new Record constructor. 2015-03-09 14:58:07 +11:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00
scrawl
457c135097 Remove old workaround 2015-03-09 03:15:11 +01:00
scrawl
36e1b6cc48 Support fatigue below zero for the Drain effect (Fixes #2430) 2015-03-09 03:15:11 +01:00
scrawl
3d5c1d1190 Adjust fix for maximum attribute damage limit 2015-03-09 03:15:11 +01:00
Ivy Foster
4f100e6870 Fix rapid toggling when holding sneak button. 2015-03-08 16:08:45 -05:00