1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-19 16:39:41 +00:00
Commit graph

15856 commits

Author SHA1 Message Date
Marc Zinnschlag
1564a3f6aa Merged pull request #1713 2018-05-23 13:51:32 +02:00
Marc Zinnschlag
2f958881b7 Merged pull request #4413 2018-05-23 13:45:35 +02:00
David Cernat
8d36d0d945 [General] Make it possible to change world's time scale via WorldTime 2018-05-23 08:31:25 +03:00
David Cernat
0be6de6607 [General] Turn RecordDynamic into a Worldstate packet 2018-05-23 07:48:28 +03:00
David Cernat
031a80ed5a [Client] Don't advance time when waiting, traveling, training or jailed 2018-05-23 05:49:51 +03:00
David Cernat
02ba641bef [Server] Use correct index changes for dynamic stat script functions 2018-05-23 05:48:28 +03:00
David Cernat
da66face25 [General] Rename GameTime packet into WorldTime 2018-05-23 00:41:29 +03:00
David Cernat
296c69d788
Merge pull request #436 from OpenMW/master
Add OpenMW commits up to 22 May 2018
2018-05-23 00:40:51 +03:00
Nelsson Huotari
825c331764 Remove texture filtering, better ltex importing, reindexing duplicates 2018-05-22 14:55:09 +03:00
declan-millar
b8df4b7c5a Tidy in-code comment 2018-05-21 22:14:23 +01:00
declan-millar
844aef85f3 Replace spelling: soulgem -> soul gem in code comment 2018-05-21 22:12:19 +01:00
declan-millar
9ed4f33048 Replace spelling: soulgem -> soul gem 2018-05-21 19:10:24 +01:00
declan-millar
028b528c0b Get soul magnitude before checking the rebalance setting 2018-05-21 18:16:04 +01:00
declan-millar
9346a552fa Use Rebalance soulgem values option to set soulgem value 2018-05-21 13:59:20 +01:00
declan-millar
78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 2018-05-21 13:33:42 +01:00
David Cernat
5af1150ab2 [General] Turn GameTime into a Worldstate packet 2018-05-21 07:14:08 +03:00
David Cernat
e87e1dbb30 [General] Fix Worldstate packets by adding missing lines 2018-05-21 07:12:55 +03:00
David Cernat
e690ff0e29
Merge pull request #432 from OpenMW/master
Add OpenMW commits up to 18 May 2018
2018-05-20 23:48:53 +03:00
Nelsson Huotari
8ae46519cf Fix missed worldspacehits, add linebreak to tooltip 2018-05-20 21:58:40 +03:00
Nelsson Huotari
21e8d08e69 Handle invalid texture id's 2018-05-20 21:20:40 +03:00
declan-millar
4b1247597e Use soulgem value rebalance formula from morrowind code patch 2018-05-20 17:06:26 +01:00
Capostrophic
867a5938ca Don't reset sneaking camera offset while in GUI (fixes #4420) 2018-05-20 10:24:20 +03:00
Marc Zinnschlag
ec900ef4ad Merged pull request #1710) 2018-05-18 12:34:16 +02:00
Nelsson Huotari
c2cddc91e4 Brush maximum size to a custom setting 2018-05-18 11:32:42 +03:00
David Cernat
43a944ddaf [General] Add and implement new Worldstate packet type 2018-05-18 06:40:28 +03:00
David Cernat
e8b22a2e5e [Server] Use correct source group for ObjectProcessors 2018-05-18 05:06:19 +03:00
tri4ng1e
f2613a74b1
Write settings before invoking openmw-iniimporter 2018-05-17 21:20:04 +03:00
tri4ng1e
7e03dd0f12
Read data paths from data-local section too 2018-05-17 21:07:20 +03:00
tri4ng1e
3b86f73ae7
Replace MwIniImporter::numberToString with std::to_string 2018-05-17 21:04:40 +03:00
Capostrophic
4e485dbd44 Rename Original Creature column to Parent Creature (fixes #2897) 2018-05-17 13:00:48 +03:00
David Cernat
049d0d9ba7 [General] Fix remaining references to world packets/events 2018-05-17 00:08:37 +03:00
David Cernat
dc9a3bf73f
Merge pull request #429 from OpenMW/master
Add OpenMW commits up to 16 May 2018
2018-05-16 19:20:01 +03:00
Bret Curtis
67c381df4e
Merge pull request #1708 from akortunov/refidfix
fix GCC warnings
2018-05-16 15:59:31 +02:00
Andrei Kortunov
a68de93308 Initialize srate variable in openal_output 2018-05-16 16:34:58 +04:00
Andrei Kortunov
e5db5e2651 Fix 'maybe-uninitialized' warning in openal_output 2018-05-16 16:13:22 +04:00
Andrei Kortunov
df459199dd Avoid left shift of negative value 2018-05-16 12:59:05 +04:00
Nelsson Huotari
17e01ca336 Setting "Scene Drops" rename "3D Scene Editing" 2018-05-16 11:41:37 +03:00
Nelsson Huotari
758ccac75a Show texture id + filename 2018-05-16 11:34:58 +03:00
Bret Curtis
caf1760251
Merge pull request #1707 from akortunov/weaponreach
Display weapon reach on tooltips in feet
2018-05-16 10:27:53 +02:00
Andrei Kortunov
164e3d12fe Display weapon reach on tooltips in feet. 2018-05-16 11:18:22 +04:00
Bret Curtis
e410c47660
Merge pull request #1706 from akortunov/refidfix
Fix compiler warning in getNestedData()
2018-05-16 09:00:25 +02:00
Andrei Kortunov
6a3ff5ed81 Fix compiler warning in getNestedData 2018-05-16 10:10:42 +04:00
David Cernat
2ac334664b [Server] Add deprecated alternatives for ObjectList functions
This will avoid server crashes in older scripts.
2018-05-16 02:16:27 +03:00
David Cernat
51698bed48 [Client] Rename WorldProcessor into ObjectProcessor 2018-05-15 22:56:47 +03:00
David Cernat
02d8e08c58 [Server] Rename WorldProcessor into ObjectProcessor 2018-05-15 22:07:06 +03:00
David Cernat
1e749938fb
Merge pull request #426 from OpenMW/master
Add OpenMW commits up to 15 May 2018
2018-05-15 21:01:33 +03:00
David Cernat
bef36f77ca [Server] Create WorldstateFunctions and move GameTime functions there 2018-05-15 20:58:09 +03:00
Bret Curtis
c75d774356
Merge pull request #1692 from akortunov/playsound
Prevent PlaySound overlapping
2018-05-15 19:03:01 +02:00
Andrei Kortunov
f8655d2425 Use actor's physics position as a ray origin in tracer 2018-05-14 20:38:53 +04:00
David Cernat
9b9dd4abaf
Merge pull request #425 from OpenMW/master
Add OpenMW commits up to 13 May 2018
2018-05-13 19:27:34 +03:00
Capostrophic
409d466e42 Make 0/0 encumbrance 0% encumbrance 2018-05-13 17:18:45 +03:00
Capostrophic
ba077e7291 Fix movement fatigue loss encumbrance calculation (fixes #4413) 2018-05-13 17:18:45 +03:00
Capostrophic
1c9fba9a8c Fix jumping encumbrance calculation 2018-05-13 17:18:45 +03:00
Marc Zinnschlag
0f22600a98 Merged pull request #1703 2018-05-13 09:08:40 +02:00
David Cernat
d4f7936a76 [Server] Rename WorldFunctions into ObjectFunctions 2018-05-13 04:11:05 +03:00
David Cernat
78234f9071 [General] Rename Event into ObjectList & WorldObject into BaseObject 2018-05-13 00:42:24 +03:00
David Cernat
6bf3a0be1e [General] Rename WorldPackets into ObjectPackets for clarity 2018-05-12 19:40:00 +03:00
David Cernat
5458e09c8a
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
2018-05-12 06:32:01 +03:00
David Cernat
77389538e8 [General] Implement ActorAI packet, part 1
The server can now make actors become followers of players or other actors.
2018-05-12 06:29:11 +03:00
tri4ng1e
9126e844bf
Use data paths from config (bug #4412) 2018-05-11 17:24:36 +03:00
Marc Zinnschlag
b7cce1a665 Merged pull request #1702 2018-05-11 10:11:17 +02:00
David Cernat
57b791ea2a [Client] Show selected object's refNum & mpNum in console window title
This allows for much easier debugging of all objects and actors.
2018-05-11 00:46:24 +03:00
Nelsson Huotari
49ae5bc75c List initialization -> initialization in constructor 2018-05-10 22:57:48 +03:00
Nelsson Huotari
1c79d5311c Brush history menu 2018-05-10 21:58:36 +03:00
Nelsson Huotari
d2cf764a46 Tooltips, fixes 2018-05-10 15:01:53 +03:00
Nelsson Huotari
62066f01bd clean-up 2018-05-10 11:18:54 +03:00
Nelsson Huotari
d33c98c68d Revert unintended changes 2018-05-10 11:18:54 +03:00
Nelsson Huotari
5656745445 Select dragged texture-assets, add brush settings widget-type, fixes. 2018-05-10 11:18:54 +03:00
Nelsson Huotari
baa707b5e3 User setting for selective cell editing or new land creation 2018-05-10 11:18:54 +03:00
Nelsson Huotari
24977fcc0f improve hit calculation accuracy for texture editing 2018-05-10 11:18:54 +03:00
Nelsson Huotari
e8a9bff85c Drop textures to landtextures from assets (try-method) 2018-05-10 11:18:54 +03:00
Nelsson Huotari
7139889566 Brush button window opens at modebutton, slider 1-50, doxygen comments 2018-05-10 11:18:54 +03:00
Nelsson Huotari
20d1d8ac89 Fixed brush calculations, implement undostack macro when clicked. 2018-05-10 11:18:54 +03:00
Nelsson Huotari
5f3c8b2b99 c_str -> fromStdString, remove TextureBrushButton class 2018-05-10 11:18:54 +03:00
Nelsson Huotari
cf7a0f715e Command macro for complete drag-editing operations. 2018-05-10 11:18:54 +03:00
Nelsson Huotari
9f742d5b1f Brush affects adjancent cells 2018-05-10 11:18:54 +03:00
Nelsson Huotari
1ca2710a2a Formatting, fixes 2018-05-10 11:18:54 +03:00
Nelsson Huotari
1c113eca9c 15 to landTextureSize-1 2018-05-10 11:18:54 +03:00
Nelsson Huotari
3327d6f7c4 Drag terrain painting, code cleanup 2018-05-10 11:18:54 +03:00
Nelsson Huotari
a54a1b9940 Command system and undo 2018-05-10 11:18:54 +03:00
Nelsson Huotari
cc415526b0 fix texture index +1, better icons 2018-05-10 11:18:54 +03:00
Nelsson Huotari
316d05bdc4 {} to () 2018-05-10 11:18:54 +03:00
Nelsson Huotari
4649d1258c Direct data terrain editing 2018-05-10 11:18:54 +03:00
Nelsson Huotari
4ae75d1d20 Terrain texture brush frame 2018-05-10 11:18:54 +03:00
David Cernat
12727b66ea [Server] Use consistent variable names in map tile script functions 2018-05-10 07:44:08 +03:00
David Cernat
7f00005f04 [Client] Fix GCC build
Based on 71040659ac
2018-05-10 07:16:33 +03:00
David Cernat
32d71de2f5 Update MapWindow every frame, not just when it's open (bug #4279) 2018-05-09 07:33:45 +03:00
Alf Henrik Sauge
feeee50a88 Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
2018-05-09 00:25:07 +02:00
tri4ng1e
103a07b744
Less cryptic abbreviations 2018-05-08 18:32:06 +03:00
Marc Zinnschlag
3197ebd8e7 Merged pull request #1694 2018-05-08 12:19:14 +02:00
David Cernat
715012f087 [General] Implement sending of image data for map tiles in PlayerMap 2018-05-08 05:57:04 +03:00
Andrei Kortunov
2f89080b36 Load default markers definitions in editor 2018-05-07 22:32:04 +04:00
Andrei Kortunov
b15bed8e22 Avoid excessive loadSound calls 2018-05-07 20:40:53 +04:00
tri4ng1e
905cde10db
Smart-sorting in iniimporter (time + dependency) 2018-05-07 15:51:46 +03:00
Marc Zinnschlag
53b6ef6f8c minor code cleanup 2018-05-07 09:54:42 +02:00
Marc Zinnschlag
e661e3cf74 Merged pull request #1677 2018-05-07 09:42:41 +02:00
Alf Henrik Sauge
9b971caddc CSVTools::ReportTable should now have case insensitive sorting 2018-05-06 16:49:23 +02:00
Andrei Kortunov
17222eb821 Get rid of unnecessary find 2018-05-06 16:42:05 +04:00
Bret Curtis
c44f87afd1
Merge pull request #1699 from Capostrophic/editorwarnings
Editor verifier updates
2018-05-06 10:57:24 +02:00
Bret Curtis
0fc198be52
Merge pull request #1698 from Capostrophic/c++11
A bunch of C++11-related updates
2018-05-06 10:44:11 +02:00