mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-06 16:10:54 +00:00
Code Issues Releases Wiki Activity
16366 commits 117 branches 76 tags 159 MiB
Commit graph

12370 commits

Author SHA1 Message Date
Ben Shealy
8703609649 Allow +/- buttons in trade window to decrease offer to 0 2016-04-09 17:49:21 -04:00
Marc Zinnschlag
a5bc561c7d Merge remote-tracking branch 'origin/master' 2016-04-08 09:35:39 +02:00
Rob Cutmore
a3903d374f Update script editor tab width (Bug #3286) 2016-04-07 07:47:47 -04:00
Bret Curtis
2c90b0b78d fix a few spelling mistakes 2016-04-07 11:55:49 +02:00
Aesylwinn
7d89c82f08 Revert "Fix indentation." 
This reverts commit 9a495042cc.
 2016-04-06 10:23:12 -04:00
Aesylwinn
8c35836883 Fix misnamed identifier. 2016-04-06 03:12:10 -04:00
Aesylwinn
85005626b1 Replace usage of deprecated function. 2016-04-06 03:11:51 -04:00
Aesylwinn
94d4fb0686 Add check for region weather chances to verifier. 2016-04-06 03:11:28 -04:00
Aesylwinn
9a495042cc Fix indentation. 2016-04-06 02:39:33 -04:00
Aesylwinn
5e38fcac36 Add ability to edit region weather probabilities. 2016-04-06 02:18:19 -04:00
Marc Zinnschlag
f2b2a760b3 Merge remote-tracking branch 'origin/master' 2016-04-05 09:06:04 +02:00
Marc Zinnschlag
60509875e8 Merge remote-tracking branch 'aesylwinn/editor_camera' 2016-04-05 08:54:23 +02:00
Aesylwinn
b111febfc9 Add pitch constraint for first person camera. 2016-04-04 20:56:13 -04:00
Aesylwinn
e07687ee01 Add button for camera mouse inversion in user preferences, and separate the 
sensitivity settings for orbit and free cameras.
 2016-04-04 18:42:57 -04:00
Aesylwinn
e127c691e2 Cleanup, remove some unused includes 2016-04-03 18:23:06 -04:00
Aesylwinn
ec25998b12 Cleanup, use setTraversalMask instead of setNodeMaskOverride 2016-04-03 18:19:20 -04:00
Aesylwinn
0ef7c778e0 Cleanup, isModified was a remnant of an old design and is only used in the first person camera mode. 2016-04-03 17:26:34 -04:00
Aesylwinn
6c471349f0 Add context menu for orbit camera. 2016-04-03 16:32:07 -04:00
Aesylwinn
4ef9981544 Add ability to set orbit camera center outside of class. 2016-04-03 16:30:50 -04:00
scrawl
79c8f69b24 Clear the class selected / race selected flags when starting a new game (Fixes #3326) 2016-04-03 20:23:28 +02:00
Aesylwinn
02f991c63e Cleanup, fix comment 2016-04-02 14:02:56 -04:00
Aesylwinn
99e9017242 Cleanup, externalize mask used to pick center 2016-04-02 13:59:57 -04:00
Aesylwinn
a4cc891383 Cleanup, move setup to CameraController class 2016-04-02 13:36:12 -04:00
Aesylwinn
efa2ec21ff Cleanup, no need to inherit and override osg::ComputeBoundsVisitor 2016-04-02 13:14:46 -04:00
Marc Zinnschlag
1bb23b6c77 Merge branch 'move' 2016-04-02 10:08:27 +02:00
Marc Zinnschlag
8f699b5d39 avoid creating move tags for instances that exist only in the currently edited content file 2016-04-02 10:08:03 +02:00
Aesylwinn
1e30891891 Broaden selection mask for getting scene bounds if nothing is found. 2016-03-31 23:54:20 -04:00
Aesylwinn
7d9dddfa38 Place camera farther away, improves preview camera placement. 2016-03-31 23:34:47 -04:00
scrawl
cf62d860b2 Fix the adjustPlayerPos parameter not being respected in all cases 2016-03-30 01:54:03 +02:00
scrawl
e1dda9675d Add "preload instances" setting, disabling this may help if you are low on memory. 2016-03-30 00:13:37 +02:00
scrawl
2162d9ed02 Restore key focus to the save list when the deletion confirmation messagebox is accepted 
Gives me an idea for a new MyGUI feature - per-window widget focus as it is usually the case in other GUI toolkits.
 2016-03-29 01:29:55 +02:00
scrawl
02016f4c56 Don't reset the save list when deleting a save (Fixes #3279) 2016-03-29 01:26:55 +02:00
scrawl
7a962fd8c5 Properly escape the keybinding labels (Bug #3281) 
A certain key name ("#") was being interpreted as a MyGUI markup code.
 2016-03-29 01:13:17 +02:00
scrawl
5cda89c15d Don't attempt to preload more exterior cells than the cache can hold (Bug #3273) 2016-03-29 00:50:30 +02:00
scrawl
83f1ab6d25 Add a time threshold to the removing of preloaded cells when the maximum cache size is reached (Bug #3273) 2016-03-29 00:50:21 +02:00
scrawl
4ac276b06c Update the resource cache every frame (Bug #3273) 
Not much of a point in limiting this to cell loadings, since the update is done from a background thread and should be fairly cheap anyway if there's nothing to unload.
 2016-03-29 00:50:13 +02:00
scrawl
2f8be401cc Add the unref work items to the front of the workqueue (Bug #3273) 
Ensures that memory still gets freed even if the workqueue is overloaded.
 2016-03-29 00:27:56 +02:00
Aesylwinn
09bce73c33 Fix starting distance not being correctly set. 2016-03-26 14:42:33 -04:00
Aesylwinn
08d055ca23 Allow setting precision of double preferences. Also increase precision of camera sensitivity. 2016-03-26 14:35:03 -04:00
Aesylwinn
35ff4ec4b1 Normalize default camera controls so that is appears as if the camera is 
the object being moved. Also, allow mouse inversion for secondary movement.
 2016-03-26 14:15:07 -04:00
Marc Zinnschlag
eba8b4a518 Merge remote-tracking branch 'rcutmore/feature-3250' 2016-03-26 11:34:25 +01:00
Marc Zinnschlag
3e0347a9ed Merge remote-tracking branch 'rcutmore/fix-editor-tab-order' 2016-03-26 11:33:23 +01:00
Aesylwinn
fbe9177f5d Better center picking for the Orbit Camera. 2016-03-26 00:51:19 -04:00
Aesylwinn
a0fb242bf8 Slight improvement to camera placement. 2016-03-25 23:47:05 -04:00
Aesylwinn
bee8977e45 Add camera control customization options. 2016-03-25 22:19:44 -04:00
Aesylwinn
dede171886 Fix the secondary navigation method for OrbitCameraController. 2016-03-25 21:35:34 -04:00
Aesylwinn
3c83128abc Add more customization. 2016-03-25 20:47:18 -04:00
Aesylwinn
3a676fc456 Revert "Create a visual representation of the center of the orbit camera." 
This reverts commit 2c894acd98.

# Conflicts:
#	apps/opencs/view/render/cameracontroller.cpp
#	apps/opencs/view/render/cameracontroller.hpp
 2016-03-25 18:20:04 -04:00
Rob Cutmore
1b4c124fe8 Create record on Return key press (Feature #3250) 
Updated to create record when Return key is pressed while input has
focus. Record is only created if input has been validated (i.e. Create
button is enabled).
 2016-03-25 12:13:55 -04:00
Rob Cutmore
29078619aa Fix editor tab order when adding record 2016-03-25 06:28:11 -04:00
scrawl
e71aa53574 Don't allow playing a sound/soundgen key more than once at the same time on the same object (Fixes #2689) 2016-03-24 19:26:12 +01:00
scrawl
5bd8ef247d Do not adjust the player position when loading a savegame (Fixes #2089) 2016-03-24 17:18:08 +01:00
scrawl
92c2a10de4 Fall back to 'warrior' for not found class images (Fixes #3228) 2016-03-24 16:52:16 +01:00
Marc Zinnschlag
1774f6d9bf moved ref num assingment from instance creation to save procedure 2016-03-24 11:12:05 +01:00
scrawl
157c11398d Add terrain parallax mapping 2016-03-22 21:46:15 +01:00
scrawl
e381957105 Don't assume that class ID and name are equal 2016-03-21 11:51:34 +01:00
scrawl
90cc1de46c Do not list custom made classes in the pick class dialog 2016-03-21 11:46:25 +01:00
scrawl
b332704df7 Switch hand-to-hand attack types randomly when "always use best attack" is turned on (Fixes #3259) 2016-03-19 18:03:59 +01:00
Aesylwinn
342d31de76 More fixes to the orbit manipulator 2016-03-18 16:56:40 -04:00
Aesylwinn
2903271331 Correct the center position for the orbit camera controller 2016-03-18 16:07:15 -04:00
Aesylwinn
2c894acd98 Create a visual representation of the center of the orbit camera. 
For debugging purposes.
 2016-03-18 16:06:35 -04:00
Aesylwinn
c8bae38a8e Remove trackball mode 2016-03-18 14:53:10 -04:00
Aesylwinn
7009355baf Remove unused variable 2016-03-18 14:46:53 -04:00
Aesylwinn
4374f69a60 Reduce mouse sensitivity 2016-03-18 14:43:13 -04:00
Aesylwinn
2b72a04e7a Update 1st person up axis ASAP. 2016-03-18 14:02:55 -04:00
Aesylwinn
999869da24 Position camera above, near, and looking at the scene. 2016-03-18 14:02:24 -04:00
Aesylwinn
fcccacc0fa Define a constant for the World Up vector 2016-03-18 13:57:48 -04:00
Marc Zinnschlag
589fb1031b Merge remote-tracking branch 'pi03k/bug_3248' 2016-03-18 07:32:57 +01:00
scrawl
a6e23d03d3 Don't clamp disposition twice, clamping is already done inside getDerivedDisposition 2016-03-18 00:42:22 +01:00
scrawl
102f9719f7 Remove some garbage 2016-03-18 00:39:27 +01:00
scrawl
79eb2d20e0 Cleanup 2016-03-18 00:39:19 +01:00
scrawl
12ec90f9e7 Change default argument, fix GetDisposition 2016-03-18 00:38:02 +01:00
scrawl
bc5adfa4fe Merge pull request #913 2016-03-18 00:31:55 +01:00
scrawl
30402f75e3 Use xbase_anim_female as the base skeleton for female NPCs (Fixes #3258) 2016-03-18 00:24:38 +01:00
scrawl
2b38d10449 Always add xbase_anim 2016-03-18 00:17:05 +01:00
pi03k
629a558e7b Fix for bug 3248 2016-03-17 22:34:45 +01:00
Aesylwinn
59f59a3385 Fix indentation 2016-03-14 00:45:36 -04:00
Aesylwinn
08fe914ba1 Preliminary editor camera 2016-03-14 00:45:18 -04:00
Aesylwinn
2cff2cd643 Remove unnecessary override. 2016-03-14 00:45:08 -04:00
Aesylwinn
9ed2cf6581 Fix callback being skipped 2016-03-14 00:44:56 -04:00
Aesylwinn
ebdc212886 Moved selectNavigationMode to SceneWidget class, centralized camera selection. 2016-03-14 00:44:46 -04:00
Aesylwinn
9afb0e0f90 Input restructuring. 2016-03-14 00:42:15 -04:00
Aesylwinn
f4f7afb53b Removed now unnecessary installation of event filter. 2016-03-14 00:41:57 -04:00
Aesylwinn
38059593a7 Removed workaround for OSG input handling in RenderWidget. 2016-03-14 00:41:04 -04:00
scrawl
50acdf3e47 Move createCharacter inside the try block 2016-03-14 00:03:02 +01:00
scrawl
a0cc9de088 Make the creation of save file directories even more explicit 2016-03-14 00:00:11 +01:00
scrawl
b7b7c0612d Make getCurrentCharacter create argument explicit 2016-03-13 23:48:44 +01:00
scrawl
7463c0c353 Addition to last commit, don't create a save directory on death 2016-03-13 23:48:22 +01:00
scrawl
426a6fdcc2 Don't create the save directory on loading a game 
This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.
 2016-03-13 23:42:08 +01:00
scrawl
d7c7bb850b ToggleAI cleanup 2016-03-12 20:32:42 +01:00
Marc Zinnschlag
d5067201d0 Merge branch 'move' 2016-03-12 13:27:00 +01:00
Marc Zinnschlag
900378a31e changed 'not implemented' warning message for object movement 2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46 handle cell transitions when moving objects 2016-03-12 13:19:51 +01:00
Marc Zinnschlag
5c587fe93e Merge remote-tracking branch 'scrawl/cs_waterlevel' 2016-03-12 08:07:38 +01:00
scrawl
d840c7d5eb Slightly tweak the spawn point heuristics 
Fixes an issue with hlaalu building exits
 2016-03-11 22:48:28 +01:00
scrawl
97526284f5 Allow setting the water level of an interior cell with sky (Fixes #3244) 2016-03-11 22:10:59 +01:00
Marc Zinnschlag
fa9689c5e7 delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on) 2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef Merge branch 'master' into move 2016-03-11 12:47:33 +01:00
scrawl
85bd4f52f0 Improve occlusion query geometry rendering 2016-03-11 00:09:46 +01:00
scrawl
93ec289b1d Improve setting of occlusion query state 2016-03-10 23:18:20 +01:00