Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,317 Commits 151 Branches 18 Tags 2.1 GiB
d598f2879c
Commit Graph

344 Commits

Author SHA1 Message Date
timokoesters
b695a63e98 Send different physics components individually 2019-07-30 13:35:16 +02:00
timokoesters
16b445c828 Fix bugs with Last<T> 2019-07-30 10:49:41 +02:00
timokoesters
03a82030ec Fix commands 2019-07-30 10:10:58 +02:00
timokoesters
c6034bf450 Use Last<C> to check if a physics component changed 2019-07-30 08:32:03 +02:00
Monty Marz
5cfc60da50 Small chat fixes 2019-07-29 14:40:46 +00:00
Acrimon
ee49ebe807 Update rand, log and scan_fmt 2019-07-29 13:42:26 +00:00
Piotr Korgól
88db83c92a Instantly level up after reaching the required exp amount 2019-07-29 14:30:38 +02:00
Joshua Barretto
4a198ca626 Numerous minor lighting fixes 2019-07-29 13:01:39 +01:00
Timo Koesters
dcb34385fd Merge branch 'update-dependencies' into 'master' 
Update most dependencies

See merge request veloren/veloren!372
 2019-07-28 20:52:42 +00:00
timokoesters
5aa864ee58
Update most dependencies 2019-07-28 22:47:23 +02:00
neronim66@gmail.com
2c5dc0c3ff after review 2019-07-28 16:24:47 +02:00
kacper
999b6709a3 formatting 2019-07-28 16:00:14 +02:00
kacper
fd0df4177f lantern strength and clamp values 2019-07-28 13:36:35 +02:00
Christoffer Lans
633b8a1701 Command: '/time' without any arguments; gives the client the current time 2019-07-28 11:12:17 +00:00
Monty Marz
31d9e73a52 change server startup time to 32400.0 / 9:00 AM 2019-07-28 10:46:03 +00:00
Monty Marz
33565b9480 added comment about object rotation, changed lantern spawning command, changed /tell output when you /tell yourself 2019-07-28 09:21:17 +00:00
Piotr Korgól
5c84508015 Get EXP for killing NPCs and Players, properly show EXP bar 2019-07-26 20:51:40 +02:00
Christoffer Lantz
14bee47e58 Applied cargo fmt 2019-07-26 16:38:31 +02:00
Christoffer Lantz
71347b5d11 match arms in handle_time now returns a NaiveTime object instead of f64 2019-07-26 16:16:35 +02:00
Christoffer Lantz
9d245e5edd Now tells the client what the time was changed to 2019-07-26 16:03:05 +02:00
Christoffer Lantz
dbe9c5d696 Adds the ability to change time with /time with HH:MM format. e.g. 12:43 2019-07-26 15:43:39 +02:00
tommy
75792d374b Fix chat calls 2019-07-26 07:42:10 -04:00
tommy
95b5f4acfb Added private, broadcast, and game_state messages 2019-07-26 07:29:37 -04:00
tommy
ea0bbe7e47 Rebase fixes 2019-07-26 07:29:37 -04:00
tommy
8bac6e1e72 Correct tells 2019-07-26 07:29:37 -04:00
tommy
cc6aa6f33d Adds colour to tells in chat box #194 2019-07-26 07:29:37 -04:00
Nero
53086cb3b2 Nero/light offsets 2019-07-25 20:51:20 +00:00
Pfauenauge90
7a141ad111 More objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
9fd2849c6c chat warning for unknown objects 2019-07-24 02:50:19 +02:00
Pfauenauge90
85281e7e54 spawn objects by name 2019-07-24 02:50:19 +02:00
Pfauenauge90
f6e24d8161 Comand for specific model spawning part I 2019-07-24 02:50:19 +02:00
Joshua Barretto
5cdfb26e0d Added LightEmitter component 2019-07-21 19:22:49 +01:00
Joshua Barretto
16c8ecec66 Fixed light cap 2019-07-21 19:22:49 +01:00
Joshua Barretto
1dc654dde7 Added object entities 2019-07-21 19:22:49 +01:00
Jessie Mancer
4893ab5c2a fix spawn command placement to be random to improve AI responsivity and not spawn directly on player 2019-07-21 18:22:13 +00:00
Songtronix
de2dbcef45 add global git hash constant 2019-07-21 17:45:31 +00:00
Joshua Barretto
58a41d4bec Merge branch 'tell_fix' into 'master' 
Fix tell command, rename to /tell

See merge request veloren/veloren!343
 2019-07-20 16:10:16 +00:00
Joshua Barretto
ce327445a7 Send block diffs instead of entire chunks on block change 2019-07-20 16:41:03 +01:00
Marcel Märtens
98b0a40a22 Change default port of veloren from 59003 to 14004 
TCP and UDP Ports for applications should lie in a range between 1024-49151
the ports below are used for privileged services
the ports above should be dynamicly assigned.
Port 14004 seems to be used by no other service and i like it personally, so we choose it.

Also deactivate the workaround for the secondary veloren server again
 2019-07-20 13:59:35 +02:00
Tom Watson
025e0712be Update cmd.rs 2019-07-19 18:26:10 +00:00
tommy
a442371a1f Fix tell command, rename to /tell 2019-07-18 11:19:44 -04:00
tommy
e60881079f Add "You tell {}" message to sending player 2019-07-17 15:01:04 -04:00
tommy
8bb4993a79 rustfmt issue 2019-07-17 14:04:07 -04:00
tommy
3c6fb7a3ec Merge branch 'master' into 191_player_to_player_dm 2019-07-17 13:53:10 -04:00
Forest Anderson
b8993f568f Merge branch '183_add_killnpcs_command' into 'master' 
/killnpcs command, closes #183

Closes #183

See merge request veloren/veloren!329
 2019-07-17 17:34:36 +00:00
Songtronix
5b31c7c1f9 little cleanup 2019-07-17 19:03:37 +02:00
Songtronix
bfa6a2e2a2 add configurable TimeOfDay 2019-07-17 18:32:02 +02:00
Songtronix
bf82f5925d maybe improved setting file handling 2019-07-17 18:32:01 +02:00
Songtronix
b41508f025 generalise errors based on zests suggestion 2019-07-17 18:32:01 +02:00
Songtronix
b6c8bdc223 add configurable max player count 2019-07-17 18:32:01 +02:00
Songtronix
bbb024224d add configureable server info 2019-07-17 18:32:01 +02:00
Songtronix
1213d9844b add customizable port and worldseed 2019-07-17 18:32:00 +02:00
tommy
732eb9a0e8 Code review updates 2019-07-15 13:10:24 -04:00
tommy
bfa42dd33b Incorporated changes from Imbris 2019-07-14 16:35:22 -04:00
tommy
6d8eea5085 rustfmt issues 2019-07-14 13:39:27 -04:00
tommy
52b65d5938 Stopped 'spammy' output 2019-07-14 13:30:02 -04:00
tommy
5dee589107 Player to player DM #191 2019-07-13 00:25:44 -04:00
tommy
3c9046c5d0 rustfmt updates 2019-07-12 17:43:20 -04:00
tommy
42861541cf Updates based on code review #183 2019-07-12 17:16:07 -04:00
Acrimon
b4f2cd1547 Resolve discussion from Timo. 2019-07-12 19:56:40 +02:00
Acrimon
ccc7cb2976 Ran rustfmt 2019-07-12 21:29:16 +02:00
Acrimon
69537f7dd9 Switched threadpool impl for veloren/server. 2019-07-12 18:30:15 +02:00
Joshua Barretto
c2a11ed6b2 Improved worldgen performance with more precise z bound checks 2019-07-08 15:51:38 +01:00
timokoesters
0236e2e8f2
Show join message after selecting a character 2019-07-05 22:16:06 +02:00
Piotr Korgól
1f381cd99b Even more cleanups 2019-07-03 22:46:43 +02:00
Piotr Korgól
42a4cc8095 Add block breaking 2019-07-03 21:56:54 +02:00
Piotr Korgól
7f08377001 Sync CanBuild component, fix /build messages 2019-07-03 21:28:07 +02:00
Piotr Korgól
bf748ae742 Add CanBuild component, Block placing client messages and build mode command 2019-07-03 21:28:07 +02:00
timokoesters
f5da167ce5
Fix warnings and clippy recommendations in common 2019-07-02 15:48:25 +02:00
Piotr Korgól
a66dc9a24f Add /health command 2019-07-01 20:07:30 +00:00
Songtronix
ea340ddac7 fix warnings from server 2019-07-01 18:49:42 +00:00
Songtronix
1ee65a66cf Clean server and server-cli 2019-07-01 16:38:19 +00:00
Joshua Barretto
631df59083 Merge branch 'zesterer/small-fixes' into 'master' 
Fixed chonk memory usage bug, added block manipulation

See merge request veloren/veloren!278
 2019-07-01 15:22:04 +00:00
Joshua Barretto
a55bbca6e3 Only create one block with /solid 2019-07-01 15:38:40 +01:00
Joshua Barretto
489f5f6b2a fmt 2019-07-01 14:38:45 +01:00
Joshua Barretto
c8a2e4722c Fixed chonk memory usage bug, added block manipulation 2019-07-01 14:36:45 +01:00
timokoesters
370e7db1ee
Fix death 2019-06-30 22:29:00 +02:00
timokoesters
14400f6380
Remove Actor and use Body instead 2019-06-30 18:57:24 +02:00
Joshua Barretto
b1a7a61d77 Merge branch 'snok-online-players-cmd' into 'master' 
Snok: Show online players cmd

See merge request veloren/veloren!264
 2019-06-29 22:16:27 +00:00
Cedric Hutchings
6bda6e2025 adding a mut 2019-06-29 18:05:34 -05:00
Cedric Hutchings
5c19ddb06c fmt 2019-06-29 17:56:10 -05:00
Cedric Hutchings
0bc6b64002 implement zesterer suggestion 2019-06-29 17:49:56 -05:00
Cedric Hutchings
af0358c7c8 fix player count 2019-06-29 17:16:16 -05:00
Joshua Barretto
f1ba97ae7a Merge branch 'timo-rolling-fix' into 'master' 
Rolling bugs + NPC bugs + "Impossible" bug

See merge request veloren/veloren!265
 2019-06-29 21:47:05 +00:00
timokoesters
d235374d8e
Fix npc and death bug 2019-06-29 22:43:44 +02:00
timokoesters
c80351f6ca
Fix double roll bug 2019-06-29 19:49:51 +02:00
Joshua Barretto
324de39bfe fmt 2019-06-29 16:48:43 +01:00
Joshua Barretto
0c918c835f Prevented invalid username usage 2019-06-29 16:48:43 +01:00
timokoesters
b0ea959f67
Remove animation syncing (does not fix any known bug) 2019-06-29 17:09:38 +02:00
timokoesters
6289a097a5
Rename /who to /players and fmt 2019-06-29 14:05:30 +02:00
Thomas JULLIEN
7182257214
command to show the online players 2019-06-29 14:02:44 +02:00
timokoesters
fe6f627d42
Clean up ecs actor body components 2019-06-29 01:49:33 +02:00
Piotr Korgól
44862d0acc Fix spawning few entities at once 2019-06-28 18:58:47 +02:00
Piotr Korgól
888faadfab Prevent text clients from gaining position 2019-06-28 16:22:25 +02:00
Joshua Barretto
f781aca8e9 fmt 2019-06-26 19:14:12 +01:00
Joshua Barretto
9279611d6d Added longer day/night cycle, /time command 2019-06-26 19:14:12 +01:00
Joshua Barretto
692fa3f28d Above-ground spawn point, better figure dt scaling 2019-06-26 11:53:43 +01:00
Imbris
16e5b6bafd circular view distance 2019-06-23 15:49:15 -04:00
timokoesters
f0e6e76423
Don't sync animations, just sync components used to construct them 2019-06-16 19:59:15 +02:00
timokoesters
7deb3da1af
Add pub use phys:: and remove most pub mods 2019-06-16 19:59:12 +02:00
timokoesters
69cb2ed84f
Revamp control system 2019-06-16 19:57:03 +02:00
liids
e670f9b126 small fixes 2019-06-15 17:23:53 +02:00
liids
bcf7127736 make it more laconic 2019-06-15 15:42:39 +02:00
liids
6670c2b8fa fix formatting 2019-06-15 14:55:06 +02:00
liids
8b2b931c17 make minimum spawn amount higher than 0 2019-06-15 14:30:05 +02:00
liids
f726d755b7 fix formatting 2019-06-15 13:48:14 +02:00
liids
cca41a3333 fix negative spawn amounts 2019-06-15 11:32:07 +02:00
liids
2cc2a36be2 make amount optional 2019-06-15 10:22:36 +02:00
liids
c859371ddb Merge all spawn commands into one 2019-06-15 09:56:27 +02:00
Cody
14ac5babd4 Removes most unused imports; changes some unused variables to underscores or provides a leading underscore; removes some unnecessary variables and mutable declarations; and performs other miscellaneous warning fixes. 2019-06-06 14:48:41 +00:00
Joshua Barretto
76dca0b0cf Added dynamic fog growth 2019-06-05 20:52:51 +01:00
Joshua Barretto
cd630b0816 Reduced threadpool threads to keep render thread smooth 2019-06-05 20:52:51 +01:00
Forest Anderson
4548ec3bf9 Merge branch 'randomized-npc-names' into 'master' 
Added randomized NPC names veloren/veloren#133

Closes #133

See merge request veloren/veloren!207
 2019-06-04 05:23:25 +00:00
scorpion9979
7bfd9464c9 Added humanoid NPC type w/ names 2019-06-04 01:10:59 -04:00
scorpion9979
29f230d23e Cleaned code 
Refactored code for readability
 2019-06-04 01:10:59 -04:00
Ahmed Ihsan Tawfeeq
eb80459872 Added randomized NPC names veloren/veloren#133 2019-06-04 01:10:59 -04:00
Timo Koesters
930bc91174 Merge branch 'fix-server-info' into 'master' 
Add server info and player list to client

See merge request veloren/veloren!197
 2019-06-02 14:45:41 +00:00
Cody
75ca605f5d
Changes the physics misnomer Direction to Orientation and adjusts some ECS read_storage names. 2019-05-31 16:36:24 -04:00
Cody
6c76667356
Addresses more naming schemes and typos. 2019-05-31 16:36:24 -04:00
Imbris
942096c754 Only send physics updates for entities within vd 
Former-commit-id: d3307641cd31418bf8b9831296a96d58926184e0
 2019-05-28 20:47:03 -04:00
Imbris
e3e8afd99b Stop drawing entities outside the vd 
Former-commit-id: 34878fb66ec22ac77a7400724b80ad7f8321f4cf
 2019-05-28 20:47:01 -04:00
Imbris
045f41dae7 Use vd setting when creating client 
Former-commit-id: b9a32c6b2f1a61a407991507c63ba7d708723410
 2019-05-28 19:16:06 -04:00
timokoesters
c10a43f541 Add server info 
Former-commit-id: 9e504c821e871d30f8ac7cd4acb7a8022bdb5710
 2019-05-28 22:25:46 +02:00
Joshua Barretto
f8e18eef01 Merge branch 'fix-delay' into 'master' 
Fix attack delay

See merge request veloren/veloren!194

Former-commit-id: 2846e7c2ffe0c35427a9bb7fa0c387fd6374e0c9
 2019-05-28 20:23:24 +00:00
timokoesters
c96b5c45c3 Fix attack delay 
Former-commit-id: 28f7a492adcc37cec15e3e3c0d46b6015b27ee04
 2019-05-28 21:11:29 +02:00
Forest Anderson
2fc4e9a2f8 Merge branch 'enemies' into 'master' 
Enemies

See merge request veloren/veloren!186

Former-commit-id: f920608508868119aad286cbe45599342dc1942b
 2019-05-28 19:08:02 +00:00
Joshua Barretto
8407908af2 fmt 
Former-commit-id: 7535fe743722967dd59e383aa93cb78cb3be6e23
 2019-05-28 19:59:32 +01:00
Marcel
b5b61462ee Merge branch 'event-chat-messages' into 'master' 
Event chat messages

See merge request veloren/veloren!188

Former-commit-id: 5701dd41f52f76ee5733a3580da9fab59dc539e7
 2019-05-28 10:45:24 +00:00
timokoesters
2fc82dcf5e Fix singleplayer crash 
Former-commit-id: afbcdfe2024befbd5a225db049ce2f9a761e6df6
 2019-05-28 00:07:39 +02:00
timokoesters
d075d7874b Remove unwrap 
Former-commit-id: 68d26e366450010d1455c7662dc283cc0e0d9380
 2019-05-27 22:41:19 +02:00
timokoesters
2008400169 Implement killer name in chat 
Former-commit-id: 5aa87529179a684d5675c33e4001806aa2040802
 2019-05-27 21:47:19 +02:00
timokoesters
a6439984be Add connect, disconnect and kill messages 
Former-commit-id: c25f6fb0b594e5d61a965447359536ca17173aa7
 2019-05-27 19:45:43 +02:00
Joshua Barretto
baf740a289 Added enemies 
Former-commit-id: 2c07c9e52a7cbfb85508e7098c528bddd9b12997
 2019-05-27 12:18:14 +01:00
timokoesters
74761b7f9c Fix velocity while dead on client 
Former-commit-id: e308e1b8848a38fd9fd776ddd8acb81e145429a6
 2019-05-26 20:34:18 +02:00
timokoesters
2c57d898ed Fix missing gliding animation 
Former-commit-id: 211f285153271cad79bfdc7aa9e33608c766345d
 2019-05-26 19:24:44 +02:00
timokoesters
a7faa82aad Fix invisibility 
Former-commit-id: daeed655d2af1d990eee5d03df22b8a9bcbdf011
 2019-05-26 18:01:55 +02:00
timokoesters
4ebf2e13a5 Fix wolf red and dead velocity 
Former-commit-id: 2d59c545d3a101e630f56cc0c96d8579508dd99d
 2019-05-26 17:34:00 +02:00
jshipsey
b4e9359e3f Merge branch 'pets' of https://gitlab.com/veloren/veloren into pets 
Former-commit-id: f6ab802ebcb24a6c9c5d1c4343ce6b4d68cf942d
 2019-05-26 11:04:11 -04:00
jshipsey
7aab509701 rebase with combat merge 
Former-commit-id: 04885878ecaffba6b9bd78b2e59512d1914be3b1
 2019-05-26 11:02:01 -04:00
jshipsey
26da091b0b add wolf 
Former-commit-id: b16aa2e7c382710c0705371cd36d57ddf62cf13c
 2019-05-26 10:39:57 -04:00
timokoesters
64b00f41f4 Fix invisible chars 
Former-commit-id: cbb93e0511100b9b66f9ea22451c99a69b50b19c
 2019-05-26 16:04:44 +02:00
jshipsey
b7cbe1e67c add wolf 
Former-commit-id: 49fee3e5056377966068bd690333f83192d1fd41
 2019-05-25 23:31:49 -04:00
timokoesters
148c015b38 TODO comment for pet fix 
Former-commit-id: 747b926a92506887bb235e9e64e2c4f286d8b31b
 2019-05-26 00:08:54 +02:00
timokoesters
4696cd2c8b Add better inputs, input validation and more 
Former-commit-id: 3227221b12a674f66b011ce0ba734e226f223f34
 2019-05-25 23:46:56 +02:00
timokoesters
15d1a789d6 Better formatting 
Former-commit-id: 22b83b6dd5ad145a39b236436a019c6b172787d7
 2019-05-25 23:21:39 +02:00
timokoesters
3697c47e33 Change client_state_pending to ClientState::Pending 
Former-commit-id: 4b6a304a138ccfbffc3b6e28d36feaa2693d01a7
 2019-05-25 23:21:39 +02:00
timokoesters
1dbca8b994 Fix respawn position 
Former-commit-id: c4dabc71a1c7af538e2c30acbf463340a4618cc9
 2019-05-25 23:21:39 +02:00
timokoesters
1826a2b4f9 Implement fast respawn 
Former-commit-id: 17f9aceba5c40a5d3ddc2e0fd6795479487753fd
 2019-05-25 23:21:39 +02:00
timokoesters
0344f3eba8 Implement hit time delay 
Former-commit-id: 6c1990645fd07e23de5eb97b6fc22f34ce09a6b7
 2019-05-25 23:21:39 +02:00
timokoesters
36e890bbd8 Fix client states server-side 
Former-commit-id: 701dd2a7f53bd0f1943cbeb61cc9c251228a4b5f
 2019-05-25 23:21:38 +02:00