Allofich
|
c05782581e
|
Account for all instances of play()
|
2016-08-16 02:52:55 +09:00 |
|
David Cernat
|
3c6710a7b5
|
Merge pull request #35 from OpenMW/master
Add OpenMW commits from 2nd week of August
|
2016-08-15 19:21:09 +03:00 |
|
Allofich
|
6163c7bb03
|
Use loopfallback for idle animation groups
|
2016-08-16 01:15:26 +09:00 |
|
David Cernat
|
d9cfd5bac2
|
Resolve conflicts with OpenMW
|
2016-08-15 19:14:13 +03:00 |
|
scrawl
|
641005b317
|
Remove Camera's children before removing the Camera
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
|
2016-08-15 18:12:46 +02:00 |
|
Koncord
|
a92ef8b6bd
|
Some fixes
|
2016-08-15 22:49:34 +08:00 |
|
scrawl
|
a44ba0e461
|
Merge pull request #966 from kpp/find_mygui
Find mygui
|
2016-08-15 16:36:48 +02:00 |
|
Koncord
|
e9ee9c8b3b
|
Remove C++11 in Log.h
|
2016-08-15 21:45:49 +08:00 |
|
Koncord
|
b3320c7bb9
|
Add forgoten ctime header
|
2016-08-15 21:35:29 +08:00 |
|
Koncord
|
8d88381dac
|
added prefix LOG_ to loglevel
|
2016-08-15 21:33:18 +08:00 |
|
Koncord
|
170455e08a
|
Fix headers
|
2016-08-15 21:15:36 +08:00 |
|
Roman Proskuryakov
|
4cffdb67d8
|
Uses case-sensitive MyGUI_* variables
|
2016-08-15 15:59:02 +03:00 |
|
Koncord
|
c695923825
|
Added master server stuff
|
2016-08-15 07:48:55 +08:00 |
|
Koncord
|
02a447c589
|
Added logger
|
2016-08-15 07:45:42 +08:00 |
|
Aesylwinn
|
3e4ac0c662
|
Potential fix for context sensitive select mode issues.
|
2016-08-14 14:43:29 -04:00 |
|
scrawl
|
71f786ff84
|
Delete the WorkQueue first
Fixes a potential crash on exit.
|
2016-08-14 18:10:29 +02:00 |
|
scrawl
|
3732979eec
|
Revert "Merge pull request #993 from mrcheko/pathfinding"
This reverts commit 5190275b37 , reversing
changes made to d7845012bf .
|
2016-08-14 18:04:33 +02:00 |
|
scrawl
|
c3340ec143
|
Merge pull request #1022 from Allofich/anim
Make loopgroup loop correct number of times
|
2016-08-14 17:02:38 +02:00 |
|
scrawl
|
1edcea2ff5
|
Merge pull request #1023 from psi29a/small_fixes
small fixes
|
2016-08-14 16:49:26 +02:00 |
|
scrawl
|
30b549124e
|
Fix use-after-free
|
2016-08-14 16:42:29 +02:00 |
|
scrawl
|
c65492193c
|
Use osg::clone
|
2016-08-14 16:41:44 +02:00 |
|
scrawl
|
0fbc0d0da7
|
Attempt to silence warning
|
2016-08-14 16:41:17 +02:00 |
|
Bret Curtis
|
0547d4b937
|
clang says that these must be in the MWWorld namespace
|
2016-08-14 16:17:09 +02:00 |
|
scrawl
|
8c44334409
|
Merge pull request #1021 from Allofich/weight
Corrections to tooltip displays of zero-weight items
|
2016-08-14 15:14:58 +02:00 |
|
scrawl
|
2f6075329b
|
Clang warning fixes
|
2016-08-14 15:10:50 +02:00 |
|
Allofich
|
a381a15b19
|
Make loopgroup loop correct number of times
|
2016-08-14 21:57:06 +09:00 |
|
Allofich
|
7bf04b5014
|
Allow showing value of zero-weight lights
|
2016-08-14 21:15:22 +09:00 |
|
Allofich
|
502a26a7ff
|
Use getWeightString() to avoid casting to int
|
2016-08-14 19:38:53 +09:00 |
|
Allofich
|
4f5d676b4e
|
Allow weight tooltips for gold and keys if not 0
|
2016-08-14 19:32:43 +09:00 |
|
Allofich
|
caf025f93d
|
Don't show 0 weight tooltips except for potions
|
2016-08-14 19:27:59 +09:00 |
|
Allofich
|
cf7278f8ae
|
Don't show weight tooltip for 0-weight equipment
|
2016-08-14 18:37:41 +09:00 |
|
Allofich
|
ee2702087c
|
Make zero-weight boots play light boot footsteps
|
2016-08-14 17:27:47 +09:00 |
|
scrawl
|
f3f02fe154
|
Merge pull request #1019 from Allofich/bound
Don't allow re-casting of bound equipment spells
|
2016-08-13 21:02:32 +02:00 |
|
Allofich
|
d617651307
|
Don't allow re-casting of bound equipment spells
|
2016-08-14 02:05:23 +09:00 |
|
Aesylwinn
|
101c3cc90d
|
Rotate around center of selection.
|
2016-08-12 17:12:10 -04:00 |
|
Aesylwinn
|
571969cd65
|
Scale from center of selection.
|
2016-08-12 17:11:37 -04:00 |
|
MiroslavR
|
ddbfe0c944
|
Fix disabled door markers appearing on the map (Fixes #3348)
|
2016-08-12 03:14:36 +02:00 |
|
Aesylwinn
|
388917df89
|
Base editor rotate/scale commit.
|
2016-08-10 19:31:34 -04:00 |
|
Allofich
|
cb9bb92b26
|
Play locked sounds on locked objects instead of actors
|
2016-08-10 21:31:14 +09:00 |
|
Allofich
|
83b715734f
|
Move part of addGlow() to addSpellCastGlow()
|
2016-08-10 02:52:43 +09:00 |
|
Allofich
|
1c76c93ed8
|
Use raw pointer to node in glowupdater
|
2016-08-10 01:35:22 +09:00 |
|
Allofich
|
67f31d948e
|
Add removeTexture method
|
2016-08-10 01:11:14 +09:00 |
|
Allofich
|
4b9aff7a03
|
Glowupdater fix when using shaders
|
2016-08-10 00:43:14 +09:00 |
|
Allofich
|
9b2cb2fb8c
|
Cleanups
|
2016-08-10 00:25:33 +09:00 |
|
Allofich
|
775162ccdf
|
Rewrite spell glow implementation
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
cad41599cf
|
Fix travis build error and warnings
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
1910128e9c
|
Don't remove uniform when spell glow ends
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
35c14bb9bb
|
Minor rewrite, make "open" spells play glow effect
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
e132b52a69
|
Handle spell glows within updatecallback
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
123c626f2d
|
Add glow when using telekinesis on doors
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
57138b416e
|
Fix spell glows to only run one at a time
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
3841a8fb40
|
Make non-actors glow when they cast spells
|
2016-08-09 22:56:53 +09:00 |
|
Allofich
|
dca7b4beb7
|
Make non-actors also play spell casting sounds
|
2016-08-09 22:56:53 +09:00 |
|
Koncord
|
2bdacc950b
|
Fix messagebox in connection failed
|
2016-08-09 18:25:52 +08:00 |
|
Koncord
|
edd214dd00
|
Removed redundant requestQuit
|
2016-08-09 18:19:03 +08:00 |
|
Marc Zinnschlag
|
a563a9d336
|
added missing Q_OBJECT
|
2016-08-09 10:21:37 +02:00 |
|
Marc Zinnschlag
|
96fd9263bf
|
Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable'
|
2016-08-09 10:17:26 +02:00 |
|
Aesylwinn
|
448c9d5a5b
|
Fix globals not being initialized with a valid type.
|
2016-08-09 00:17:41 -04:00 |
|
scrawl
|
0bbd715f65
|
Fix the cloned StateSet not being assigned
|
2016-08-09 01:13:19 +02:00 |
|
scrawl
|
5190275b37
|
Merge pull request #993 from mrcheko/pathfinding
Pathfinding unification
|
2016-08-09 00:41:03 +02:00 |
|
Aesylwinn
|
0963adb2f4
|
Fix pointer being deleted twice.
|
2016-08-08 14:36:50 -04:00 |
|
David Cernat
|
babba95413
|
Merge pull request #34 from OpenMW/master
Add OpenMW commits from 1st week of August
|
2016-08-08 15:53:56 +03:00 |
|
scrawl
|
46538b9438
|
Merge pull request #1011 from devnexen/master
Mainly making compilable under OpenBSD.
|
2016-08-07 20:34:03 +02:00 |
|
mrcheko
|
e2cd87fcc7
|
fix veritcal aiming
|
2016-08-07 19:23:08 +03:00 |
|
Marc Zinnschlag
|
aa1ed9b172
|
Merge remote-tracking branch 'aesylwinn/RenderWater'
|
2016-08-07 17:03:58 +02:00 |
|
scrawl
|
7b557af885
|
Merge pull request #1007 from MiroslavR/save-anim-state
Save scripted animation state
|
2016-08-06 20:39:32 +02:00 |
|
David Carlier
|
83bab29e4b
|
Mainly making compilable under OpenBSD.
Renaming one resource file as the space led to issue for qt/moc.
|
2016-08-06 19:00:27 +01:00 |
|
Aesylwinn
|
16d0580ce8
|
Fix struct/class mismatch.
|
2016-08-05 15:39:08 -04:00 |
|
Koncord
|
1022b6b27c
|
Fix a header size
|
2016-08-06 03:28:01 +08:00 |
|
Aesylwinn
|
1f32f1eef5
|
Add water texture.
|
2016-08-05 14:55:40 -04:00 |
|
Aesylwinn
|
9454f4f2e7
|
Use shared water geometry + state generation,
Fix water position and render bin,
Fix passed cell parameter being ignored
|
2016-08-05 13:49:44 -04:00 |
|
Aesylwinn
|
5753f52b47
|
Move water mesh + simple state generation to components library.
|
2016-08-05 13:25:05 -04:00 |
|
Koncord
|
114a11ea78
|
Getting rid of packages spam
I think this is temporary solution. I have an idea how to cache the result of functions and send data after callback.
|
2016-08-05 14:28:45 +08:00 |
|
Koncord
|
7898b1181d
|
Reduced package size
|
2016-08-05 14:21:09 +08:00 |
|
Koncord
|
a815d013fe
|
Reducing CPU usage for server
|
2016-08-05 14:16:02 +08:00 |
|
Aesylwinn
|
3904a24e6c
|
Add missing include.
|
2016-08-05 00:30:28 -04:00 |
|
Aesylwinn
|
5674e0da24
|
Render water in editor.
|
2016-08-04 23:01:43 -04:00 |
|
Koncord
|
e4e17ca4b9
|
Close #30
|
2016-08-05 00:31:15 +08:00 |
|
David Cernat
|
8686b9cc12
|
Merge pull request #29 from OpenMW/master
Add OpenMW commits from end of July
|
2016-08-04 00:56:36 +03:00 |
|
David Cernat
|
8dd8e22a0b
|
Replace tabs with spaces in LocalPlayer changes
|
2016-08-04 00:55:28 +03:00 |
|
David Cernat
|
3362902396
|
Update position after changing cell (for real)
|
2016-08-04 00:03:05 +03:00 |
|
David Cernat
|
b0bd10f219
|
Allow script-based teleportation from interior to exterior cell 0,0
|
2016-08-03 22:07:49 +03: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 |
|
lohikaarme
|
e8ef5c233f
|
Miss info
|
2016-08-03 14:24:21 +03:00 |
|
lohikaarme
|
0592d1cdcf
|
Commnent?
|
2016-08-03 14:22:25 +03:00 |
|
MiroslavR
|
b65f379b7f
|
Save scripted animation state (Fixes #1931, #2150, #3393)
|
2016-08-03 03:52:35 +02:00 |
|
lohikaarme
|
48bcde8cc9
|
...
|
2016-08-02 15:41:52 +03:00 |
|
LohikaarmeHav
|
b0cf276cfc
|
hups
|
2016-08-02 15:27:40 +03:00 |
|
LohikaarmeHav
|
7cd991107c
|
Nah
Preview seem to not like removing mCamPositionSet and I have do other things.
|
2016-08-02 15:26:12 +03:00 |
|
LohikaarmeHav
|
c6bc30d6a8
|
Forgot to remove line and add comment.
|
2016-08-02 14:27:19 +03:00 |
|
LohikaarmeHav
|
2e6f80688c
|
Removed debug
|
2016-08-02 14:10:08 +03:00 |
|
Koncord
|
b4c7914a25
|
Added <memory> header for Windows
|
2016-08-02 19:00:43 +08:00 |
|
LohikaarmeHav
|
c6ec473280
|
Camera reset now every time cell object->view is pressed.
|
2016-08-02 13:46:43 +03:00 |
|
Koncord
|
74c103ddc1
|
Fixed types in all GetInterface functions
Move lib_t type to Scripts/Types.hpp
|
2016-08-02 18:10:06 +08:00 |
|
Koncord
|
e513c3676d
|
Added forgotten header to project
|
2016-08-02 17:53:56 +08:00 |
|
Koncord
|
9375b540d6
|
removed '#undef _SEP_'
|
2016-08-02 17:35:18 +08:00 |
|
Koncord
|
bdfaea2d46
|
Implement 'setenv' for windows
Paths converter
Move 'split' from main to Utils
|
2016-08-02 17:32:10 +08:00 |
|
scrawl
|
3374630e7b
|
Merge pull request #1008 from Internecine/bug3451-invalid-enchantments
Fixes Bug 3451 - Invalid Enchantment IDs
|
2016-08-02 10:14:59 +02:00 |
|
David Cernat
|
72026955f5
|
Add missing preprocessor directive for Windows build of server
|
2016-08-02 07:08:31 +03:00 |
|