mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:19:55 +00:00
Code Issues Releases Wiki Activity
18013 commits 38 branches 54 tags 122 MiB
Commit graph

13558 commits

Author SHA1 Message Date
David Cernat
9c3a37a790 [Server] Make GetCellStateDescription's cstrDescription null-terminated 2017-01-27 14:16:27 +02:00
Koncord
1c810ecad5 [Server] Fix memory leak in GetCellStateDescription() 2017-01-27 19:05:18 +08:00
David Cernat
7efb374f75 [Client] Avoid fetching guiMessageBox.type again for every condition 2017-01-27 10:41:10 +02:00
David Cernat
0ccfe66212 [Server] Send stable C string in GetCellStateDescription() 2017-01-27 08:14:27 +02:00
David Cernat
4f288ab558 [Server] Read contents of ID_PLAYER_CELL_STATE 2017-01-26 17:53:36 +02:00
David Cernat
6331c55bc7 [Server] Add colons missing from CELLAPI 2017-01-26 16:42:55 +02:00
David Cernat
2f644e9b14 [Server] Add script functions for getting info about cell state changes 2017-01-26 16:37:47 +02:00
David Cernat
70823d011d [Server] Define CELLAPI 2017-01-26 16:16:28 +02:00
David Cernat
0cc20d26ce [Server] Move script functions for cells to a new CellFunctions class 2017-01-26 16:10:45 +02:00
David Cernat
5a22032a41 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2017-01-26 15:50:12 +02:00
David Cernat
62f359e250 [Server] Rename Translocations into Positions 2017-01-26 15:48:47 +02:00
Koncord
ab3c2544b5 [Client] Use constant instead magic value 2017-01-26 21:47:28 +08:00
Koncord
34a46e6811 [Client] Simplify hasFinishedCharGen method 2017-01-26 21:42:12 +08:00
David Cernat
96bd21a7ca [Server] Rename OnPlayerCellLoad to OnPlayerCellState, add action param 2017-01-26 14:18:47 +02:00
David Cernat
244da19a51 [General] Turn ID_PLAYER_CELL_LOAD into ID_PLAYER_CELL_STATE for clarity 2017-01-26 13:49:20 +02:00
David Cernat
055376c8ee [Client] Only send ID_PLAYER_CELL_LOAD when CharGen is over 2017-01-26 13:14:22 +02:00
David Cernat
b5b5551fcd [Client] Add LocalPlayer::hasFinishedCharGen() method 2017-01-26 13:13:43 +02:00
David Cernat
97aabf4a7d [General] Sketch out sending of cell loading/unloading info in packets 2017-01-26 09:02:01 +02:00
David Cernat
158d606477 [General] Leave one blank line at the end of every tes3mp code file 2017-01-26 06:17:29 +02:00
David Cernat
2158e94a96 [Client] Fix setting of attack parameters after recent changes 2017-01-25 18:04:20 +02:00
David Cernat
73d39c1a0a [General] Stop using virtual functions in BasePlayer, part 2 2017-01-25 17:19:53 +02:00
David Cernat
63c8a98083 [General] Stop using virtual functions in BasePlayer 2017-01-25 17:06:15 +02:00
David Cernat
c62a575a9e [Server] Change order of words in the names of script callbacks 2017-01-25 14:59:23 +02:00
David Cernat
1d9c6ddd81 [General] Add placeholders for the new packet ID_PLAYER_CELL_LOAD 2017-01-25 14:51:43 +02:00
David Cernat
25e535e8ad [Server] Fix integer types for new script callbacks 2017-01-25 07:51:44 +02:00
David Cernat
f9feaf05f0 [Server] Add script callbacks for object placement and deletion 2017-01-25 05:30:25 +02:00
David Cernat
35e453dec3 [General] Sketch out most of functionality for journal saving/loading 2017-01-24 19:32:25 +02:00
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
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
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
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
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
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
Allofich
f2240dde9c Allow command spells to work when cast by AI on AI 
(Fixes #3723)
 2017-01-15 01:56:22 +09:00
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.
 2017-01-15 01:53:22 +09:00
Allofich
a46c4de918 Stop combat when adding an AI package to an actor 
(Fixes #3722)
 2017-01-15 01:53:22 +09:00
David Cernat
afebc9c60f Don't require C++14 for netlauncher 2017-01-14 17:56:29 +02:00
David Cernat
ba493435f3 Prevent crash when trying to remove -1 rows in netlauncher 2017-01-14 17:54:50 +02:00
scrawl
b87abb0456 Reset activation flags when an object is copied (Fixes #3671, Fixes #3719) 2017-01-14 15:29:36 +01:00
David Cernat
70b43ecef6 Merge pull request #126 from OpenMW/master 
Add OpenMW commits up to 14 Jan
 2017-01-14 05:59:16 +02:00
Koncord
0ab02006de Detect ARM CPUs 2017-01-14 11:17:36 +08:00
scrawl
69ce9f32bc Activate/OnActivate fix (Bug #3712) 2017-01-14 00:10:43 +01:00
David Cernat
2e3f508a56 Fix broken default keys and enable master server in configs 2017-01-13 10:33:21 +02:00
David Cernat
253ded1ee3 Use new getFilenameStamp() method to generate timestamps for filenames 2017-01-13 08:49:21 +02:00
David Cernat
3932654d5d Use log filenames w/ timestamps instead of adding numbers to their ends 2017-01-13 07:58:40 +02:00
David Cernat
10a0f165dd Print paths used for server dependencies in CMake, change tabs to spaces 2017-01-12 13:45:04 +02:00
Koncord
3c9eaad5ce Rename Main class to MainWindow 2017-01-12 10:46:48 +08:00
David Cernat
610ba1d867 Merge pull request #125 from OpenMW/master 
Add OpenMW commits up to 12 Jan
 2017-01-12 04:33:25 +02:00
Koncord
f7dc30387c Run tes3mp-netlauncher instead openmw in the OpenMW Launcher 2017-01-12 08:55:21 +08:00
Koncord
90908ed113 rename openmw-netlauncher to tes3mp-netlauncher 2017-01-12 08:54:11 +08:00
scrawl
73aa07b81b Merge pull request #1189 from Allofich/attack 
Match best attack selection to vanilla behavior
 2017-01-11 18:36:10 +01:00
Allofich
2322ab3125 Don't make Command spells cancel AI packages 
(Fixes #3649)
 2017-01-12 00:07:22 +09:00
Koncord
4604ee49bf Fix waiting answer when browser not connected to the master server 2017-01-11 23:00:46 +08:00
Koncord
968546b20c Use master server address from config file 2017-01-11 22:58:50 +08:00
Koncord
cb799ee446 Server browser 2017-01-11 22:05:40 +08:00
Allofich
c10585fb07 Match best attack selection to original MW 
(Fixes #3721)
 2017-01-11 22:22:46 +09:00
David Cernat
dfb87e9e0d Merge pull request #124 from OpenMW/master 
Add OpenMW commits up to 11 Jan
 2017-01-11 13:30:22 +02:00
Koncord
b6f9a21d7f Do not allow 0 update rate 2017-01-10 20:38:33 +08:00
Koncord
03a92b3a91 Use LOG_VERBOSE instead LOG_INFO 2017-01-10 20:37:40 +08:00
Koncord
01900c2be8 Use modname in Send function 2017-01-10 20:36:39 +08:00
Koncord
2b0ae7b9ca Fix variable name in JSON 2017-01-10 20:35:30 +08:00
Koncord
e92df0c465 Implement SetModname, SetHostname functions 2017-01-10 19:22:02 +08:00
Koncord
f510a5583f Move MasterClient to Networking class 
Rename MOTD to hostname
 2017-01-10 19:21:31 +08:00