David Cernat
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
2018-01-29 02:36:48 +02:00
scrawl
89c6b59c30
Merge pull request #1602
2018-01-28 22:35:47 +00:00
David Cernat
420dab10e1
[General] Track objects directly placed by players in ObjectPlace
...
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).
Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
2018-01-28 17:46:51 +02:00
David Cernat
613adf6b30
[General] Update version to 0.6.3
2018-01-27 23:36:25 +02:00
David Cernat
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
2018-01-27 22:52:59 +02:00
Ilya Zhuravlev
9e9f6f3132
loadtes3: don't pack() non-POD structs
2018-01-26 21:35:51 -05:00
Ilya Zhuravlev
359910762d
GraphicsWindowSDL2: support setting up GLESv2 context for android
2018-01-18 17:11:22 -05:00
Ilya Zhuravlev
a038327521
SDLCursorManager: fix possibly invalid read when no cursor present
...
On android we have no cursor so I moved the check closer to usage
2018-01-17 23:03:11 -05:00
David Cernat
28f47c4f81
[General] Update version to 0.6.2-hotfixed
2018-01-17 08:10:49 +02:00
David Cernat
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment packets.
2018-01-17 08:10:49 +02:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62
Update android port.
2018-01-16 00:11:27 -05:00
scrawl
047c44f265
Ignore duplicate data directories to work around the fallout of ( Fixes #3557 )
2018-01-14 00:25:20 +00:00
scrawl
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found
2018-01-14 00:23:29 +00:00
Marc Zinnschlag
2dff3aab22
allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061
2018-01-12 16:37:06 +01:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
2018-01-04 12:12:18 +02:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
2018-01-02 07:50:37 +02:00
Bret Curtis
93f14c219c
camelCase
2018-01-01 16:32:20 +01:00
Bret Curtis
7a7b040216
fix building on mips machines
2018-01-01 14:10:23 +01:00
scrawl
c920f95d1e
Don't incorrectly discard root node transformation ( Fixes #4272 )
2017-12-31 23:49:43 +00:00
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
2017-12-25 02:25:01 +02:00
David Cernat
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
2017-12-23 13:16:38 +02:00
David Cernat
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
2017-11-30 12:18:15 +02:00
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
David Cernat
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
2017-11-27 07:39:02 +02:00
David Cernat
d06817a356
Merge pull request #347 from OpenMW/master
...
Add OpenMW commits up to 25 Nov 2017
2017-11-25 08:54:22 +02:00
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
2017-11-23 19:37:45 +04:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
2017-11-23 04:51:13 +02:00
David Cernat
6668b9ab42
[General] Implement ConsoleCommand packet
2017-11-23 00:21:47 +02:00
Andrei Kortunov
67acb83b62
Add missing include
2017-11-21 13:27:33 +04:00
Andrei Kortunov
5f41f7c48d
Clean code up a bit
2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
2017-11-21 09:39:54 +04:00
scrawl
9fda3b6db4
Fix NumericEditBox behavior broken by switch to std::stoi
...
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.
Now the edit box flat out rejects any non-digit key events.
2017-11-20 23:20:03 +00:00
Andrei Kortunov
a391990f2a
Provide multibyte toLower() and single chars comparator
2017-11-20 21:30:46 +04:00
Alexander Stillich
93e9df15c9
Fixed parameter naming
2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782
Added StringUtil::replaceAll()
2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78
Fixed escaping @ in boost program options filter
2017-11-11 22:57:59 +00:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master
...
Add OpenMW commits up to 11 Nov 2017
2017-11-11 03:46:21 +02:00
scrawl
a5ba1caed1
Merge pull request #1541 from astillich/4189
...
Fixed escaping @ in boost program options filter
2017-11-10 23:08:54 +00:00
scrawl
a5adc5b018
Add NPC base skeleton files to the optimizer blacklist ( Fixes #4159 )
2017-11-10 22:51:32 +00:00
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
2017-11-10 08:43:50 +02:00
scrawl
244cc5b861
Reduce error spam
2017-11-08 00:24:03 +00:00
scrawl
7b4add2ae4
Fall back to non-shader material if creating the shader fails
...
Also fixes an uncaught exception that will break the whole game.
2017-11-08 00:24:03 +00:00
Alexander Stillich
43b5c2e36b
Fixed parameter naming
2017-11-07 23:20:10 +01:00
Alexander Stillich
70d578d050
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
2017-11-07 23:10:58 +01:00
Alexander Stillich
af3e1f92ec
Added StringUtil::replaceAll()
2017-11-07 23:06:23 +01:00
