Commit Graph

17902 Commits (0af5e1269a677a12778b9333dbe1e23643f925a7)
 

Author SHA1 Message Date
Koncord 0af5e1269a Move browser xml files to files/tes3mp/ui 8 years ago
David Cernat 68727751ed Fix arguments for OnPlayerChangeSpellbook in server Networking 8 years ago
David Cernat 869b32383e Fix arguments for OnPlayerChangeJournal in server Networking 8 years ago
David Cernat d308897f95 Rename PacketItems, PacketSpells into InventoryChanges, SpellbookChanges 8 years ago
David Cernat e2c595fc5d Add preliminary structure for journal changes 8 years ago
David Cernat e9b22814b9 Create placeholder for ID_GAME_JOURNAL 8 years ago
David Cernat a69f294ef0 Rename ID_GAME_CELL into ID_PLAYER_CELL_CHANGE 8 years ago
David Cernat 745ddd9a69 Merge pull request #130 from OpenMW/master
Add OpenMW commits up to 19 Jan
8 years ago
David Cernat 83277a1512 Send spellbook in LocalPlayer CharGen & change UPDATE action name to SET 8 years ago
David Cernat 0f7748d9d2 When clearing LocalPlayer's spells, keep race and birthsign abilities 8 years ago
David Cernat e7675d94d4 Make server script functions for spells consistent with those from items 8 years ago
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. When using OSG dev version 3.5 the crashes were a little more prevalent, because 'addVertexBufferObjectIfRequired' in osg::Geometry is now used even when VBO's are disabled (as part of the VAO support changes).
8 years ago
David Cernat 6b14ca0775 Finish renaming of script functions for sending items and spells 8 years ago
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.
8 years ago
David Cernat be851f5e1a Send packet with spells gained at character generation 8 years ago
David Cernat 78c6ab2a99 Clean up client Networking by putting item & spell logic in LocalPlayer 8 years ago
David Cernat b8a6020af1 Check for update to inventory when closing a container 8 years ago
David Cernat 6eb7706390 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 8 years ago
David Cernat 0fe2d743a7 Rename tes3mp-netlauncher into tes3mp-browser 8 years ago
David Cernat c77120df6d Merge pull request #129 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwworld/actiontake.cpp
8 years ago
scrawl ac61535d2c optimize OSGVertexBuffer by double buffering the vertex array instead of recreating it on every modification 8 years ago
scrawl cc19b4bd8a Fix door rotation order in collision case (Bug #3707) 8 years ago
scrawl 45fb4f04b1 Update reference of the interpreter context when an Activate results in a take action (Fixes #3727) 8 years ago
scrawl 70c5f64caa Fix mLocals not being updated in InterpreterContext::updatePtr 8 years ago
David Cernat cf8a507860 Set window title for netlauncher 8 years ago
David Cernat b2577498a9 Use tes3mp icon for netlauncher 8 years ago
David Cernat fa8650f99a Merge pull request #128 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
scrawl c6822b9eb6 Merge pull request #1192 from damiel/water_refactor
Added refactoring of shader handling from visvalda's fog shader
8 years ago
scrawl 8f5418c12c Merge pull request #1170 from NeveHanter/bugfix-3617
Enchanted arrows don't explode when hitting the ground (Bug #3617)
8 years ago
Martin-Kevin Neumann 5a8efa1649 added refactoring of shader handling from visvalda's fog shader 8 years ago
NeveHanter e82d542d89 Merge remote-tracking branch 'upstream/master' into bugfix-3617 8 years ago
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.
8 years ago
David Cernat f376b8416e Merge pull request #127 from OpenMW/master
Add OpenMW commits up to 15 Jan
8 years ago
scrawl edf04667e0 Merge pull request #1191 from Allofich/ai
Stop combat when adding an AI package to an actor
8 years ago
Allofich f2240dde9c Allow command spells to work when cast by AI on AI
(Fixes #3723)
8 years ago
Allofich e825010107 Apply command spell effects on impact
Command spells should apply their effects, including taking an actor out
of combat, every time a spell successfully hits, even if a previous
command effect is still active.
8 years ago
Allofich a46c4de918 Stop combat when adding an AI package to an actor
(Fixes #3722)
8 years ago
David Cernat afebc9c60f Don't require C++14 for netlauncher 8 years ago
David Cernat ba493435f3 Prevent crash when trying to remove -1 rows in netlauncher 8 years ago
David Cernat b1bcba3055 Use Qt 5 by default 8 years ago
David Cernat 76162fbfde Fix netlauncher target properties in CMake for Visual Studio 8 years ago
scrawl b87abb0456 Reset activation flags when an object is copied (Fixes #3671, Fixes #3719) 8 years ago
David Cernat 70b43ecef6 Merge pull request #126 from OpenMW/master
Add OpenMW commits up to 14 Jan
8 years ago
Koncord 0ab02006de Detect ARM CPUs 8 years ago
scrawl 69ce9f32bc Activate/OnActivate fix (Bug #3712) 8 years ago
David Cernat 2e3f508a56 Fix broken default keys and enable master server in configs 8 years ago
David Cernat 253ded1ee3 Use new getFilenameStamp() method to generate timestamps for filenames 8 years ago
David Cernat 3932654d5d Use log filenames w/ timestamps instead of adding numbers to their ends 8 years ago
David Cernat 213bc1e733 Print correct variable for Terra's library 8 years ago
David Cernat 10a0f165dd Print paths used for server dependencies in CMake, change tabs to spaces 8 years ago