Koncord
c3c3c57a98
[Browser] Fix errors for Windows build
2017-01-22 18:18:32 +08:00
Koncord
843a18f347
[Browser] Fix errors and warnings in MSVC
2017-01-22 18:02:38 +08:00
Koncord
db75c4874c
[Browser] Fix declaration of 'data' hides class member
2017-01-22 18:02:38 +08:00
David Cernat
0cd7c3ea3d
Merge pull request #131 from OpenMW/master
...
Add OpenMW commits up to 21 Jan
2017-01-22 11:20:20 +02:00
Koncord
dc3f87a81a
[Browser] Change iterator types in "for" loops to C++11 style
2017-01-22 17:18:19 +08:00
Koncord
33339fa786
[Browser] Rename addServer to addServerAndUpdate
2017-01-22 17:11:44 +08:00
Koncord
1bd4db5e8b
[Browser] Implement update info by index
2017-01-22 17:11:13 +08:00
Koncord
a86739f080
Add addServer by address method
2017-01-22 16:02:21 +08:00
Koncord
ecf82a5df7
Save/Load favorites in browser
2017-01-22 15:59:00 +08:00
Koncord
777a570d93
Init modName
2017-01-22 15:09:52 +08:00
Koncord
4c2294d105
Override closeEvent in MainWindow
2017-01-22 15:09:17 +08:00
Koncord
86d8b0630f
Do not allow override ServerModel
2017-01-22 15:07:42 +08:00
Koncord
5b88f3fc44
Use C++11 in browser
2017-01-22 15:01:05 +08:00
Koncord
0af5e1269a
Move browser xml files to files/tes3mp/ui
2017-01-22 15:00:28 +08:00
scrawl
7b0a498e83
Merge pull request #1193 from MiroslavR/disabled_player
...
ESS-import: player is no longer disabled
2017-01-21 05:52:18 +01:00
MiroslavR
c64351b3e8
ESS-import: player is no longer disabled (Bug #3246 )
2017-01-21 03:39:51 +01:00
David Cernat
68727751ed
Fix arguments for OnPlayerChangeSpellbook in server Networking
2017-01-20 12:54:03 +02:00
David Cernat
869b32383e
Fix arguments for OnPlayerChangeJournal in server Networking
2017-01-20 12:52:03 +02:00
David Cernat
d308897f95
Rename PacketItems, PacketSpells into InventoryChanges, SpellbookChanges
2017-01-20 12:43:05 +02:00
David Cernat
e2c595fc5d
Add preliminary structure for journal changes
2017-01-20 12:05:45 +02:00
David Cernat
e9b22814b9
Create placeholder for ID_GAME_JOURNAL
2017-01-20 11:15:10 +02:00
David Cernat
a69f294ef0
Rename ID_GAME_CELL into ID_PLAYER_CELL_CHANGE
2017-01-20 10:30:50 +02:00
David Cernat
745ddd9a69
Merge pull request #130 from OpenMW/master
...
Add OpenMW commits up to 19 Jan
2017-01-20 09:42:55 +02:00
David Cernat
83277a1512
Send spellbook in LocalPlayer CharGen & change UPDATE action name to SET
2017-01-20 09:07:07 +02:00
David Cernat
0f7748d9d2
When clearing LocalPlayer's spells, keep race and birthsign abilities
2017-01-20 08:06:48 +02:00
David Cernat
e7675d94d4
Make server script functions for spells consistent with those from items
2017-01-20 06:00:14 +02:00
scrawl
115e563a7a
Fix race conditions caused by Array <-> GLBufferObject interactions (Bug #3580 )
...
The first part of the fix is to assign VBO/EBO's upon loading the array in the Nif reader. This avoids triggering the 'addVertexBufferObjectIfRequired' code path in osg::Geometry which has the race condition when two threads add the same Array at the same time. Essentially, we want the Arrays to be 'const' when they come out of the Nif reader.
The second part of the fix is to make sure not to create empty arrays in the Nif reader (importantly, not assigning a VBO to the empty array). This empty array would be deleted when the NIFFile is cleaned up, and the detachment of the VBO assigned to it (which is still in use by other arrays) would cause threading issues.
This rare crash bug was first introduced with commit a7c5beb7c5
2017-01-19 22:23:41 +01:00
David Cernat
6b14ca0775
Finish renaming of script functions for sending items and spells
2017-01-19 18:30:31 +02:00
David Cernat
33e85c54de
Rename BasePlayer Inventory & Spellbook into PacketItems & PacketSpells
...
This avoids confusion when either of those is used to store and send a single item, and no longer requires coming up with confusing variable names like realSpellbook or realInventory for actual full spellbooks and inventories.
2017-01-19 18:06:59 +02:00
David Cernat
be851f5e1a
Send packet with spells gained at character generation
2017-01-19 16:56:21 +02:00
David Cernat
78c6ab2a99
Clean up client Networking by putting item & spell logic in LocalPlayer
2017-01-19 15:18:37 +02:00
David Cernat
b8a6020af1
Check for update to inventory when closing a container
2017-01-19 13:08:24 +02:00
David Cernat
6eb7706390
Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp
2017-01-19 12:14:45 +02:00
David Cernat
0fe2d743a7
Rename tes3mp-netlauncher into tes3mp-browser
2017-01-19 12:14:25 +02:00
David Cernat
c77120df6d
Merge pull request #129 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/actiontake.cpp
2017-01-19 06:34:09 +02:00
scrawl
ac61535d2c
optimize OSGVertexBuffer by double buffering the vertex array instead of recreating it on every modification
2017-01-19 03:19:17 +01:00
scrawl
cc19b4bd8a
Fix door rotation order in collision case (Bug #3707 )
2017-01-19 02:19:44 +01:00
scrawl
45fb4f04b1
Update reference of the interpreter context when an Activate results in a take action ( Fixes #3727 )
2017-01-18 21:57:50 +01:00
scrawl
70c5f64caa
Fix mLocals not being updated in InterpreterContext::updatePtr
2017-01-18 21:55:58 +01:00
David Cernat
cf8a507860
Set window title for netlauncher
2017-01-18 16:44:59 +02:00
David Cernat
b2577498a9
Use tes3mp icon for netlauncher
2017-01-18 16:37:06 +02:00
David Cernat
fa8650f99a
Merge pull request #128 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
2017-01-18 15:38:18 +02:00
scrawl
c6822b9eb6
Merge pull request #1192 from damiel/water_refactor
...
Added refactoring of shader handling from visvalda's fog shader
2017-01-16 18:26:28 +01:00
scrawl
8f5418c12c
Merge pull request #1170 from NeveHanter/bugfix-3617
...
Enchanted arrows don't explode when hitting the ground (Bug #3617 )
2017-01-15 23:00:25 +01:00
Martin-Kevin Neumann
5a8efa1649
added refactoring of shader handling from visvalda's fog shader
2017-01-15 14:17:22 +01:00
NeveHanter
e82d542d89
Merge remote-tracking branch 'upstream/master' into bugfix-3617
2017-01-15 09:49:45 +01:00
NeveHanter
811e9ad9f3
Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater.
...
Also allowed projectiles to fly through the dead bodies as in vanilla.
2017-01-15 09:49:25 +01:00
David Cernat
f376b8416e
Merge pull request #127 from OpenMW/master
...
Add OpenMW commits up to 15 Jan
2017-01-15 02:51:15 +02:00
scrawl
edf04667e0
Merge pull request #1191 from Allofich/ai
...
Stop combat when adding an AI package to an actor
2017-01-14 19:28:33 +01:00
Allofich
f2240dde9c
Allow command spells to work when cast by AI on AI
...
(Fixes #3723 )
2017-01-15 01:56:22 +09:00
